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
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
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
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
Andy Rothfusz
5b404255d5
Merge pull request #3483 from lukaspustina/patch-1
...
Missing redirect in line 85
Upstream-commit: 00ee6d1925688bda77d5055d7e4be1cbd8b64a07
Component: engine
2014-01-07 15:11:02 -08:00
Andy Rothfusz
dffdf1a269
Merge pull request #3462 from tsaavik/patch-2
...
Simplified and streamlined Amazon Quickstart
Upstream-commit: 6f8a79c23c7ae80a18fb291c7dd65e12b8a6c037
Component: engine
2014-01-07 15:09:35 -08:00
Andy Rothfusz
fc2f70defb
Merge pull request #3461 from jbeda/patch-1
...
Update instructions for mtu flag for Docker on GCE
Upstream-commit: cf8063d1521e7e065e859b3e2f58e52d3b54a0f7
Component: engine
2014-01-07 15:03:19 -08:00
Andy Rothfusz
2cdbf533f4
Merge pull request #3488 from jamtur01/1310
...
Fixed #3481 - Added Ubuntu Saucy to installation
Upstream-commit: 3e10fe1a156b822e9daea5623411c187b2f5e2a1
Component: engine
2014-01-07 14:56:03 -08:00
Michael Crosby
914d9d5f46
Only get rootfs when we need to calculate the image size
...
Docker-DCO-1.0-Signed-off-by: Michael Crosby <crosby.michael@gmail.com > (github: crosbymichael)
Upstream-commit: fa14a1b9835a46bc9c48c1385b514a0f8d0b4eac
Component: engine
2014-01-07 13:56:26 -08:00
Tianon Gravi
01b84e7dd9
Fix Travis handling of a fully-numeric commit hash being YAML-converted to a number instead of a string
...
Docker-DCO-1.0-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 3779291e9b2f939aa98b91b35552bd9b76c9f39a
Component: engine
2014-01-07 15:27:51 -07:00
Tianon Gravi
a9154e9ad5
Merge pull request #3489 from tianon/travis-fixes
...
Fix Travis PR testing to not overwrite the "master" that Travis creates with our "upstream master"
Upstream-commit: f9e14cc83884e246478c315964a2fcae03d5e8a8
Component: engine
2014-01-07 12:53:19 -08:00
Victor Vieux
7bb76fbc89
Update REMOTE_TODO.md
...
Upstream-commit: f2ea539467e34ef06455a3e0561bac1f5a482822
Component: engine
2014-01-07 12:51:17 -08:00
Tianon Gravi
c43b1c60c8
Fix Travis PR testing to not overwrite the "master" that Travis creates with our "upstream master", and to also ignore commits with no content (like a Merge commit - there's no need to sign off on literally nothing)
...
Docker-DCO-1.0-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 7c4e5fbd4608bb4b1509552fbe9d3c0bcd7c347a
Component: engine
2014-01-07 13:45:40 -07:00
James Turnbull
5b993f0514
Fixed #3481 - Added Ubuntu Saucy to installation
...
Docker-DCO-1.0-Signed-off-by: James Turnbull <james@lovedthanlost.net > jamtur01
Upstream-commit: 97ef8a067c77cb8d15e6e336264c6eb21b25a0fb
Component: engine
2014-01-07 11:46:07 -08:00
Michael Crosby
ec223aab35
Merge pull request #2091 from keeb/add-dco
...
Add Developer Certificate of Origin Text
Upstream-commit: 4b9e475a3d903564e17dba87ec54990967f7f66e
Component: engine
2014-01-07 10:42:53 -08:00
Michael Crosby
29b6e8dfe9
Merge pull request #3431 from shin-/ping_standalone_check
...
Check standalone header when pinging a registry server.
Upstream-commit: 1d0aeae339aefb7f242035332ed553794b9dab01
Component: engine
2014-01-07 10:33:07 -08:00
Solomon Hykes
5143eb482f
Merge pull request #3475 from tianon/travis
...
Add Travis CI configuration to validate DCO and gofmt
Upstream-commit: 859856b3e46ce8f2359b30400b6f398867a84032
Component: engine
2014-01-07 10:19:43 -08:00
Michael Crosby
a4929b47af
Merge pull request #3435 from roylee17/3149-fix_port_mapping_of_tcp_plus_udp
...
Fix #3149 : port mapping of TCP + UDP
Upstream-commit: b8b18a2b428ebc9519b0dd26a18cf7b2d12cea6b
Component: engine
2014-01-07 10:08:13 -08:00
Tianon Gravi
8d4b73a932
Add Travis CI configuration to validate DCO and gofmt
...
After each push, Travis CI will trigger, and check two things:
- make sure that each commit in the push has the Docker certificate of origin
- make sure that all .go files changed by this sequence of commits are correctly formatted in the most recent commit
Note: there is one edge case; if you do a git force push, we cannot figure out the actual commits in the force push, and we will just run the checks as if upstream master were the base. Pull requests will always be tested correctly, though.
Docker-DCO-1.0-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 561d1db074edd4e7e7d8b02401abd3fc11b9d51c
Component: engine
2014-01-07 08:25:54 -07:00
lukaspustina
d1c770b847
Missing pipe in line 85
...
Upstream-commit: 2b93f1822322e957e7652db2645462ef2ec256bd
Component: engine
2014-01-07 15:20:38 +01:00
Tianon Gravi
af7e2d6bbd
Run 'gofmt -s -w'
...
Upstream-commit: 8f3b8f383519452001cc05bf6505e9c301ebe954
Component: engine
2014-01-06 22:14:35 -07:00