34ed0e262c
Merge pull request #24060 from Microsoft/jjh/skipruncidfilecleanupifemptyrs1
...
Windows: Skip RunCidFileCleanupIfEmpty on RS1
Upstream-commit: a0d068e7c643b489395bb3d4d2f24997cb735a03
Component: engine
2016-06-30 16:36:41 -07:00
cba178dcd2
Merge pull request #24056 from Microsoft/jjh/skiptestbuildemptycmdrs1
...
Windows: Skip TestBuildEmptyCmd on RS1
Upstream-commit: 9828960ade14a49de15d0fbe189a79dd2403dfa4
Component: engine
2016-06-30 16:34:55 -07:00
8038d9fddd
Use HOSTNAME in the output of docker node ls
...
This fix tries to address an issue raised in #24090 where
the title field of `docker node ls` use NAME instead of
HOSTNAME. Yet the content of this field is actually
hostname.
The fix makes needed changes for the output of
`docker node ls`.
An additional test has been added to cover the change in
this fix.
This fix fixes #24090 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 4bc91ceeb750db6a6270b2f1821cb0b2f30117fc
Component: engine
2016-06-29 19:54:16 -07:00
29d2889a79
Merge pull request #23789 from tonistiigi/swarm-integration-tests
...
Update swarm integration tests and shutdown synchronization
Upstream-commit: 9162011680efa714788377651e51872bb852e2e3
Component: engine
2016-06-29 14:09:57 -07:00
7dfc0b0c86
Merge pull request #24050 from ncoolz/issue-cluster-store-config
...
Fix check code for --cluster-store and --cluster-advertise in config_…
Upstream-commit: 2f9d20288c7b1ebf6f0a9888e6af9b5262d49484
Component: engine
2016-06-29 19:15:23 +02:00
c760355112
Fix daemon tests.
...
Fix two test issues:
- pidof is not available in PATH on some Jenkins systems (rhel, centos)
Use kill -0 instead.
- Cleanup after plugin test. This is a stop gap fix. The right way to
fix this, is to shutdown the plugin on daemon shutdown path (except
for the live-restore case). This will be done in a follow up PR.
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 6d36431e2395867d7bb101dbfd4340e132fd5438
Component: engine
2016-06-28 15:29:49 -07:00
0660142527
Add integration tests for swarm incompatible
...
Signed-off-by: Wonjun Kim <wonjun.kim@navercorp.com >
Upstream-commit: d71789828f5c8d2e0f5757f1c003325c4b8a871d
Component: engine
2016-06-29 06:21:02 +09:00
e89f357b69
Windows: Skip RunCidFileCleanupIfEmpty on RS1
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 20424fccdd1ba874277eca7d9644b1ef98ac4b2e
Component: engine
2016-06-28 13:04:42 -07:00
cf2790c1e0
Windows: Skip TestBuildEmptyCmd on RS1
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 45da1274421ba7484dcf2bf1a398f9e3683600d1
Component: engine
2016-06-28 12:22:16 -07:00
ab805f2a0c
Merge pull request #23677 from anusha-ragunathan/mv_test_stable
...
Move daemon restart tests from experimental to stable.
Upstream-commit: 48eba0bfe6fcdd4c90740831e6a8b5aff6e0a5c0
Component: engine
2016-06-27 13:07:55 -07:00
c0eb5739c1
Merge pull request #23775 from mlaventure/change-stock-runtime-alias
...
Use "runc" as alias for the default runtime
Upstream-commit: 91fa49071d7373ccdee4585b403b488e1fce2efa
Component: engine
2016-06-27 11:55:46 -07:00
56369a363d
Merge pull request #23801 from inercia/fix_docker_cli_by_digest
...
Make sure some integration tests check for the right return code
Upstream-commit: 1cfd37f432743b54f79d99064bfd8acf9ebd608c
Component: engine
2016-06-27 15:37:59 +02:00
39780ea801
Change the comments in TestPullFailsWithAlteredLayer and TestPullFailsWithAlteredLayer
...
Signed-off-by: Alvaro Saurin <alvaro.saurin@gmail.com >
Upstream-commit: b5f51e5281ddf677622d7d5e50048071e4cfcbc1
Component: engine
2016-06-27 11:06:32 +02:00
2e3267c27b
Disable iptables in swarm test daemons
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: caaf92f7b4b947c5d226fb66a355b60fac683979
Component: engine
2016-06-24 15:47:37 -07:00
c644a729dc
Add test for force-new-cluster
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 1acb8ef82572c52994b1ff00fe5c86aac53be4b8
Component: engine
2016-06-24 13:57:11 -07:00
76181c2413
Switch node management tests to api types
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 22b34d64496c9b6ebae5e2b4a98ecd9a172cc557
Component: engine
2016-06-24 11:51:43 -07:00
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
89230aa7b1
Add plugin restore tests.
...
Also live restore is stable now. So move experimental tests out to stable.
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 006d58d7e6756848058bd69a12c698c44e64efd1
Component: engine
2016-06-22 19:04:26 -07:00
40dd500778
Use "docker-runc" as alias for the default runtime
...
This also moves the variable holding the default runtime name from the
engine-api repository into docker repository
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 69af7d0d13670b8e2a03a38b4d9a849fc109b338
Component: engine
2016-06-22 11:59:26 -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
