Li Yi
a4cd4da158
Support start_period for healthcheck in Docker Compose
...
Signed-off-by: Li Yi <denverdino@gmail.com >
Upstream-commit: 0abdad615f
Component: cli
2017-08-29 11:19:29 +08:00
Yong Tang
5fa8a99c76
Merge pull request #34653 from tonistiigi/fix-readbody-test
...
integration-cli: fix testutil refactor merge conflict
Upstream-commit: 765e543a385bef1174bc73e98b59af1c81b29b45
Component: engine
2017-08-28 15:37:55 -07:00
Andrew Hsu
250005dc95
Merge pull request #207 from vieux/contrib
...
improve CONTRIBUTING.md
2017-08-28 15:12:46 -07:00
Tonis Tiigi
f0c0f969b6
integration-cli: fix testutil refactor merge conflict
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: ba6f9e4cc9687dd1ccd1ab304b363ed578c6d908
Component: engine
2017-08-28 10:19:54 -07:00
Tõnis Tiigi
ef16add9bb
Merge pull request #34263 from estesp/chown-flag-add-copy
...
Add --chown flag to ADD/COPY commands
Upstream-commit: a1183dda578f531ef65766611f9e16a0636e3a17
Component: engine
2017-08-28 09:50:44 -07:00
Daniel Nephin
83dbde2057
Reduce complexity of two formatters
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: d318c4112b
Component: cli
2017-08-28 12:49:07 -04:00
Vincent Demeester
7ae4b76cda
Merge pull request #471 from cyli/surface-autolock
...
Include whether the managers in the swarm are autolocked as part of `docker info`
Upstream-commit: 7e52344cd2
Component: cli
2017-08-28 17:46:09 +02:00
Brian Goff
ae8028a8f8
Merge pull request #34331 from twistlock/plugable_secrets_backend
...
[WIP] update swarmkit dependecies to support plugable secrets
Upstream-commit: 964ba0eaa83ac44e614c7ca68fbe2d92c5435a8c
Component: engine
2017-08-28 10:31:27 -04:00
Harald Albers
b812e1036b
Use native formatting in bash completion of nodes
...
Completion of nodes now uses native Docker commands that were not available
when this function was created.
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: e391e34801
Component: cli
2017-08-28 09:59:19 +02:00
Harald Albers
b132c15093
Improve bash completion for --credential-spec
...
This option is Windows specific and should be only available if the
daemon runs on Windows.
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 056ccf88be
Component: cli
2017-08-28 09:53:58 +02:00
Yong Tang
36da978ca7
Merge pull request #34468 from Microsoft/jjh/lcowisolation
...
LCOW: Force Hyper-V Isolation
Upstream-commit: a63a2e84d8613cd6a666cafcd3d521fc0df46706
Component: engine
2017-08-27 13:35:55 -07:00
Yong Tang
4a60bb27ab
Merge pull request #34615 from dnephin/remove-pkg-testutil-assert
...
Move ErrorContains to an internal package
Upstream-commit: 6ed5db6243243c8b7ee3ff165f21bda4465124e5
Component: engine
2017-08-26 19:09:27 -07:00
Ying Li
6143a4613a
Include whether the managers in the swarm are autolocked as part of docker info.
...
Signed-off-by: Ying Li <ying.li@docker.com >
Upstream-commit: 3428b78e96
Component: cli
2017-08-25 16:33:46 -07:00
Daniel Nephin
1057cf80e4
Replace service ps cli tests with service inspect API test.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 6cd6d8646a90fa2013416bc8f11bd78d72c4180d
Component: engine
2017-08-25 17:27:41 -04:00
Daniel Nephin
402a69d8fb
Cleanup daemon.LoadBusybox() to use the API instead of client
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 98a4613017df2b7de045d93e25a376fd00baeb0c
Component: engine
2017-08-25 17:24:25 -04:00
Daniel Nephin
29f6815811
Add gotestyourself to vendor.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 381a1c0a5ac99b6d7ab33a29150878b9a8008e95
Component: engine
2017-08-25 17:24:25 -04:00
Daniel Nephin
67a4f5a5d6
Merge pull request #34613 from dnephin/remove-pkg-testutil-cmd
...
Remove pkg testutil cmd
Upstream-commit: a5631c75e1349f6d71c53dbabee7f166f770d2b2
Component: engine
2017-08-25 15:09:52 -04:00
Vincent Demeester
de5380dba8
Merge pull request #454 from mstanleyjones/resource-updating-windows
...
docker update does not work on Windows containers
Upstream-commit: 21b5bbe411
Component: cli
2017-08-25 19:57:12 +02:00
Misty Stanley-Jones
2d72ab2282
docker update does not work on Windows containers
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 047d3c23a7
Component: cli
2017-08-25 10:35:28 -07:00
Yong Tang
a1941ae3c8
Merge pull request #34352 from ChenMin46/fix_rename_shared_namespace
...
Use ID rather than Name to identify a container when sharing namespace
Upstream-commit: 70214f95b25a63234ecdd59a253b09faf4c68fcd
Component: engine
2017-08-25 09:39:58 -07:00
Daniel Nephin
0458d1b8d1
Merge pull request #452 from dnephin/compose-allow-x-fields
...
Allow extension fields in the v3.4 version of the compose format
Upstream-commit: d83752cdf2
Component: cli
2017-08-25 12:37:47 -04:00
Daniel Nephin
9e09dbbb1a
Merge pull request #469 from dnephin/add-testing-doc
...
Add testing guidelines document
Upstream-commit: cfb228b963
Component: cli
2017-08-25 12:35:16 -04:00
Vincent Demeester
61202c02f5
Merge pull request #34590 from shouze/add-support-of-ChownOpts-to-TarWithOptions
...
archive: add ChownOpts support to TarWithOptions
Upstream-commit: 475c9926db9228e94b222eaf6e9fe30f0b02582a
Component: engine
2017-08-25 18:21:31 +02:00
Daniel Nephin
687fe21a97
Remove pkg/testutil/cmd
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: c2c127fa5a23599d698a71ead103b2f676fdf5c4
Component: engine
2017-08-25 12:07:31 -04:00
Daniel Nephin
e8bff97a66
Update tests to use icmd
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 92427b3a8146e048c4b85e5ece1530da97d8472d
Component: engine
2017-08-25 12:07:30 -04:00
Daniel Nephin
be2aa448d0
Add gotestyourself to vendor
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 0a7ff351b76f369b1cb1bc741e54b0d9018e7410
Component: engine
2017-08-25 12:06:25 -04:00
Daniel Nephin
9cb0439501
Move ErrorContains to an internal package.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: e62b2d410cda6ac9166ac8d052fd3fb99a9460bf
Component: engine
2017-08-25 12:04:58 -04:00
Yong Tang
8ae7aa2322
Merge pull request #34583 from tklauser/win-event-functions
...
Use windows event functions from golang.org/x/sys/windows
Upstream-commit: 2cea2f5469871c16564c900c5b27cee102ebff0b
Component: engine
2017-08-25 07:43:03 -07:00
Vincent Demeester
3b7e9c65c0
Merge pull request #367 from kolyshkin/ipcmode
...
Introduce/document new IPC modes
Upstream-commit: 8ebc03a71f
Component: cli
2017-08-25 09:48:00 +02:00
Vincent Demeester
939356770a
Merge pull request #468 from rubensfig/34373-docker-doc
...
Added docker documentation for Expose
Upstream-commit: 1086e84718
Component: cli
2017-08-25 09:07:16 +02:00
Victor Vieux
9f8c4fc433
Merge pull request #34614 from dnephin/remove-pkg-testutil-tempfile
...
Remove pkg testutil tempfile
Upstream-commit: ff6fbe224f8b490b05f8489e5ae3219126d8017b
Component: engine
2017-08-24 15:24:15 -07:00
Yong Tang
51ed00caab
Merge pull request #34627 from estesp/no-userns-plugin-upgrade-test
...
Turn off plugin upgrade test when userns on
Upstream-commit: 0f957d2c09af7216d839f267c14db86d9194b5d0
Component: engine
2017-08-24 15:04:44 -07:00
John Howard
2ca5291236
Merge pull request #34356 from mlaventure/update-containerd
...
Update containerd to 06b9cb35161009dcb7123345749fef02f7cea8e0
Upstream-commit: 285bc997311b75263bfac9e8ff7c4d60cdeca0bc
Component: engine
2017-08-24 14:25:44 -07:00
Yong Tang
ffac489c66
Merge pull request #34626 from kolyshkin/ipcmode-samehost
...
docker_api_ipcmode_test: add SameHostDaemon req
Upstream-commit: acd2995143023805f890677eef05849211410c4d
Component: engine
2017-08-24 13:01:26 -07:00
Daniel Nephin
01392057b0
Add unconvert linter
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 2f5f0af3fdb7e9ee607a0e178dbe2af6e10cccf4
Component: engine
2017-08-24 15:08:31 -04:00
Daniel Nephin
157456237a
Add interfacer linter
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 709bf8b7bcc67f3ea3a7a39e29af8ae16a38b06f
Component: engine
2017-08-24 15:08:26 -04:00
Daniel Nephin
3104a37598
Add TESTING document.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: ffed6f5ff9
Component: cli
2017-08-24 14:45:50 -04:00
Chen Min
7776562662
Use ID rather than Name to identify a container when sharing namespace
...
Fix: https://github.com/moby/moby/issues/34307
Signed-off-by: Chen Min <chenmin46@huawei.com >
Upstream-commit: b6e5ea8e5757fa89e03ed3e76f1d85c068b3522d
Component: engine
2017-08-25 01:55:50 +08:00
Phil Estes
4d6d2b530e
Turn off plugin upgrade test when userns on
...
Until volume plugins can be made aware of the remapped root,
interactions with volumes created by plugin will not work as the file
ownership denies permissions to the userns remapped range.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com >
Upstream-commit: b1ced2af03c5a8009c314bde80b5f2516e0522fd
Component: engine
2017-08-24 10:52:11 -07:00
Christopher Jones
863e01391b
[ppc64le] add deb support for ubuntu-xenial
...
Adds ubuntu-xenial as a make deb target for ppc64le
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: e2a3a2f2f157e1a84346c0aad2b87ef2b2a7f0f3
Component: packaging
2017-08-24 13:24:05 -04:00
Yong Tang
c2a60a890d
Merge pull request #34451 from Microsoft/jjh/bootvhdx
...
LCOW: Additional flags for VHD boot
Upstream-commit: e5cdaf1bd9c5d7984e491cb346ae1453dbb79f50
Component: engine
2017-08-24 08:38:19 -07:00
Daniel Nephin
80c42a7f96
Merge pull request #33534 from sbko/31410-replace-deprecated-sockrequest
...
Stop using deprecated SockRequest
Upstream-commit: eb52bb22a4f3b9632545f10c0a3af436aced817d
Component: engine
2017-08-24 11:30:13 -04:00
Kir Kolyshkin
42d094ea01
docker_api_ipcmode_test: add SameHostDaemon req
...
This is needed for tests that do some checks and/or create files
on the host system. Inspired by commit d9f3548a9.
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com >
Upstream-commit: 8a9878081f8e14a54067f249bc98ae66f0b61ba3
Component: engine
2017-08-24 17:02:21 +03:00
Yong Tang
364ecfbfa8
Merge pull request #34611 from estesp/no-hostmode-userns
...
Host-mode IPC sharing not possible in a userns
Upstream-commit: ff167a285a79339eaeb1772c9ce7a22d33ad0136
Component: engine
2017-08-23 19:52:03 -07:00
Tibor Vass
7313d24a20
Merge pull request #445 from dnephin/add-end-to-end-suite
...
Add end to end suite
Upstream-commit: 6c3d93bbb6
Component: cli
2017-08-23 16:16:09 -07:00
Rubens Figueiredo
1d2c919b02
Added docker documentation for Expose
...
Signed-off-by: Rubens Figueiredo <r.figueiredo.52@gmail.com >
Upstream-commit: dd95731a21
Component: cli
2017-08-23 16:12:46 -07:00
Daniel Nephin
5d498bba11
Build the docker cli for unreleased platforms
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 5ba5e6fff438029195c0df1303481c1e260bc6ec
Component: engine
2017-08-23 17:50:02 -04:00
Daniel Nephin
aacb33bdaf
Remove pkg/testutil tempfile and golden
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 468154a841b599dd3a7acaf6162e2a73cf44d1f6
Component: engine
2017-08-23 17:26:27 -04:00
Daniel Nephin
b03ce80e95
Update tests to use gotestyourself/fs
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 60672382c7eb1f65e063c4bf07b0880559cea91b
Component: engine
2017-08-23 17:25:00 -04:00
Daniel Nephin
332ff8ee6f
Add gotestyourself to vendor.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 47962ee32ff785eb179de4a706e557b66e8b1841
Component: engine
2017-08-23 17:13:27 -04:00