Commit Graph

25330 Commits

Author SHA1 Message Date
0192bac2c8 Add test for checking created directories on remapped root
Signed-off-by: Antonis Kalipetis <akalipetis@gmail.com>
Upstream-commit: c6bff578b4f169e2fbd67dfbe9f0ac147fc8c255
Component: engine
2016-09-05 13:02:13 +03:00
9a0304155e Make host directory mounts use idtools.MkdirAllNewAs
This makes sure that:
1. Already existing directories are left untouched
2. Newly created directories are chowned to the correct root UID/GID in case of user namespaces
3. All parent directories still get created with host root UID/GID

Fix #21738

Signed-off-by: Antonis Kalipetis <akalipetis@gmail.com>
Upstream-commit: 72d8a77d522896ec73e07f49a1c1bcb44bbf3bbd
Component: engine
2016-09-05 12:46:57 +03:00
aabe996fb1 Merge pull request #26236 from yuexiao-wang/remove-h-option
Remove -h option for docker cli
Upstream-commit: 01fe5639bc46ea6cc2efe7b9333bb4d1abb1894b
Component: engine
2016-09-05 09:52:18 +02:00
06f15b681c Merge pull request #26297 from yongtang/26220-disconnect-container-from-network
Fix issue in disconnecting a container from network
Upstream-commit: 506c51e71e5a424175ed837aee5a304e0bc2c214
Component: engine
2016-09-04 21:15:39 -07:00
509edc829c Merge pull request #26302 from vdemeester/health_status-in-event-docs
Add health status as action on events documentations
Upstream-commit: b468df9eac16d73c9b8e4853411df1fafea37d1f
Component: engine
2016-09-05 10:03:14 +10:00
f1e49b9e9a Merge pull request #26245 from dbdd4us/master
add volumes, networks, nodes and services into label doc
Upstream-commit: 384de833c0f7e20d6a36b6786d1f2e2e67b90d2f
Component: engine
2016-09-05 10:02:35 +10:00
5599c8776d Add health status as action on events documentations
This was missing from the docs for 1.12.0.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: fb8b6438f265532ec47e001b2739ed614b47f3a0
Component: engine
2016-09-04 18:01:57 +02:00
edfe468b08 Fix issue in disconnecting a container from network
This fix tries to address the issue raised in 26220 where
disconnecting a container from network does not work if
the network id (instead of network name) has been specified.

The issue was that internally when trying to disconnecting
a contaienr fromt the network, the originally passed network
name or id has been used.

This fix uses the resolved network name (e.g., `bridge`).

An integration test has been added to cover the changes.

This fix fixes 26220.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 83d79f13aa2e94085e83e0f5bc5d51305dd2c192
Component: engine
2016-09-04 07:28:45 -07:00
96c3a68eb8 Merge pull request #26279 from miaoyq/delete-a-useless-funtion
delete a function which isn't used in the project
Upstream-commit: 93a8b5c42be79ae2ed5c956dfbb39da8e1f6d78b
Component: engine
2016-09-03 13:36:37 -04:00
637e45cd56 Merge pull request #26290 from tonistiigi/govet17
Fix govet for go1.7
Upstream-commit: c73fae2352788323476759f4199b034b7ffc54dd
Component: engine
2016-09-03 19:27:19 +02:00
833a33ebb8 Fix govet for go1.7
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 7a8c7b47cffa8485b03db715f78c087b01ae5dfa
Component: engine
2016-09-02 19:07:54 -07:00
300565157d Merge pull request #26225 from yongtang/26173-docker-import-quoted-change
Fix issue in `docker import -c` with quoted flags
Upstream-commit: 2e0bc0393a7a8f912e0d05d1806c770c1c8c6790
Component: engine
2016-09-02 13:34:25 -04:00
d354343b40 delete a function which isn't used in the project
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
Upstream-commit: 81849600fc1d7335f1ddc3ca5aa1cb5625bd2d30
Component: engine
2016-09-02 22:54:19 +08:00
5aa0a2b82e Merge pull request #26254 from tophj-ibm/change-ppc64le-dockerfile-to-golang
ppc64le: change dockerfile base from gcc to golang
Upstream-commit: 75f589a97945a31a5d36b8d348eeeb36e412151d
Component: engine
2016-09-02 10:05:39 -04:00
4f402c4255 Merge pull request #26264 from q384566678/test-two
Modify docker-restart.1.md
Upstream-commit: b98e918248f4d4880b707e24bf2f72878ffbb8d6
Component: engine
2016-09-02 15:53:19 +02:00
deca0aec9f Merge pull request #26261 from Microsoft/jjh/morebuildtests
Windows CI: Enable some more build tests
Upstream-commit: 84ebbb52314433d4724ad9c75c7d04e886fb59bd
Component: engine
2016-09-02 09:41:08 -04:00
7f24fbc8dc Merge pull request #26271 from AkihiroSuda/fix-service-create-doc
update docs/reference/commandline/service_create.md
Upstream-commit: 1a04d7b1e13ffe725a5310b55e83ae60b1ab7e55
Component: engine
2016-09-02 12:39:31 +02:00
c789417f1c update docs/reference/commandline/service_create.md
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: aa479616822e4e6ecd9d90425f11f76cd26ce70d
Component: engine
2016-09-02 09:59:20 +00:00
e92f9d7cac Merge pull request #24510 from runcom/new-seccomp-format
New seccomp json format
Upstream-commit: 9d71cba5f09825cdafe04fdb0243cc30bf887b68
Component: engine
2016-09-02 09:14:01 +01:00
6a651a8e95 Modify docker-restart.1.md
Signed-off-by: zhouhao <zhouhao@cn.fujitsu.com>
Upstream-commit: b99cf0de47420794049f8a208b78fb8be8398f77
Component: engine
2016-09-02 13:06:08 +08:00
96ee703a5f Remove -h option for docker cli
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 8ad8245ee39d731af7c79e722435c32f051387f7
Component: engine
2016-09-02 11:46:49 +08:00
e2707394d0 Fix issue in docker import -c with quoted flags
This fix tries to address the issue in 26173 where `docker import -c`
with quoted flags returns an error.

The issue was that in `api/client/image/import.go` the flag
`--change/-c` was handled by `StringSliceVarP` which does not handle
the quote well.

The similiar issue was enountered for 23309 (`docker commit`).

This fix takes the same approach as 23309 where `StringSliceVarP`
was replaced with `VarP` and `opts.ListOpts`.

An integration test has been added to cover the changes.

This fix fixes 26173.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: a79a27412d721a042ae96b411ab1b5b926a7d28a
Component: engine
2016-09-01 16:28:22 -07:00
9968a690ca Windows CI: Enable some more build tests
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: ede6163ec684efd04faffa8ce6d7f4213fe08c75
Component: engine
2016-09-01 16:27:04 -07:00
949c541343 ppc64le: change dockerfile base from gcc to golang
Now that gccgo isn't supported, change the ppc64le dockerfile base image
from a debian:jessie based + gccgo image to a debian:jessie + golang image.
Also includes a go path change to be more consistent across Dockerfiles.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: a243f35cf8906dc6d541dc3dd779a0a2c90cfa12
Component: engine
2016-09-01 16:51:11 -04:00
9d092e464e Merge pull request #26241 from YuPengZTE/devNote
The first letter of “docker“ is small
Upstream-commit: b14f29dfbd527fd2dbd05e024f760939aba6642c
Component: engine
2016-09-01 20:53:07 +02:00
a7538f7929 Merge pull request #26242 from YuPengZTE/devEG
"eg." should be "e.g."
Upstream-commit: baf2108baf8f4ff504847224cfb00794dfea5c20
Component: engine
2016-09-01 20:46:46 +02:00
19ba10b1b0 Merge pull request #26172 from Microsoft/jjh/testinspect
Windows: Enable multiple TestInspect tests
Upstream-commit: a19bdec6f0f2ca1b7539f701583f2f33f1923a2c
Component: engine
2016-09-01 19:46:19 +02:00
a1893f6374 Merge pull request #26077 from runcom/fix-TestImportBadURL
integration-cli: fix TestImportBadURL w/o network
Upstream-commit: 83fc63f9678cd1233bb0f86591a558acada621ac
Component: engine
2016-09-01 09:30:02 -07:00
9c1528efb8 Merge pull request #26226 from YuPengZTE/devTest
The first letter should be small in errors.New
Upstream-commit: 8abaf62715fab8422f20a28af2ff848223898839
Component: engine
2016-09-01 17:28:32 +02:00
7a15c4b5ad add volumes, networks, nodes and services into label doc
Signed-off-by: dbdd <wangtong2712@gmail.com>
Upstream-commit: 30404950c49986291c02e1f9e6f0fce3cb54e09b
Component: engine
2016-09-01 20:25:19 +08:00
009555a4b2 New seccomp format
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 5ff21add06ce0e502b41a194077daad311901996
Component: engine
2016-09-01 11:53:07 +02:00
a03ebc79ee Merge pull request #26200 from runcom/engine-api-vendor
vendor docker/engine-api@f9cef59044
Upstream-commit: 8ccac1ad4de898583113d036810da3a35a9be906
Component: engine
2016-09-01 10:51:34 +01:00
ec1fcdb2ef eg. should be e.g.
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
Upstream-commit: e4ac375fdbf331a8474c3b9a33be21a6434d5eb6
Component: engine
2016-09-01 17:44:35 +08:00
4fbbab7cfa The first letter docker is small
Upstream-commit: e0e62874bb9bcdaf6418e0d1728c9170527b3c3a
Component: engine
2016-09-01 17:03:01 +08:00
d73fb19f36 Merge pull request #26180 from yongtang/25943-validate-ip6
Fix issue in `--ip6` validation for `docker create`
Upstream-commit: f173555de8201d8b4a6578a52d405655212fbb5d
Component: engine
2016-09-01 11:02:16 +02:00
861fb5fa76 Merge pull request #26181 from yongtang/08302016-DockerDaemonSuite-NewDaemon
Change related test from DockerSuite to DockerDaemonSuite in `docker_cli_daemon_test.go`
Upstream-commit: b8d510e86ad6a70aad09442b89e0e984b14e0c72
Component: engine
2016-09-01 09:42:59 +02:00
c484c505e6 The first letter should be small in errors.New
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
Upstream-commit: e7935da2390bf458f07e9898f08a332ef9f53255
Component: engine
2016-09-01 11:26:40 +08:00
be784b745a Merge pull request #26186 from ywk253100/master
Fixes #25654, a bug in implements of loading image
Upstream-commit: 7776a0ebd76d7d69fb8198554e30a51d94edf056
Component: engine
2016-08-31 22:07:01 -04:00
436151d741 Merge pull request #26211 from aaronlehmann/no-advertise-addr-detection-on-join
cluster: Do not autodetect advertise address on join
Upstream-commit: beba6ea311fdff128ac2f1de78138c5da71d0f23
Component: engine
2016-08-31 17:19:23 -07:00
d6cc83cde2 Merge pull request #26208 from talex5/fix-health-test
Fix exec form of HEALTHCHECK CMD
Upstream-commit: 5a56f29c64ab1a2bb4f70ba65f248cd8fcebc57f
Component: engine
2016-08-31 23:27:39 +00:00
17a1a5ab1b Merge pull request #26214 from tonistiigi/revert-daemonsuite-fix
Revert "Change related tests from DockerSuite to DockerDaemonSuite in…
Upstream-commit: bdae52a23dd69be29f0d5b871ee791180329e458
Component: engine
2016-08-31 14:16:39 -07:00
1965814a4e vendor docker/engine-api@f9cef59044
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 8f7a8c75ae251f1260299892c5de7c83224b110e
Component: engine
2016-08-31 22:39:13 +02:00
5fcc71ddc8 Merge pull request #26206 from crosbymichael/py-xunit
Output docker-py test results in xunit format
Upstream-commit: 243d4dcc7e9ea3eb665301d5e3756afa4adb04f7
Component: engine
2016-08-31 21:48:47 +02:00
6366d986f8 Merge pull request #26191 from runcom/fix-unknownflag-exit-code
api: client: container: update: fix help text
Upstream-commit: 6ac30e57d0c3060478a04352b19e4188a8d0cc3e
Component: engine
2016-08-31 21:15:51 +02:00
9a5643d969 Merge pull request #26058 from anusha-ragunathan/add-pluginstore
Reorganize plugin package into sub packages.
Upstream-commit: e3bc989a9d14f2c47eab7874fad2865d0906b9ea
Component: engine
2016-08-31 11:58:34 -07:00
5b72529835 Revert "Change related tests from DockerSuite to DockerDaemonSuite in docker_cli_info_test.go"
This reverts commit 0ce5ef279cee13e92d696ae871fe81de37cec253.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: f0e99972877f06904e0327e9537de8390b5cfb4b
Component: engine
2016-08-31 11:52:22 -07:00
b88197c265 cluster: Do not autodetect advertise address on join
On join, remote addresses are supposed to be detected by the manager
that receives the join request. However, the daemon is interfering with
this by automatically detecting an advertise address and specifying that
to the remote manager. Fix this so that an advertise address is only
specified while joining a cluster if one was given by the user.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: b1d2b088533187954d3b98ed5951ec2dbbb422e9
Component: engine
2016-08-31 11:44:32 -07:00
22f7fc770f Fix exec form of HEALTHCHECK CMD
We attached the JSON flag to the wrong AST node, causing Docker to treat
the exec form ["binary", "arg"] as if the shell form "binary arg" had
been used. This failed if "ls" was not present.

Added a test to detect this.

Fixes #26174

Signed-off-by: Thomas Leonard <thomas.leonard@docker.com>
Upstream-commit: e95b6b51daed868094c7b66113381d5088e831b4
Component: engine
2016-08-31 17:50:12 +01:00
abf975f617 Output docker-py test results in xunit format
This adds a `results.xml` to the test-docker-py output folder.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: a9e513867cd9eb327ae56877886ed18a5ad5b691
Component: engine
2016-08-31 09:35:49 -07:00
161e8a294e Merge pull request #25616 from rhatdan/overlay_selinux
Linux upstream kernel Overlay file systems support SELinux
Upstream-commit: b42ab41b8f0c9077180686191c0dccda9fb1a5b6
Component: engine
2016-08-31 09:25:20 -07:00