25481985f3
Use check in params so we don't ignore errors
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: bcad3d5212641237fe97c9ea2668869805e3bce8
Component: engine
2016-12-08 10:56:29 +01:00
2a1f61f581
Merge pull request #29062 from erxian/refine-api-swagger.yaml-towards-image-create-status-code
...
refine api swagger.yaml towards image create status code
Upstream-commit: 9468d687ac924db8df95fd8d2bcbe7facafb8c2d
Component: engine
2016-12-07 22:03:54 +01:00
69c140812c
Merge pull request #29174 from lhsvobodaj/29132-add-build-args-to-build-deb-script
...
Add variable DOCKER_BUILD_ARGS to build-deb script
Upstream-commit: 74ecec9199a2f1e9ff1ce52e254c8de65882ab4a
Component: engine
2016-12-07 09:02:47 -08:00
1a51a9823b
Merge pull request #29195 from vdemeester/integration-test-shell-dont-run-if-compilation-failure
...
Make sure we don't run integration cli test if compilation fails
Upstream-commit: 8b7d0764256f8476e4adeba2fb0b8a2d5558f25a
Component: engine
2016-12-07 10:35:30 -05:00
0856573894
Merge pull request #29061 from allencloud/forbid-leave-when-swarm-locked
...
not export errors and forbid leave without --force when unlocked
Upstream-commit: 145fa7781777080b29b2eb9597f0789b6638a91a
Component: engine
2016-12-07 10:30:28 -05:00
f4ce4909fe
Merge pull request #29201 from lixiaobing10051267/masterVar4
...
modify URLs for bind docker in docs/api
Upstream-commit: 9b91c7e423062455d7bbb9e33d7e7812dd64ab22
Component: engine
2016-12-07 16:30:02 +01:00
c9d884efda
Merge pull request #29202 from sdurrheimer/zsh-completion-network-attachable
...
Add zsh completion for 'docker network create --attachable'
Upstream-commit: d23bb3d0831fa200d45510e9f85b0086b2533553
Component: engine
2016-12-07 09:18:22 +01:00
a7b2b7037a
Add zsh completion for 'docker network create --attachable'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: bce11a29f822e18ef2bac28f147b5506f785e4cc
Component: engine
2016-12-07 08:09:42 +01:00
e148b77b83
modify URLs for bind docker in docs/api
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 9c76fb253ecc53cc54d196a4460d8e1d91c1683d
Component: engine
2016-12-07 15:06:16 +08:00
ed60722124
not export errors and forbid leave when unlocked
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 7bdd1a4f9c06ab4af8e652b7483104456e72c442
Component: engine
2016-12-07 13:25:34 +08:00
afe61e5090
refine api swagger.yaml towards image create status code
...
Signed-off-by: erxian <evelynhsu21@gmail.com >
Upstream-commit: 15be050fb307d0da1521767a6f53d9b95429396b
Component: engine
2016-12-07 10:27:40 +08:00
af8b72cda0
Merge pull request #29186 from yongtang/29185-docker-inspect-unknown-object
...
Fix `docker inspect <unkown object>` issue on Windows
Upstream-commit: 9249b29348babc571a8c1c25642eb5e792119496
Component: engine
2016-12-06 18:23:08 -08:00
ea74b6e388
Make sure we don't run integration cli test if compilation fails
...
Otherwise, while using test-integration-shell, it runs the tests using
the previously compiled test binary.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: aefbc034445df17c98f1247b100e2b6a2ed22e84
Component: engine
2016-12-06 23:37:08 +01:00
37fb30ac29
Fix docker inspect <unkown object> issue on Windows
...
This fix tries to address the issue raised on 29185 where
`docker inspect <unknown object>` on Windows will return:
```
Error response from daemon: plugins are not supported on this platform
```
The reason was that in case `--type` is not specified, `docker inspect`
will iterate through different types `container`, `image`, `network`,
`plugin` etc. The `plugin` object is the last type to check.
However, as `plugin` is not supported on Windows yet, the error message
is not very informative for `plugins are not supported on this platform`.
This fix tries to fix the issue by return a `not found` error on unsupported
platforms as well.
An integration test has been added to cover the changes for Windows/Linux.
This fix fixes 29185.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 88fcdb0a825da040ef2b1f9c191af480f0f2cc90
Component: engine
2016-12-06 12:05:59 -08:00
d262373ee7
Merge pull request #28907 from tonistiigi/cluster-refactor
...
Switch cluster locking strategy
Upstream-commit: eefbf1ddd3ee4e6b6e6dc7e938e77a96ceb40163
Component: engine
2016-12-06 10:02:23 -08:00
00a3f09456
Merge pull request #29182 from albers/completion-network-create--attachable
...
Add bash completion for `docker network create --attachable`
Upstream-commit: 9ec471049d4a435a489fa27767faebadb0f66e3c
Component: engine
2016-12-06 18:52:55 +01:00
281fa9ea35
Add bash completion for docker network create --attachable
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 8d2e789bbc59efa75d242457dba4b8651a1f9ace
Component: engine
2016-12-06 08:44:02 -08:00
fad60545c0
Merge pull request #29081 from andrewhsu/fix-rhel73
...
add selinux policy for centos-7
Upstream-commit: b7ab3276c2f7f875e041ed4d1a3a7975f1496e17
Component: engine
2016-12-06 11:00:45 -05:00
78547424d3
Merge pull request #28823 from AkihiroSuda/ensure-dev-pts-readonly
...
add a test for ensuring the behavior of read-only /dev/shm
Upstream-commit: 11702c66cfce350ff710d5170921a83b9748d4bf
Component: engine
2016-12-06 08:39:43 -05:00
4ecd5ea8d2
Merge pull request #29153 from aaronlehmann/volume-refs-map
...
volume: Use a map of maps for VolumeStore.refs
Upstream-commit: fa451847136ae44775ade4738c1ec372e2e4ed98
Component: engine
2016-12-06 14:35:18 +01:00
a8eab9725a
Add variable DOCKER_BUILD_ARGS to build-deb script
...
Some containers were being built (`docker build`) without
the DOCKER_BUILD_ARGS variable, which was causing some
issues because of the lack of network proxy configuration.
Fixes #29132
Signed-off-by: Luiz Svoboda <luizek@gmail.com >
Upstream-commit: 63aaf5e316d7b51db9be94bcb16dab07fdf1fdb4
Component: engine
2016-12-06 10:17:41 -02:00
8290729448
Merge pull request #29145 from Microsoft/jjh/make
...
Windows: make.ps1 Throw exception on failure
Upstream-commit: 080d7a554322076c4347b3d3f203289eb949cc74
Component: engine
2016-12-06 12:10:56 +01:00
3e9857033b
Merge pull request #29149 from Microsoft/jjh/dockerfileclarification
...
Windows: Dockerfile 2GB clarification Hyper-V
Upstream-commit: 96a2d9e7d2655a8374c2bdf326cd4a7224ce34bf
Component: engine
2016-12-06 12:10:03 +01:00
767d2b0a2a
Merge pull request #29166 from allencloud/add-403-for-network-create-endpoint
...
add 403 for endpoint network create
Upstream-commit: f687eb576ff508872213b5639c3bc279db5e6852
Component: engine
2016-12-06 11:47:28 +01:00
00e81acaa1
Merge pull request #29073 from adshmh/28756-print-checkpoint-name-in-checkpoint-create-command
...
Print checkpoint id when creating a checkpoint
Upstream-commit: 7f9ba93914a5b9fff7c21cc5cb19de90a9190f35
Component: engine
2016-12-06 11:06:29 +01:00
9603ca0d08
Merge pull request #28896 from yongtang/28884-secret-name-mask-ID
...
Fix issue where secret ID is masked by name
Upstream-commit: 57d77cc205768624c36b4bd7fb98d9924925087e
Component: engine
2016-12-06 11:05:30 +01:00
92a14fe836
Merge pull request #28535 from yongtang/28497-prune-until
...
Convert DanglingOnly to Filters for `docker image prune`
Upstream-commit: 745795ef2e0089c5001e5a2fc7ba8c1ab0234857
Component: engine
2016-12-06 11:03:45 +01:00
050e2993f5
Merge pull request #28974 from AkihiroSuda/test-service-logs
...
improve TestServiceLogs for the goroutine issue #28915
Upstream-commit: 08f0100d5025e32d1392fab3493d5c0436ccdd2c
Component: engine
2016-12-06 10:58:57 +01:00
8be5282fae
Merge pull request #29159 from Microsoft/jjh/bumpgit
...
Windows: Bump to latest version of git
Upstream-commit: 8326dcd2af04338cf6e56285f42bf8530ccb1274
Component: engine
2016-12-06 10:30:33 +01:00
c6dacdbe65
Merge pull request #29096 from cyli/fix-swarmjoinpromote-test
...
Fix DockerSwarmSuite.TestSwarmJoinPromoteLocked flakiness
Upstream-commit: 67131bde6d6e5511ce76b0e1dafdbe7293eaa1ab
Component: engine
2016-12-06 10:19:36 +01:00
cb41d4ee32
Merge pull request #29162 from friism/patch-8
...
Windows: make.ps1 - remove bonus whitespace
Upstream-commit: b4618baf68d6db22313a30a985501c61c7dc0b1e
Component: engine
2016-12-06 10:18:42 +01:00
7eb856b2dd
Merge pull request #28939 from duglin/HideDupWarnings
...
Only show global warnings once
Upstream-commit: e8a2c7196a2715c318bbfb2b57076fa1922a245f
Component: engine
2016-12-06 16:12:34 +09:00
13d5eb7768
add 403 for endpoint network create
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 0d21e24b9fb90ea804ba37af303de7547743ba2b
Component: engine
2016-12-06 14:36:50 +08:00
67570c96fa
Merge pull request #29136 from cpuguy83/pkgcache_use_volume
...
Use named volumes for docker pkg cache
Upstream-commit: 268991a9f52557a922d41c98de6d72c9d084a9d6
Component: engine
2016-12-06 14:26:10 +09:00
f9e126f19d
remove bonus whitespace
...
Signed-off-by: Michael Friis <friism@gmail.com >
Upstream-commit: 8d47858f96c7ef03a9d3543e0994119390acb1bb
Component: engine
2016-12-05 20:21:25 -08:00
cc8d5c0801
improve TestServiceLogs for the goroutine issue #28915
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: f8a93d0c9d157dddc4e4d4d9c43a6fe7c7c0c242
Component: engine
2016-12-06 03:44:49 +00:00
cecb5272ed
add a test for ensuring the behavior of read-only /dev/shm
...
The test ensures that `docker run --read-only -v /var/empty:/dev/shm:ro`
makes /dev/shm read-only
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 46ade6acb5b6cdb80287a83afd16c20c6a8b4dff
Component: engine
2016-12-06 03:44:02 +00:00
b729d1ae5d
Fix typo in integration-cli ( #29160 )
...
Signed-off-by: xianwei <xianwei.zw@alibaba-inc.com >
Upstream-commit: 2dfb57b6706daee8e0855319bc2b121bf970267a
Component: engine
2016-12-05 22:23:41 -05:00
a6482c217b
Windows: Bump to latest version of git
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 8a45eea2ddac40c907feb38859eb056a4d0024cc
Component: engine
2016-12-05 18:40:31 -08:00
655301f8a7
Use named volumes for docker pkg cache
...
Changes the default when incremental build is enabled to use named
volumes instead of bindmounts.
The reason for this is, on Mac/Windows the bind mounts will go over the
shared fs, which is incredibly slow and itself uses lots of CPU.
Makes an incremental build on OSX go from ~40s to 10s.
To get the old behavior, can set `PKGCACHE_DIR=.go-pkg-cache`
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: c9623d1b7619dfffe01fa47b4338637945c1a53f
Component: engine
2016-12-05 20:42:08 -05:00
983cf6d582
Merge pull request #29123 from vdemeester/29116-compose-to-swarm-logging
...
Handle logging in compose to swarm
Upstream-commit: 1f09d68a6e98b8b20ff4e877835bc798cfdb0100
Component: engine
2016-12-05 20:39:08 -05:00
7eaf67346f
Merge pull request #29082 from runcom/fix-rpm-buildtime
...
hack/make.sh: fix BUILDTIME
Upstream-commit: 29e728e9b2a088a8b7845db397ea2f51dc2554d8
Component: engine
2016-12-05 16:31:29 -08:00
8e87df7fd3
volume: Use a map of maps for VolumeStore.refs
...
The current implementation of getRefs is a bit fragile. It returns a
slice to callers without copying its contents, and assumes the contents
will not be modified elsewhere.
Also, the current implementation of Dereference requires copying the
slice of references, excluding the one we wish to remove.
To improve both of these things, change refs to be a map of maps.
Deleting an item becomes trivial, and returning a slice of references
necessitates copying from the map.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: a762222396d21990b2c0772300660312e7a58b6c
Component: engine
2016-12-05 15:39:05 -08:00
bb56a95461
Windows: Dockerfile 2GB clarification Hyper-V
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: f7b4d6544506f882f3168ab6a2ccb75f0ad0794e
Component: engine
2016-12-05 14:01:17 -08:00
690bfc6638
In DockerSwarmSuite.TestSwarmJoinPromoteLocked, actually wait for the node to
...
finish being demoted before restarting it and ensuring it isn't locked anymore
to reduce test flakiness.
Signed-off-by: cyli <cyli@twistedmatrix.com >
Upstream-commit: e831a7cdb7a2e60f38e6de8a5e6be4d681181f42
Component: engine
2016-12-05 13:21:27 -08:00
3c2896d350
Merge pull request #28963 from vieux/refactor_plugin_install
...
refactor plugin install
Upstream-commit: 1c96879f1e99efc881aaa3480bc6aab18d233475
Component: engine
2016-12-05 12:00:29 -08:00
50e3fb21f3
Merge pull request #29117 from AkihiroSuda/vendor-swarmkit
...
[master] Vendor swarmkit
Upstream-commit: 04cd1990b47d51559a7df0a8437ec84764109288
Component: engine
2016-12-05 14:11:21 -05:00
4b08621474
Merge pull request #29134 from unclejack/gofmt_fixes
...
api/types/container,client: gofmt
Upstream-commit: ac9226d8435316f45c123b51b9dad4da4d02ad81
Component: engine
2016-12-05 19:26:25 +01:00
ca7a3bb94d
Merge pull request #29115 from andrewhsu/fix-vim-install
...
run dnf upgrade before installing in fedora
Upstream-commit: 6a8156d646a36982d54d8d33c4002b0312375050
Component: engine
2016-12-05 19:05:14 +01:00
7c4ac2a285
Windows: make.ps1 Throw exception on failure
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 8c22a00b77043db50a1b4837a66dfb27dab3f070
Component: engine
2016-12-05 09:58:56 -08:00
