299779b4ac
Merge pull request #23360 from sainath14/rename_error
...
docker rename fix to address the issue of renaming with the same name
Upstream-commit: 88d1ee6c112d980a63c625389524047fea32e6d9
Component: engine
2016-06-24 19:54:09 +02:00
dda81cb1a9
Merge pull request #23921 from tonistiigi/test-timeouts
...
Increase test timeouts for node state changes
Upstream-commit: 23696e82658e8be1d428c63c52b52a51476d4248
Component: engine
2016-06-24 19:21:56 +02:00
1518772054
Merge pull request #23802 from inercia/fix_docker_cli_run_test
...
Make sure we compare string with the same capitalization
Upstream-commit: f6326d307667ea92ce6931985616d85d4e3248ed
Component: engine
2016-06-24 10:27:29 -04:00
4bcb0e068c
Increase test timeouts for node state changes
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 2e5da4434126309f2395cc3d5b2013674155ae5c
Component: engine
2016-06-23 17:30:42 -07:00
fbf0465b15
Merge pull request #23790 from tonistiigi/skip-pull
...
Skip always pulling images on integration tests
Upstream-commit: 487931902c1177352e4eceec1b5ef558a5ba24cc
Component: engine
2016-06-23 11:47:33 -07:00
266d9f9808
Merge pull request #23832 from tonistiigi/unify-swarm-init-update
...
Unify swarm init and update options
Upstream-commit: df6630f6a3c08548f355a255e18f01c9fcb0ad86
Component: engine
2016-06-22 11:56:07 -07:00
6e7f3b1cd8
Merge pull request #23738 from psiclops/typos
...
Fix misspell typos
Upstream-commit: e76e52b38b9829ccf613995f2afa0394230800ef
Component: engine
2016-06-22 11:56:13 +10:00
8c9dd4362c
Unify swarm init and update options
...
Add api side validation and defaults for init and
join requests.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: fb3eb1c27ef5520571c599ead8a72b343748db39
Component: engine
2016-06-21 16:34:32 -07:00
fd4459c7c2
Merge pull request #23700 from Microsoft/jjh/fixrotestcases
...
Windows: Fix RO test cases
Upstream-commit: 7b2b4eb40cfd907f3aa20b630cc2feeb8460404a
Component: engine
2016-06-21 09:01:43 -07:00
877267ab98
Make sure we are trying to unmount a mounted /etc/resolv.conf
...
Signed-off-by: Alvaro Saurin <alvaro.saurin@gmail.com >
Upstream-commit: 41cc7c4d9ddb6d6b9e024f30806adc82f1bb1d4a
Component: engine
2016-06-21 10:38:45 +02:00
579e7587f8
Make sure we compare strings with the same capitalization
...
Signed-off-by: Alvaro Saurin <alvaro.saurin@gmail.com >
Upstream-commit: ded347e744e74b99c023b30b53fcabe2c3bde24c
Component: engine
2016-06-21 10:35:50 +02:00
be80ca6785
Skip always pulling images on integration tests
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: e2226223e614716749cdb7701a130c7449f5f854
Component: engine
2016-06-20 17:45:29 -07:00
c9913bf8dc
Windows: Fix RO test cases
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 03816ad5b5a060449243d0e30fa396c2255ddacb
Component: engine
2016-06-20 10:15:20 -07:00
3f15c5ff29
Merge pull request #23449 from HackToday/improveunit
...
Improve the TestEventsContainerWithMultiNetwork UT
Upstream-commit: 7d7d8fa752d343a084164717d7089cd47f0cacc7
Component: engine
2016-06-20 09:38:22 -07:00
f30933141d
Merge pull request #23649 from dmcgowan/image-delete-last-repo-ref
...
Update rmi logic for canonical references
Upstream-commit: 1475557341b94ef8d8b2ced1bc4fa49b184cd5ff
Component: engine
2016-06-20 09:35:16 -07:00
359bbe8a17
Merge pull request #23723 from tonistiigi/incomplete-restore
...
Don’t try to restore swarm from incomplete state
Upstream-commit: 4cc70c921fb77f3a83e03e6cc9c6a63d3858b3ac
Component: engine
2016-06-19 19:56:39 +02:00
d62b2b14a2
Fix misspell typos
...
Signed-off-by: nick <nicholasrusso@icloud.com >
Upstream-commit: 7135afa79b4d99ba2a214fcc1c2decf95f850c2f
Component: engine
2016-06-19 09:53:31 -07:00
d677409a68
Merge pull request #23720 from yongtang/23716-renaming-started-container
...
Fix `docker start` error with renamed container
Upstream-commit: ce72bf80281daf0161dd5453026bf11d3703bcc6
Component: engine
2016-06-19 13:56:13 +02:00
20fc079713
Don’t try to restore swarm from incomplete state
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: ded1d9af38cb467dadab0521936174eef0d4bc9e
Component: engine
2016-06-18 19:43:47 -07:00
b8c843c318
Fix docker start error with renamed container
...
This fix tries to fix the issue raised in #23716 where `docker start`
causes an error of `No such container:` if the container has been
renamed before `docker start` returns.
The issue is that `docker start` use container name passed at the
beginning to check for exit code at the end of the `docker start`.
This fix addresses the issue by always use container's `ID` to get
the information during `docker start`.
Additional integration tests have been added to cover this fix.
This fix fixes #23716 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 6e86733b47faf0d7629751987346022544b65cb7
Component: engine
2016-06-18 16:43:30 -07:00
31e8392bc0
integration-cli: Change "Dns" to "DNS".
...
This fixes a minor lint/style issue, improves consistency.
According to Go style, which this project follows, acronyms should have
a consistent case. Source: https://github.com/golang/go/wiki/CodeReviewComments#initialisms
See https://github.com/docker/docker/pull/11310#discussion_r67394302 .
Signed-off-by: Dmitri Shuralyov <shurcooL@gmail.com >
Upstream-commit: 8cf4133f3749d7fa99a56cde98676a161971fb71
Component: engine
2016-06-18 16:32:27 -07:00
89ce4731a6
Change docker service update semantics
...
Change `docker service update` to replace attributes of the target
service rather than augment them. One particular occurrence where the
previous behavior proved problematic is when trying to update a port
mapping: the merge semantics provided no way of removing published
ports, but strictly of adding more.
The utility merge* functions where renamed accordingly to update*.
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com >
Upstream-commit: 1f8ab93b4422a88ef3053105c17acf1933576fbe
Component: engine
2016-06-17 17:09:40 -07:00
273dfbc1e3
Add tests for rmi
...
Add integration test for removing by image id with tag and digest reference to the same repository.
Add integration test to ensure only tag to other repository remains after deleting tag with accompanying digest reference.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 5cff374b140b4a836b7082d009bcfe9a6e96f1af
Component: engine
2016-06-17 10:15:56 -07:00
dc0392a7ed
plugins: install should not automatically accept all permissions
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 4b70d4561e4a9b57d80b70cfebc50831e230735a
Component: engine
2016-06-17 10:03:30 -07:00
a9608bfa10
Add disable flag for plugin Install.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 22e781e8e3ae1d1ab62ddcda983cabfde2e08ad4
Component: engine
2016-06-17 07:48:43 -07:00
bfa982122e
Merge pull request #23651 from tonistiigi/cert-expiry
...
Add cert-expiry to swarm update
Upstream-commit: f52c807650beb3bb0afe67bafd546792d7fa1422
Component: engine
2016-06-17 02:50:58 +00:00
7f08beb5b2
Add integration test for parsing swarm update options
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: a933ac3c27ac88cf69a2bc2bc16ce076486c0206
Component: engine
2016-06-16 19:50:01 -07:00
79ea0079e7
Merge pull request #23644 from tonistiigi/fix-leave-delete
...
Fix removing containers on leaving from pending state
Upstream-commit: f4de3f314e1e965056447d5ea6203ca4b66bb6e0
Component: engine
2016-06-17 01:40:45 +00:00
048ffaf8b1
Merge pull request #23643 from tonistiigi/membership
...
Return membership status on join without timeout
Upstream-commit: 0ef720ededc24018ce1f727814b1a9ae93897891
Component: engine
2016-06-17 01:40:06 +00:00
433425402a
Merge pull request #23549 from dmcgowan/reference-ui-updates
...
Do not show empty tags for digest references in output
Upstream-commit: 16a6987a001446c4ff7df3c6c66362dd76685b86
Component: engine
2016-06-17 00:47:49 +00:00
dae11af952
Fix removing containers on leaving from pending state
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 826f6f07031abc4dea6f71ed69d33a4e0789ee11
Component: engine
2016-06-16 16:08:15 -07:00
10f6f936be
Return membership status on join without timeout
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 1973cee0cd86da3c7b7002a3fed7af2557df538c
Component: engine
2016-06-16 15:27:08 -07:00
dc3dc99c53
Merge pull request #23520 from yongtang/23500-docker-info-security
...
Add security info to `docker info`
Upstream-commit: 6b4e2ad90be9dd642219982d7591f73bd5abaae9
Component: engine
2016-06-16 15:15:33 -07:00
7b4f900246
Merge pull request #23606 from vieux/fix_secrets
...
fix docker swarm init/update --secret
Upstream-commit: 657703178798ac497a82c16b4fd9f1c0728c60f9
Component: engine
2016-06-16 14:24:35 -07:00
f2801c549b
Add api tests for secret update
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: aed7667bee243b0e0d1aa480e3bb52bae894cfe5
Component: engine
2016-06-16 13:21:55 -07:00
c4c90efda6
Remove out-of-date health test
...
The test was waiting for the container to exit after failing its
healthcheck. However, we no longer automatically terminate containers,
so this waited instead for the container to time-out by itself.
Signed-off-by: Thomas Leonard <thomas.leonard@docker.com >
Upstream-commit: 18a59bb8691c6f6f6a7a86f56bbcfc5418509ed8
Component: engine
2016-06-16 13:09:57 +01:00
5445763ee1
Merge pull request #23583 from anusha-ragunathan/accept-perms
...
Add accept-permissions flag for install.
Upstream-commit: 6253c294947ef8ec64092bb612aafa45ff07f076
Component: engine
2016-06-16 12:44:37 +02:00
de87bc9acb
Merge pull request #23582 from tophj-ibm/fix-typo-in-daemon-test
...
Fix daemon test typo
Upstream-commit: e3ad63f7e44775335603ed23d34e1369eb2452b0
Component: engine
2016-06-16 05:22:50 +00:00
9f6da823f0
Merge pull request #23558 from mlaventure/fix-arm-test-for-multiple-runtimes
...
Fix TestRunWithRuntime* on arm
Upstream-commit: 17bf13b1b2b44e0351218fd0b25d716687f0df32
Component: engine
2016-06-16 04:09:15 +00:00
9bd6973edb
fix docker swarm init/update --secret
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 085895342c7f797f0eef7ec956438e33489f211f
Component: engine
2016-06-15 17:05:10 -07:00
d8d03043a3
Add basic integration tests for plugins.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: a2d48c9e4e2abadcba582de47891837b0a80b24c
Component: engine
2016-06-15 15:19:19 -07:00
25c9453aac
Fix test typo
...
Changes daemn to daemon
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: 51c0c6212d66ff940940e0a2c9393cfffafa5ee5
Component: engine
2016-06-15 13:45:25 -04:00
85aba87fc8
Fix hanging integration tests
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 22f827ababc1910bc48762d7980913497dbc915d
Component: engine
2016-06-15 10:19:45 -07:00
52c1999aed
Merge pull request #23301 from runcom/tmpfs-trump
...
daemon: allow tmpfs to trump over VOLUME(s)
Upstream-commit: 480d7b310b2b063621eb260aff34e34171694ae3
Component: engine
2016-06-15 17:11:00 +00:00
eb2bdeb9cf
daemon: allow tmpfs to trump over VOLUME(s)
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 756f6cef4a1379e59d6511ee000e435d23659153
Component: engine
2016-06-15 16:01:51 +02:00
02e6cd83ac
Merge pull request #23322 from tkopczynski/20784-builder-dockerfile-symlink
...
Reimplement integration test for symlink Dockerfile as a unit test
Upstream-commit: e08aed59dfd1642ae04ac4eb1055a378d6a572c1
Component: engine
2016-06-15 10:52:49 +02:00
d27484e0f7
Do not show empty tags for digest references in output
...
When a repository has a tag and digests, show tag for each digest value.
Do not duplicate rows for the same image name with both tag and digest.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 79eada38141dca71f5195df59882f1cb46657640
Component: engine
2016-06-14 22:44:49 -07:00
955da7c9c3
Merge pull request #23524 from aboch/restore
...
Daemon to support network restore
Upstream-commit: 91197953d07843e34f02d6d2dc435cc4c43dfec1
Component: engine
2016-06-15 02:33:16 +00:00
50a4204953
Merge pull request #23551 from tonistiigi/update-swarmkit
...
Update swarmkit to 25572005f
Upstream-commit: 574f7d2149930749256d075e2f60614ea97c85ae
Component: engine
2016-06-15 02:25:31 +00:00
fbfc97dd82
Fix TestRunWithRuntime* on arm
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: bd6317031bb8f7e1a82cbfd254fe60e0de703524
Component: engine
2016-06-14 18:59:22 -07:00
