73a96089ff
Merge pull request #10190 from ashahab-altiscale/9875-lxc-run-links
...
LXC needs stdin for container to remain up
Upstream-commit: 7b48488c5641f092e111aa9d5562b368f7e66711
Component: engine
2015-01-19 17:13:37 -08:00
1a5071a250
Merge pull request #9826 from icecrime/8318_whitespace_add_copy
...
Support whitespace in paths for ADD and COPY
Upstream-commit: 50ff27caa13b4c558b0ddc9f65297b6ef6eb119d
Component: engine
2015-01-19 18:37:53 -05:00
1d078b8407
Merge pull request #9730 from cpuguy83/9709_fix_volumes_from_missing_container
...
Fix volumes-from re-applying on each start
Upstream-commit: 9b4cd01b21a2553c46d5735d827d7b0f570e6cad
Component: engine
2015-01-19 14:00:53 -08:00
eeb5a0ad4a
Merge pull request #9968 from HuKeping/master
...
log: Add restart policy name to the inspect information of container
Upstream-commit: 4c38045be1deed08bc1494261fd9a3e2812e67ad
Component: engine
2015-01-19 11:08:32 -08:00
b098aaedce
Merge pull request #9784 from dmcgowan/v2-registry
...
Client Support for Docker Registry HTTP API V2
Upstream-commit: 8b95ad230e2ee76450ceb9a80aa8e942a56bb397
Component: engine
2015-01-19 10:46:38 -08:00
3f7b51a04e
Merge pull request #10152 from ashahab-altiscale/9875-cap-add-all
...
SEND CAPABILITY IDS TO LXC
Upstream-commit: 979a4cdacdea48e401715ad887b43ee0b4bb513a
Component: engine
2015-01-19 10:46:22 -08:00
c909cbb34a
LXC needs stdin for container to remain up
...
To run shell(and not exit), lxc needs STDIN. Without STDIN open, it will exit 0.
Signed-off-by: Abin Shahab <ashahab@altiscale.com > (github: ashahab-altiscale)
Upstream-commit: 79f17dcf7404d0547db68dba8b629c9c1141e47b
Component: engine
2015-01-18 04:07:20 +00:00
7319c01771
Fix volumes-from re-applying on each start
...
Fixes #9709
In cases where the volumes-from container is removed and the consuming
container is restarted, docker was trying to re-apply volumes from that
now missing container, which is uneccessary since the volumes are
already applied.
Also cleaned up the volumes-from parsing function, which was doing way more than
it should have been.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: a738df0354cc615c8d0fa3254621b3db811fe0b9
Component: engine
2015-01-17 07:14:25 -05:00
40a61d0eec
Make .dockercfg with json.MarshallIndent
...
Fixes #10129
Makes the .dockercfg more human parsable.
Also cleaned up the (technically) racey login test.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: b8f7526fc6333e5b67282e5b73eee497dd13ec34
Component: engine
2015-01-17 07:05:56 -05:00
807f07b041
SEND CAPABILITY IDS TO LXC
...
Sending capability ids instead of capability names ot LXC for --cap-add and --cap-drop.
Also fixed tests.
Docker-DCO-1.1-Signed-off-by: Abin Shahab <ashahab@altiscale.com > (github: ashahab-altiscale)
Upstream-commit: bff3509e431ce6d68e2accbb842c99d4abe86e05
Component: engine
2015-01-17 04:01:52 +00:00
ce12855fec
Fix failing integration tests
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: f29aacbc4804e3aca1c21b9411e960b2a2543da1
Component: engine
2015-01-16 11:34:45 -08:00
e26618d2ee
restart: add test for recording restart policy name
...
Add test for recording restart policy name on
- restart=no
- restart=always
- restart=on-failure
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: c3ed49dcdb2d835bf4fbdebe3f07318c945282c8
Component: engine
2015-01-16 17:58:26 +08:00
557565cd70
Test pulling image with aliases
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 92d5eafe03eca8ca931ddca5ef7d6e41ca25caad
Component: engine
2015-01-15 14:05:06 -08:00
30a16b5689
Add some push test coverage
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: dbec2317e503b8a0190102332168f9d0256392b7
Component: engine
2015-01-15 14:05:06 -08:00
ffe79c46c9
Tests for push to registry v2
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: f138f7bd50a1c5a435f3146f0b0298a2a4e260ce
Component: engine
2015-01-15 14:05:06 -08:00
cf62cf0f1e
RegistryV2 datastructure for tests
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 2fc2862a73dbbc612f59f61f66c465d2e48bcbea
Component: engine
2015-01-15 14:05:06 -08:00
e2b5d6afd7
Merge pull request #10108 from tiborvass/carry-9989
...
[Carry] Fix a panic where RUN [] would be supplied
Upstream-commit: eaecf741f0e00a09782d5bcf16159cc8ea258b67
Component: engine
2015-01-14 17:12:59 -08:00
28b575d46d
Merge pull request #10106 from icecrime/win_integration_tests
...
Fix some Windows integration tests
Upstream-commit: c126a2303fccc074f2382d01a2b685a1836cd621
Component: engine
2015-01-14 17:04:49 -08:00
a22356060c
Merge pull request #10107 from jfrazelle/9328-fix-try-start-paused-container
...
Error should show when trying to start a paused container.
Upstream-commit: 27f69b077703607862afa4a75c929ed07396ac2b
Component: engine
2015-01-14 17:02:23 -08:00
869bebb91c
Fix a panic where RUN [] would be supplied.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 39343b86182b4e997dc991645729ae130bd0f5f2
Component: engine
2015-01-14 16:55:56 -08:00
11776a4f9e
Error should show when trying to start a paused container.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 02246d2d9f9fe8eb040d1eb1ac4b7a84c3f3f059
Component: engine
2015-01-14 16:49:08 -08:00
7467fc1bd7
Take DOCKER_TEST_HOST into account
...
Tests no longer make the assumption that the daemon can be accessed
through unix:///var/run/docker.sock.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: e1ef33449f484678d236cb49e80daf5ba1e1899c
Component: engine
2015-01-14 16:14:27 -08:00
2a3eb3ae39
Merge pull request #10093 from crosbymichael/readonly-containers
...
Add --read-only for read only container rootfs
Upstream-commit: 95c0f07966035ce79c6b51a2eee8c60c59fb523c
Component: engine
2015-01-14 15:56:51 -08:00
2ef8faf6e3
Add --readonly for read only container rootfs
...
Add a --readonly flag to allow the container's root filesystem to be
mounted as readonly. This can be used in combination with volumes to
force a container's process to only write to locations that will be
persisted. This is useful in many cases where the admin controls where
they would like developers to write files and error on any other
locations.
Closes #7923
Closes #8752
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 409407091a7282d0c4086b71e86397e2d089ba13
Component: engine
2015-01-14 15:41:31 -08:00
d149e702e3
Merge pull request #10101 from LK4D4/fix_vet_errors
...
Fix vet errors
Upstream-commit: 3118ccc6bcd2a2d63700584dc1ce2dbb0a65cbb6
Component: engine
2015-01-14 15:18:20 -08:00
8d01a3ebdf
Add build constraint.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 798215af24953f5e3dcacb08965f3714b2fd903f
Component: engine
2015-01-14 14:40:07 -08:00
8b29f19b21
Fix format calls as suggested by vet
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: a75b02fe72f3da73f9788919ff2c22f183978db7
Component: engine
2015-01-14 14:12:03 -08:00
c664f952ef
Merge pull request #10082 from jfrazelle/10081-fix-renaming
...
Renaming a container with an invalid name should fail
Upstream-commit: f67c6d313b971a068262a09840f7afdf4d34b292
Component: engine
2015-01-14 13:12:36 -08:00
4fdee94024
Renaming a container with an invalid name should fail
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: a92281637f5b629e110b5bd074566bb6c302bb62
Component: engine
2015-01-14 12:54:23 -08:00
4bfc5b4983
Merge pull request #10056 from coolljt0725/add_link_accept_ID
...
Add --link accept container ID
Upstream-commit: 37b69408f84d970322e8620b6360bde70974e4b6
Component: engine
2015-01-14 12:50:10 -08:00
2df21c5a26
Merge pull request #10072 from LK4D4/fix_mutable_net_files
...
Rewrite TestRunMutableNetworkFiles to avoid races
Upstream-commit: 95fea08f7adabfb1b21a7716e36d8aeda51a37a1
Component: engine
2015-01-14 11:48:46 -08:00
1220f4f0e6
Merge pull request #10075 from LK4D4/test_for_maxcount
...
Test for restarting count
Upstream-commit: 5136b11514b4d891334c06a0692c5deeecfd5b32
Component: engine
2015-01-14 09:17:02 -08:00
65bf9de1e2
Add tests for --link
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 2292167b02ce0489d38e0a6beeb792bcb7534f34
Component: engine
2015-01-14 15:25:58 +08:00
a01afb0b92
Test for restarting count
...
This test is for #10058
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 79d30364c95f13b9ff2ce3b4df9bb70d2ddd41f0
Component: engine
2015-01-13 20:28:44 -08:00
863904b2ee
Merge pull request #10080 from crosbymichael/pid-ns
...
Add --pid flag for staying in the host's pid namespace
Upstream-commit: 47e3da848ffbe88d0188ae6cfc09d6e1668bc293
Component: engine
2015-01-13 17:00:18 -08:00
6955e4f0e5
Merge pull request #10079 from tonistiigi/fix-attach-stdin
...
Fix attach stream closing issues
Upstream-commit: 23b48fbe146b6412390e18eb9ac8173ef43e73df
Component: engine
2015-01-13 16:40:42 -08:00
24529f4dc7
Add test for --pid=host
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 15e8f3fdd31dc498be106a69a7e29ba459c36c1a
Component: engine
2015-01-13 16:39:08 -08:00
3fb41b40ef
Fix attach stream closing issues
...
Fixes : #9860
Fixes: detach and attach tty mode
We never actually need to close container `stdin` after `stdout/stderr` finishes. We only need to close the `stdin` goroutine. In some cases this also means closing `stdin` but that is already controlled by the goroutine itself.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 28cf8fddd4c19e98fd0a6fcf0a6e7ea545521412
Component: engine
2015-01-14 02:03:25 +02:00
cb72368bb7
Fix filenames for unix only integration-cli tests
...
Test suffix comes after the platform/arch.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: f9876dade26fd779c1cb0e2156e635c85c6e8ee2
Component: engine
2015-01-14 00:31:25 +02:00
6643773793
Rewrite TestRunMutableNetworkFiles to avoid races
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 492b18ac08e2652c1b95fd9f3c786e1fb1f28c3a
Component: engine
2015-01-13 14:14:36 -08:00
bea4f60ac9
Support whitespaces in ADD and COPY continued
...
Add tests and documentation for this new feature.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: cf455017e059e4b52d8d0357070e24ee153e3069
Component: engine
2015-01-13 11:34:15 -08:00
59accfd690
Merge pull request #9973 from duglin/Issue9880
...
Make sure that ADD/COPY still populate the cache even if they don't use it
Upstream-commit: 99a15ec8bd548563a1ac4f652c55d4bb1ff769e4
Component: engine
2015-01-13 11:17:34 -08:00
080d79ba9a
Merge pull request #8570 from brahmaroutu/rename_container_3036
...
Rename a existing container
Upstream-commit: b9e42d66e790535fe1226adea4ff39e25f493b51
Component: engine
2015-01-13 10:37:29 -08:00
d6590e04a1
Test case for error code when exiting on OOM
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 9a9339d9a23e0005b769bd2f44c722c4a6be730f
Component: engine
2015-01-12 23:16:28 -08:00
eacdfc7d44
rename a existing container
...
Closes #3036
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 21a809d9ae0ef8392f37c9262dca93ff31966e22
Component: engine
2015-01-13 03:27:17 +00:00
fc2be6379b
Merge pull request #9985 from jfrazelle/fix-exited-filter-should-not-show-running
...
`docker ps --filter exited=status` should not show running containers
Upstream-commit: 3ec695924009421f9b1f79368e9e5b1e3e2ca94f
Component: engine
2015-01-12 15:09:22 -05:00
6e3c62c8f5
Merge pull request #9987 from jfrazelle/fix-filter-status-exited-not-require-all
...
`docker ps --filter status=exited should not require passing -a`
Upstream-commit: e90e754682a4f041e9e7c8a23201524362a2433d
Component: engine
2015-01-12 15:05:58 -05:00
c24f558440
Fix a few minor issues with building/running inside msysGit
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: d43f0b9fc5ec3eae816466ec0307682c13945b31
Component: engine
2015-01-09 17:28:40 -07:00
3a63bcc0c5
Merge pull request #9980 from erikh/parser-with-no-command
...
Fix a parser error where an empty RUN statement would cause a panic
Upstream-commit: 32cde64c04acb0c227b9371028f68de1666bf503
Component: engine
2015-01-08 19:34:06 -05:00
24f7ba3a1f
docker ps --filter exited=status should not show running containers
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 81f84023bef5e94dfbcfbb44443bc03707b355c4
Component: engine
2015-01-08 16:23:54 -08:00
