2cdaea3fbb
Merge pull request #3533 from crosbymichael/run-rm-remove-volumes
...
Remove volumes on docker run -rm
Upstream-commit: fc14e81bf945afe192b7e31991900fe27f991e3b
Component: engine
2014-01-09 10:47:28 -08:00
ceb42fa9b3
Merge pull request #3535 from plietar/3457-git-build
...
Don't compress the archive made from git's output.
Upstream-commit: 5ca0fedffc6d4498364cf42a3812b85591fb86d9
Component: engine
2014-01-09 10:32:28 -08:00
694098392a
Don't compress the archive made from git's output.
...
Commit 894d4a23fba made BuildFile use TarSum, which doesn't support
compressed tar archives.
This breaks builds from git url, which compressed it with bzip2.
Instead, just pass it uncompressed.
Docker-DCO-1.0-Signed-off-by: Paul Lietar <paul@lietar.net > (github: plietar)
Upstream-commit: 562a23576328c1586f1be968fa15cb075267138c
Component: engine
2014-01-09 18:23:19 +00:00
512d7502bb
Remove volumes on docker run -rm
...
If we don't care about the container then we don't care about any
volumes created with the run of that container
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 14acf6883db8069a10a727ed26f7ef801f460353
Component: engine
2014-01-09 09:58:40 -08:00
4765401e7e
Merge pull request #3530 from creack/update_dco_doc
...
Update DCO git hook example
Upstream-commit: eb131250aa7680812f8f7669b8fdfaaf7dbe8431
Component: engine
2014-01-09 09:23:35 -08:00
ea32b7c1af
Merge pull request #3528 from tianon/update-travis-dco
...
Update Travis to check for new 1.1 DCO version
Upstream-commit: 9ec29fddf8d27b9770e9e379b2aac44f025ec36f
Component: engine
2014-01-09 09:23:23 -08:00
19b256d8cc
Merge pull request #3527 from keeb/add-dco
...
Amend DCO
Upstream-commit: d015d31b1ca7dcd1952c252d479a3ba84ad4c5b5
Component: engine
2014-01-09 09:23:11 -08:00
0f761b4227
Merge pull request #3522 from bantic/fix-misspelled-names
...
Fix misspelled Hawkings -> Hawking, Archimede -> Archimedes, Euclide -> Euclid
Upstream-commit: f6292ab8d0e8b0181cd1ef0df2a61f3d0e9283ec
Component: engine
2014-01-09 09:12:05 -08:00
f362f40f54
Update DCO git hook example
...
Upstream-commit: c3f259754688d7c20cac5b8f8b998a7608f034a8
Component: engine
2014-01-09 09:02:56 -08:00
398a309d63
Update Travis to check for new 1.1 DCO version
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: a4f3cd62a3d221dcb55279cc9f0db41e7920c094
Component: engine
2014-01-09 09:52:17 -07:00
35730d58c5
Bump DCO version
...
Upstream-commit: 11d61ec77feb743a3eedef7d85a7a751ed09736e
Component: engine
2014-01-09 08:47:03 -08:00
c876780684
Fix layout
...
Upstream-commit: 40c90796e950307804745c5a852cc64d3e53a1a9
Component: engine
2014-01-09 08:35:47 -08:00
3bde09b0e2
Removed the 5th clause
...
Removed clause which states contributions should be relicensed
Upstream-commit: 7fb55f77250a9b52b0515a7e655ecc605ae452ca
Component: engine
2014-01-09 08:35:06 -08:00
c89473f354
Fix misspelled Hawkings -> Hawking, Archimede -> Archimedes, Euclide -> Euclid
...
Docker-DCO-1.0-Signed-off-by: Cory Forsyth <cory.forsyth@gmail.com > (github: bantic)
Upstream-commit: 7a7c3d87d8040b41970b7fc89305bb18561386d3
Component: engine
2014-01-09 10:02:55 -05:00
bb8a02af09
Merge pull request #3515 from crosbymichael/no-host-name-without-networking
...
Do not add hostname when networking is disabled
Upstream-commit: 42df36b6fcbf2397a35d37a59fbb50d69e27129e
Component: engine
2014-01-08 17:22:24 -08:00
a7ff45c891
Do not add hostname when networking is disabled
...
Docker-DCO-1.0-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 0354c3a95cf1f95ac9564b8e2897295e8a8613fd
Component: engine
2014-01-08 16:57:56 -08:00
0c23a3189c
Merge pull request #3511 from bantic/fix-misspelled-feynman
...
Fix misspelling of Richard Feynman's last name
Upstream-commit: 189c40597fb7453ab7d37b4d3c2e08116c3b676c
Component: engine
2014-01-08 16:29:59 -08:00
ba0bbf8655
Fix misspelling of Richard Feynman's last name
...
Docker-DCO-1.0-Signed-off-by: Cory Forsyth <cory.forsyth@gmail.com > (github: bantic)
Upstream-commit: 98193a397ef933a449f70c7661bff037bf98eb99
Component: engine
2014-01-08 19:02:15 -05:00
5f6e6869ed
Merge pull request #3460 from tsaavik/patch-1
...
Fixed error in group add example
Upstream-commit: c45cd9174ebc0c7dbc9f245166152ffd35cc72f4
Component: engine
2014-01-08 15:45:23 -08:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
1fff9851f9
Add the customary bold
...
Upstream-commit: 8298a200ce3bbab7d00ab73e8bac34643c7a1fc5
Component: engine
2014-01-08 18:45:06 +01:00
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
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
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
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
3e2f61eef3
google-compute-engine: fix typos
...
Upstream-commit: a3ee36b7474c70afdd12fa2210821cb080bc0a07
Component: engine
2014-01-08 00:11:06 -08:00
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
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
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
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
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
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
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
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
