beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
25492 commits 14 branches 412 tags 338 MiB
Commit graph

3505 commits

Author SHA1 Message Date
Tõnis Tiigi
a0d068e7c6 Merge pull request #24060 from Microsoft/jjh/skipruncidfilecleanupifemptyrs1 
Windows: Skip RunCidFileCleanupIfEmpty on RS1
 2016-06-30 16:36:41 -07:00
Tõnis Tiigi
9828960ade Merge pull request #24056 from Microsoft/jjh/skiptestbuildemptycmdrs1 
Windows: Skip TestBuildEmptyCmd on RS1
 2016-06-30 16:34:55 -07:00
Yong Tang
4bc91ceeb7 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>
 2016-06-29 19:54:16 -07:00
Alexander Morozov
9162011680 Merge pull request #23789 from tonistiigi/swarm-integration-tests 
Update swarm integration tests and shutdown synchronization
 2016-06-29 14:09:57 -07:00
Vincent Demeester
2f9d20288c Merge pull request #24050 from ncoolz/issue-cluster-store-config 
Fix check code for --cluster-store and --cluster-advertise in config_…
 2016-06-29 19:15:23 +02:00
Anusha Ragunathan
6d36431e23 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>
 2016-06-28 15:29:49 -07:00
Wonjun Kim
d71789828f Add integration tests for swarm incompatible 
Signed-off-by: Wonjun Kim <wonjun.kim@navercorp.com>
 2016-06-29 06:21:02 +09:00
John Howard
20424fccdd Windows: Skip RunCidFileCleanupIfEmpty on RS1 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-06-28 13:04:42 -07:00
John Howard
45da127442 Windows: Skip TestBuildEmptyCmd on RS1 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-06-28 12:22:16 -07:00
Michael Crosby
48eba0bfe6 Merge pull request #23677 from anusha-ragunathan/mv_test_stable 
Move daemon restart tests from experimental to stable.
 2016-06-27 13:07:55 -07:00
Michael Crosby
91fa49071d Merge pull request #23775 from mlaventure/change-stock-runtime-alias 
Use "runc" as alias for the default runtime
 2016-06-27 11:55:46 -07:00
Vincent Demeester
1cfd37f432 Merge pull request #23801 from inercia/fix_docker_cli_by_digest 
Make sure some integration tests check for the right return code
 2016-06-27 15:37:59 +02:00
Alvaro Saurin
b5f51e5281 Change the comments in TestPullFailsWithAlteredLayer and TestPullFailsWithAlteredLayer 
Signed-off-by: Alvaro Saurin <alvaro.saurin@gmail.com>
 2016-06-27 11:06:32 +02:00
Tonis Tiigi
caaf92f7b4 Disable iptables in swarm test daemons 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-06-24 15:47:37 -07:00
Tonis Tiigi
1acb8ef825 Add test for force-new-cluster 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-06-24 13:57:11 -07:00
Tonis Tiigi
22b34d6449 Switch node management tests to api types 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-06-24 11:51:43 -07:00
Vincent Demeester
88d1ee6c11 Merge pull request #23360 from sainath14/rename_error 
docker rename fix to address the issue of renaming with the same name
 2016-06-24 19:54:09 +02:00
Vincent Demeester
23696e8265 Merge pull request #23921 from tonistiigi/test-timeouts 
Increase test timeouts for node state changes
 2016-06-24 19:21:56 +02:00
Brian Goff
f6326d3076 Merge pull request #23802 from inercia/fix_docker_cli_run_test 
Make sure we compare string with the same capitalization
 2016-06-24 10:27:29 -04:00
Tonis Tiigi
2e5da44341 Increase test timeouts for node state changes 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-06-23 17:30:42 -07:00
Tõnis Tiigi
487931902c Merge pull request #23790 from tonistiigi/skip-pull 
Skip always pulling images on integration tests
 2016-06-23 11:47:33 -07:00
Anusha Ragunathan
006d58d7e6 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>
 2016-06-22 19:04:26 -07:00
Kenfe-Mickael Laventure
69af7d0d13 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>
 2016-06-22 11:59:26 -07:00
Alexander Morozov
df6630f6a3 Merge pull request #23832 from tonistiigi/unify-swarm-init-update 
Unify swarm init and update options
 2016-06-22 11:56:07 -07:00
Sven Dowideit
e76e52b38b Merge pull request #23738 from psiclops/typos 
Fix misspell typos
 2016-06-22 11:56:13 +10:00
Tonis Tiigi
fb3eb1c27e 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>
 2016-06-21 16:34:32 -07:00
Alexander Morozov
7b2b4eb40c Merge pull request #23700 from Microsoft/jjh/fixrotestcases 
Windows: Fix RO test cases
 2016-06-21 09:01:43 -07:00
Alvaro Saurin
41cc7c4d9d Make sure we are trying to unmount a mounted /etc/resolv.conf 
Signed-off-by: Alvaro Saurin <alvaro.saurin@gmail.com>
 2016-06-21 10:38:45 +02:00
Alvaro Saurin
ded347e744 Make sure we compare strings with the same capitalization 
Signed-off-by: Alvaro Saurin <alvaro.saurin@gmail.com>
 2016-06-21 10:35:50 +02:00
Tonis Tiigi
e2226223e6 Skip always pulling images on integration tests 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-06-20 17:45:29 -07:00
John Howard
03816ad5b5 Windows: Fix RO test cases 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-06-20 10:15:20 -07:00
Alexander Morozov
7d7d8fa752 Merge pull request #23449 from HackToday/improveunit 
Improve the TestEventsContainerWithMultiNetwork UT
 2016-06-20 09:38:22 -07:00
Alexander Morozov
1475557341 Merge pull request #23649 from dmcgowan/image-delete-last-repo-ref 
Update rmi logic for canonical references
 2016-06-20 09:35:16 -07:00
Vincent Demeester
4cc70c921f Merge pull request #23723 from tonistiigi/incomplete-restore 
Don’t try to restore swarm from incomplete state
 2016-06-19 19:56:39 +02:00
nick
7135afa79b Fix misspell typos 
Signed-off-by: nick <nicholasrusso@icloud.com>
 2016-06-19 09:53:31 -07:00
Vincent Demeester
ce72bf8028 Merge pull request #23720 from yongtang/23716-renaming-started-container 
Fix `docker start` error with renamed container
 2016-06-19 13:56:13 +02:00
Tonis Tiigi
ded1d9af38 Don’t try to restore swarm from incomplete state 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-06-18 19:43:47 -07:00
Yong Tang
6e86733b47 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>
 2016-06-18 16:43:30 -07:00
Dmitri Shuralyov
8cf4133f37 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>
 2016-06-18 16:32:27 -07:00
Arnaud Porterie (icecrime)
1f8ab93b44
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>
 2016-06-17 17:09:40 -07:00
Derek McGowan
5cff374b14 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)
 2016-06-17 10:15:56 -07:00
Tibor Vass
4b70d4561e plugins: install should not automatically accept all permissions 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-06-17 10:03:30 -07:00
Anusha Ragunathan
22e781e8e3 Add disable flag for plugin Install. 
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
 2016-06-17 07:48:43 -07:00
Arnaud Porterie
f52c807650 Merge pull request #23651 from tonistiigi/cert-expiry 
Add cert-expiry to swarm update
 2016-06-17 02:50:58 +00:00
Tonis Tiigi
a933ac3c27 Add integration test for parsing swarm update options 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-06-16 19:50:01 -07:00
Arnaud Porterie
f4de3f314e Merge pull request #23644 from tonistiigi/fix-leave-delete 
Fix removing containers on leaving from pending state
 2016-06-17 01:40:45 +00:00
Arnaud Porterie
0ef720eded Merge pull request #23643 from tonistiigi/membership 
Return membership status on join without timeout
 2016-06-17 01:40:06 +00:00
Arnaud Porterie
16a6987a00 Merge pull request #23549 from dmcgowan/reference-ui-updates 
Do not show empty tags for digest references in output
 2016-06-17 00:47:49 +00:00
Tonis Tiigi
826f6f0703 Fix removing containers on leaving from pending state 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-06-16 16:08:15 -07:00
Tonis Tiigi
1973cee0cd Return membership status on join without timeout 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-06-16 15:27:08 -07:00