1
0
mirror of https://github.com/docker/cli.git synced 2026-01-19 21:41:31 +03:00
Commit Graph

5871 Commits

Author SHA1 Message Date
Michael Crosby
91a5b68120 Merge pull request #3446 from tianon/update-checklist
Update release checklist with more information, more commands, and more ...
Upstream-commit: ee656336205859cd3a935c00a02e47ef18d442cc
Component: engine
2014-01-08 15:37:49 -08:00
Guillaume J. Charmes
16a6c2302b Merge pull request #3417 from Sjord/use-most-recent-cache-image
Fix issue #3375 - Return most recent image from the cache
Upstream-commit: 3be2ea021d27b26d84767c9d05a6d3480e771d9d
Component: engine
2014-01-08 15:30:36 -08:00
Guillaume J. Charmes
b1d3493775 Merge pull request #3464 from vieux/fix_error_wait
fix error on docker wait
Upstream-commit: 1d0d093d0b24ab3119a3b727f3c6aeffcf82a9bf
Component: engine
2014-01-08 15:06:54 -08:00
Guillaume J. Charmes
f6c668dbf1 Merge pull request #3493 from SvenDowideit/commit-signoff-location
give more specific advice on setting up signing
Upstream-commit: 38a49951b3fba85b41e6a328fec7fa4b33c2f6d8
Component: engine
2014-01-08 15:04:00 -08:00
Guillaume J. Charmes
454544f252 Merge pull request #3510 from creack/hotfix-add_caching
Hotfix add caching
Upstream-commit: 772765c404e13e3b7225ab1c3263aa208404b44e
Component: engine
2014-01-08 15:00:18 -08:00
Victor Vieux
e460c649ec Merge pull request #3514 from vieux/update_REMOTE_TODO
update REMOTE_TODO.md
Upstream-commit: 71e89fdc75ec5e108c990614f49558cef5195c41
Component: engine
2014-01-08 14:51:35 -08:00
Victor Vieux
1b80b3b3bb update REMOTE_TODO.md
Docker-DCO-1.0-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 5530cc29b257c404b0f76d4b0cf620b877b0fae2
Component: engine
2014-01-08 14:50:52 -08:00
Tianon Gravi
796b35ad59 Merge pull request #3494 from tianon/makefile-use-branch-tag
Update Makefile to use "docker:GIT_BRANCH" as the generated image name
Upstream-commit: 82aed48bbcdafc139fe4366c37ce5d4e36ed0517
Component: engine
2014-01-08 14:47:41 -08:00
Guillaume J. Charmes
a678ed131c Make sure the remote ADD are cached properly
Docker-DCO-1.0-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: 0fd9c98de3fc2c8fb1da6dc3ef277b3325106b26
Component: engine
2014-01-08 14:22:49 -08:00
Guillaume J. Charmes
806b082861 Cleanup utils.Download
Docker-DCO-1.0-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: 762a0cc4723917b4e6ca3731356e43c5e9a13f5f
Component: engine
2014-01-08 14:22:49 -08:00
Guillaume J. Charmes
4ac9027377 Make sure file are cached correctly during build
Docker-DCO-1.0-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: e24e9c09f8533b662d1d829123431540bb95ea51
Component: engine
2014-01-08 14:22:49 -08:00
Frank Macreery
ffd759db06 Potential fix for ADD .
Docker-DCO-1.0-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: 93ff70a3e70e14762314f04e2b9f61c8710d5353
Component: engine
2014-01-08 14:22:24 -08:00
Guillaume J. Charmes
7e278d9841 Disable compression for build. More space usage but much faster upload
Docker-DCO-1.0-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: c6350bcc2411dfc5039976239e143f6b9da64444
Component: engine
2014-01-08 14:21:13 -08:00
Andy Rothfusz
ac3896d23f Merge pull request #3503 from gertvv/patch-1
Hello World: fix detach behavior
Upstream-commit: 9a6333466bd97ea7903cefaa1e2348f3053483b8
Component: engine
2014-01-08 11:44:26 -08:00
Andy Rothfusz
78d6110233 Merge pull request #3501 from proppy/patch-1
google-compute-engine: fix typos
Upstream-commit: 187eed7da57104e1bda256b2ec18e098558c902d
Component: engine
2014-01-08 11:40:30 -08:00
Victor Vieux
322b30062f Merge pull request #3499 from tianon/typos
Fix a few miscellaneous typos (Unkown -> Unknown, Recieve -> Receive)
Upstream-commit: 368e30897159b6908aec9cc5c5e8e763925bd7c4
Component: engine
2014-01-08 10:37:00 -08:00
Victor Vieux
9b01d50eb1 Merge pull request #3402 from manuel-woelker/3345-add-content-type-header-to-version-remote-api
Fix for #3345: Add Content-Type Header "application/json" to GET /version response in remote API
Upstream-commit: 149156a272a9eb1190f6d4b7a9c8fa20bca01b28
Component: engine
2014-01-08 10:15:22 -08:00
Gert van Valkenhoef
1fff9851f9 Add the customary bold
Upstream-commit: 8298a200ce3bbab7d00ab73e8bac34643c7a1fc5
Component: engine
2014-01-08 18:45:06 +01:00
Danny Yates
8bcba9a1ac gofmt
Docker-DCO-1.0-Signed-off-by: Danny Yates <danny@codeaholics.org> (github: codeaholics)
Upstream-commit: c4535c833dfdaef275d765968a2ed5513ef09097
Component: engine
2014-01-08 10:37:22 +00:00
Danny Yates
fdb961ff89 Fix indentation to match rest of file (tabs, not spaces)
Docker-DCO-1.0-Signed-off-by: Danny Yates <danny@codeaholics.org> (github: codeaholics)
Upstream-commit: 145501bee3f37ccb022189e7b76f31abcbdbed3c
Component: engine
2014-01-08 10:14:30 +00:00
Danny Yates
6a59e5045e Further simplification
Docker-DCO-1.0-Signed-off-by: Danny Yates <danny@codeaholics.org> (github: codeaholics)
Upstream-commit: df4ea946a653fa3864574fd8110c6c618dde41d8
Component: engine
2014-01-08 10:14:25 +00:00
Danny Yates
38f9c632bb Remove unneeded DependencyGraph
Docker-DCO-1.0-Signed-off-by: Danny Yates <danny@codeaholics.org> (github: codeaholics)
Upstream-commit: 6b48761ce92e5f9590fd8b2723176ab72d297e6c
Component: engine
2014-01-08 10:14:14 +00:00
Danny Yates
6854f9d3e2 Fix registry pushing/tagging
* docker push host:port/namespace/repo wouldn't push multiple tags for
  the same image
* getImageList was unnecessarily complex returning a nested array of
  ImgData when a correctly ordered list of images was sufficient
* removed various bits of redundancy

Docker-DCO-1.0-Signed-off-by: Danny Yates <danny@codeaholics.org> (github: codeaholics)
Upstream-commit: 5aa304f9696d8fcc2e39628ce68a39bfc932adb4
Component: engine
2014-01-08 10:13:14 +00:00
Gert van Valkenhoef
941cab2b70 Hello World: fix detach behavior
The hello world example relies on being able to exit the container attachment using Control-C without stopping it. According to this thread (and my own experience), this doesn't work anymore:

https://groups.google.com/forum/#!msg/docker-user/nWXAnyLP9-M/kbv-FZpF4rUJ

Added -sig-proxy=false to the attach command.
Upstream-commit: c9cebf3a73efa4827d051ddd69a8590b03419f8a
Component: engine
2014-01-08 10:58:55 +01:00
Manuel Woelker
70ceedcf64 Fix for #3345: Add Content-Type Header "application/json" to GET /version and /info responses in remote API
Docker-DCO-1.0-Signed-off-by: Manuel Woelker <github@manuel.woelker.org> (github: manuel-woelker)
Upstream-commit: 53a01aebd61e8db34c9106f5b2c5fdad6909caee
Component: engine
2014-01-08 09:17:20 +01:00
Sjoerd Langkemper
49bb0e0097 Fix issue #3375 - Return most recent image from the cache
ImageGetCached searches for an image from the cache. Instead of returning the
first image it finds, it should return the most recently created image. When a
build with --no-cache then adds a new image with the same parameters, it is
used instead of the old, existing image.

Docker-DCO-1.0-Signed-off-by: Sjoerd Langkemper <sjoerd@byte.nl> (github: Sjord)
Upstream-commit: 46c8b11f245204e9f6e1ae764b52911c327be1a9
Component: engine
2014-01-08 09:15:45 +01:00
Sjoerd Langkemper
64c8482404 Revert "Make sure the cache lookup returns always the same result"
This reverts commit 1d4b7d8fa1af95ce83f263a49ed24e686fa7cb62.

Docker-DCO-1.0-Signed-off-by: Sjoerd Langkemper <sjoerd@byte.nl> (github: Sjord)
Upstream-commit: 10b794b3328a8b8d8bcc094710cc3b59df500253
Component: engine
2014-01-08 09:14:31 +01:00
Johan Euphrosine
3e2f61eef3 google-compute-engine: fix typos
Upstream-commit: a3ee36b7474c70afdd12fa2210821cb080bc0a07
Component: engine
2014-01-08 00:11:06 -08:00
Tianon Gravi
cad35f4013 Add more specific lvm2 version to PACKAGERS document
I personally tested this using our container, and this was the lowest version that compiles and runs properly.

Docker-DCO-1.0-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 7626e9fd6448cbaa92632f2ce9cab70e9e142d8a
Component: engine
2014-01-08 00:27:50 -07:00
Tianon Gravi
72bcbfd669 Fix a few miscellaneous typos (Unkown -> Unknown, Recieve -> Receive)
Docker-DCO-1.0-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: e525ad3f9be05bfab388896ae559411650429553
Component: engine
2014-01-07 22:15:53 -07:00
Michael Crosby
60f0fc80fb Merge pull request #3496 from creack/disable_build_compression
Disable compression for build. More space usage but much faster upload
Upstream-commit: 322a42b8a2ec70721d3db72cc15342e63187aad9
Component: engine
2014-01-07 18:57:18 -08:00
Guillaume J. Charmes
de2942d9ec Merge pull request #3498 from crosbymichael/merge_release_v0.7.4
Merge release v0.7.4
Upstream-commit: 90ea81433f7bfb5e9a21099b7238d439121b833e
Component: engine
2014-01-07 18:44:03 -08:00
Michael Crosby
5941fa4f74 Change version to v0.7.4-dev
Docker-DCO-1.0-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: d7f26c93d9f813317e88fb6565c6eb0ca835a480
Component: engine
2014-01-07 18:41:06 -08:00
Michael Crosby
9ab21a4f21 Merge branch 'release' into merege_release_v0.7.4
Docker-DCO-1.0-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: d4e61b48eb277828c4a87aee15c141d94149c799
Component: engine
2014-01-07 18:40:54 -08:00
Michael Crosby
17e9610fb2 Merge pull request #3495 from crosbymichael/bump_v0.7.4
Bump v0.7.4
Upstream-commit: 1a6fc02348fbcb44324a8a79d178c54e07ca24ea
Component: engine
2014-01-07 18:35:44 -08:00
Michael Crosby
a3c8233eb9 Bump to v0.7.4
Docker-DCO-1.0-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 010d74ec2f3dfefea5cafa602bce5cdeac3a0c19
Component: engine
2014-01-07 18:06:20 -08:00
Guillaume J. Charmes
7dedb038c3 Disable compression for build. More space usage but much faster upload
Docker-DCO-1.0-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: 1137ecf7d1301e7f743978e02d874093bd68dacb
Component: engine
2014-01-07 17:46:04 -08:00
Tianon Gravi
1604296c8d Merge pull request #3361 from zimbatm/gpg-key-secure-best
Makes sure the GPG fingerprint is inlined in the doc everywhere.
Upstream-commit: a25a80b2d37bd990062363adaef7afdd3f8751f8
Component: engine
2014-01-07 17:43:04 -08:00
Tianon Gravi
cec8247ebd Update Makefile to use "docker:GIT_BRANCH" as the generated image name for increased versatility
... and other minor Makefile improvements :)

Docker-DCO-1.0-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: a95712899e33f267a3061fa94d05189e7c371eaa
Component: engine
2014-01-07 18:38:07 -07:00
Tianon Gravi
16b13f3182 Update release checklist with more information, more commands, and more correct flow (test, upload to test.docker.io, test, upload to get.docker.io, THEN tag&merge)
Docker-DCO-1.0-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: b57051a7247c61fdd9dc06710cd61521dca91940
Component: engine
2014-01-07 18:28:07 -07:00
Guillaume J. Charmes
6560fa5daf Merge pull request #3474 from creack/fix_add_cache_issue
Fix ADD caching issue with . prefixed path
Upstream-commit: bb76985d39112fc07e64334704702a90d0bea8f1
Component: engine
2014-01-07 17:24:18 -08:00
Guillaume J. Charmes
856026fd4d Merge pull request #3492 from unclejack/3449-fix_docker_build_on_devicemapper
#3449 - fix `docker build` on devicemapper
Upstream-commit: 28ec47c44163f1d51b47e76a83d661e5d37b81f6
Component: engine
2014-01-07 17:12:31 -08:00
zimbatm
7f69f81268 Fixes key installation for other target urls in hack/install.sh
Docker-DCO-1.0-Signed-off-by: Jonas Pfenniger <zimbatm@zimbatm.com> (github: zimbatm)
Upstream-commit: 94c803e9f0e725e6a52f71ffaa88d05137b62771
Component: engine
2014-01-08 01:08:14 +00:00
zimbatm
b057d9da45 Makes sure the GPG key fingerprint is inlined in the doc everywhere.
Instead of `curl $url | apt-get add -` use the ubuntu keyserver and a full
fingerprint to retreive the key. This makes the distribution of the GPG key
more secure an less likely to change even if 3rd party gains access to the
packages repository.

Docker-DCO-1.0-Signed-off-by: Jonas Pfenniger <zimbatm@zimbatm.com> (github: zimbatm)
Upstream-commit: 13ebc68636f922e799d71792748934b8883d2f1f
Component: engine
2014-01-08 01:07:04 +00:00
unclejack
d253920583 Revert "Add -S option to tar for efficient sparse file handling"
This reverts commit 733bf5d3ddbfb6dba7c2c0996c4af47a765e4593.

This is needed to fix "no such file" errors `docker build` errors for
devicemapper.

This fixes issue #3449.

Docker-DCO-1.0-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: d003cfea25c276904dbe1e972c0cf71d5c25e689
Component: engine
2014-01-08 02:58:39 +02:00
Guillaume J. Charmes
b0481e14ce Fix issue with file caching + prevent wrong cache hit
Docker-DCO-1.0-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: f3103e5c9157aed2a5ab0f4c70e328cd0aa69b59
Component: engine
2014-01-07 16:53:55 -08:00
Sven Dowideit
eb832863bb give more specific advice on setting up signing
Docker-DCO-1.0-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: 0eb5f233d68e9a6ec6e0643cc17355ac5ffdfe06
Component: engine
2014-01-08 10:19:44 +10:00
Guillaume J. Charmes
0cf00ffca6 Make vfs error more explicit
Docker-DCO-1.0-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: ef7e000a13eed5ebf761ab4ca83fa8f727170aa5
Component: engine
2014-01-07 16:02:41 -08:00
Guillaume J. Charmes
45fc411688 Fix ADD caching issue with . prefixed path
Docker-DCO-1.0-Signed-off-by: Guillaume J. Charmes <charmes.guillaume@gmail.com> (github: creack)
Upstream-commit: 811341423bd9d3d65640cb4aa04d2840817182ca
Component: engine
2014-01-07 16:02:20 -08:00
Andy Rothfusz
ec9c950a6c Merge pull request #3430 from lsm5/fedora-official-image
install instructions use unprefixed fedora image
Upstream-commit: b3addb5fb8814c0e76e2115404caef8a4efb393c
Component: engine
2014-01-07 15:12:37 -08:00