de55ec79ea
Update oracle linux selinux to match docker upstream
...
Add a dependency on specific selinux version for OL on docker-engine.spec
Signed-off-by: Thomas Tanaka <thomas.tanaka@oracle.com >
Upstream-commit: fc7cc1cc75b68005ad161dad53d696696b5c5f9f
Component: engine
2017-03-24 12:17:39 -07:00
2c87cf80c3
Cleanup compose convert error messages.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: b03a18572363560845439eec041502014da85128
Component: engine
2017-03-24 10:43:28 -04:00
2d2f5a3bba
Add bash completion for network ls --filter scope
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 4dd461a6bfc77a652ea08744741e64c3ae5f13a3
Component: engine
2017-03-24 13:06:26 +01:00
fd9c0e1e49
Merge pull request #31529 from yongtang/31324-network-ls-filter-scope
...
Add `--filter scope=swarm|local` for `docker network ls`
Upstream-commit: 4e290f7a2b9fb1fc808cece50dc7d8e31da0f963
Component: engine
2017-03-24 12:26:10 +01:00
48a5bc9c2a
Merge pull request #32071 from tonistiigi/fix-integration-tests
...
Fix integration tests build errors
Upstream-commit: 9a2dcf6a15f6b7b46349a1d3b84388b4d37dc154
Component: engine
2017-03-24 10:30:42 +01:00
d952883696
Merge pull request #32042 from vdemeester/compose-interpolate-error-instead-of-panic
...
[compose/interpolation] Make sure we error out instead of panic during interpolation
Upstream-commit: 8d2a82853c3401bdffbcc91b12399ef6589d26d0
Component: engine
2017-03-24 09:00:06 +01:00
703c536b96
Fix integration tests build errors
...
Caused by a merge conflict.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 4c7710d5d02acf42efa667fc33cb877385f2bbeb
Component: engine
2017-03-24 00:27:32 -07:00
dd50f0df64
Merge pull request #31608 from vdemeester/integration-cli-package
...
[test-integration] Introduce a `cli` package for test-integration
Upstream-commit: 8008f6529394d8c458ccf58f4763754681568b57
Component: engine
2017-03-24 13:04:47 +09:00
c90ad1369f
Merge pull request #31257 from tonistiigi/nested-build
...
build: add multi-stage build support
Upstream-commit: 2fa8fe400d926b3ceb0c84640a8f4e0f36e51463
Component: engine
2017-03-23 19:14:13 -07:00
d918c4ba81
Add --filter scope=swarm|local for docker network ls
...
This fix tries to address the request in 31324 by adding
`--filter scope=swarm|local` for `docker network ls`.
As `docker network ls` has a `SCOPE` column by default,
it is natural to add the support of `--filter scope=swarm|local`.
This fix adds the `scope=swarm|local` support for
`docker network ls --filter`.
Related docs has been updated.
Additional unit test cases have been added.
This fix fixes 31324.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 704ea8f6b4ad6f43c348affe357994d440aaf3de
Component: engine
2017-03-23 18:48:11 -07:00
9a572f349e
Merge pull request #31629 from darrenstahlmsft/ShutdownLock
...
Windows: Stop holding client container lock during shutdown
Upstream-commit: caf8d884aadd4cc56c1ffb524ce9b6d51ad63d88
Component: engine
2017-03-23 18:16:56 -07:00
dc0d47d701
Fix relative path on windows for uuid paths
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 684633f734f86b6a66873b42c9356eb543e12917
Component: engine
2017-03-23 15:12:19 -07:00
e59b5a1439
Add support for COPY from previous rootfs
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: f95f58283b2a69f4fd06d01de2281641e09b06bb
Component: engine
2017-03-23 15:12:15 -07:00
1faeba234d
Merge pull request #31668 from Microsoft/jjh/nopidfileasservice
...
Windows: no pidfile when service
Upstream-commit: b47c50cf11a48c068e8794af1cd2bfebdae90995
Component: engine
2017-03-23 17:10:35 -04:00
80cfdf07d5
Merge pull request #31626 from darrenstahlmsft/WindowsUpdateContainer
...
Windows: Add missing HostConfig fields to update block
Upstream-commit: c1d40ade5d99f6886cd9ac7b1d26e4db29eaac30
Component: engine
2017-03-23 16:54:03 -04:00
d4d4f16a60
Merge pull request #32019 from anusha-ragunathan/plugin-sigkill
...
Add missing test for daemon kill with plugins running.
Upstream-commit: fd56e8ffa14399c8a5d65598de70c4692f222d8f
Component: engine
2017-03-23 15:46:59 -04:00
9210b1bdbd
Introduce a cli package for test-integration
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 50c4475df6304e0cf12ea95217eb00ab5d572e34
Component: engine
2017-03-23 18:35:22 +01:00
e1610cddb8
Merge pull request #31986 from Microsoft/jjh/fix28267
...
Windows: Don't close client stdin handle to avoid hang
Upstream-commit: ad530ffee09a4ca6b87a2b009f86b4651653e29a
Component: engine
2017-03-23 16:35:54 +01:00
229e8f9746
Make sure we error out instead of panic during interpolation
...
Use type assertion to error out if the type isn't the right one
instead of panic as before this change.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: c165a8bfa1419724eb504f3cb7fdf3ca1b97483b
Component: engine
2017-03-23 16:09:57 +01:00
2bc10a312a
Merge pull request #32028 from sdurrheimer/zsh-completion-service-ls-mode-filter
...
Add zsh completion for 'docker service ls --filter mode'
Upstream-commit: d9ecb1b8fec139a6c814cdc94f4fe1b46989221b
Component: engine
2017-03-23 14:19:36 +01:00
7dca954f71
Merge pull request #32029 from sdurrheimer/zsh-completion-secret-ls-format
...
Add zsh completion for 'docker secret ls --format'
Upstream-commit: f438cf6c7aa3b782fc7aeb15f6b668d723eeb5ca
Component: engine
2017-03-23 14:19:14 +01:00
fb95fcbdfc
Merge pull request #32021 from tophj-ibm/fix-notary-vendor-p
...
[ppc64le] fix notary vendor
Upstream-commit: 64eff3e218cedfdf162414c721e3b8d7d5a1fe76
Component: engine
2017-03-22 22:08:42 -04:00
14a9300f18
Merge pull request #32020 from sdurrheimer/zsh-completion-service-create-update-rollback-on-failure
...
Add zsh completion for 'docker service {create,update} --rollback-*'
Upstream-commit: 6fe5eb010e59dbe32c0a443b6a641280019a4609
Component: engine
2017-03-22 22:02:51 -04:00
42ae1bde5b
Merge pull request #32025 from sdurrheimer/zsh-completion-service-logs-formatting
...
Add zsh completion for 'docker logs --no-task-ids --no-trunc'
Upstream-commit: cf4589666b2b3a6c0e3ca6743f064dc62af133d7
Component: engine
2017-03-22 22:02:14 -04:00
cbbcce0bc9
Merge pull request #32022 from sdurrheimer/zsh-completion-service-create-update-stop-signal
...
Add zsh completion for 'docker service {create,update} --stop-signal'
Upstream-commit: 7a607efcd64874c242dc0795ac20ba42ebd05fc2
Component: engine
2017-03-22 22:01:15 -04:00
b82363b6c6
Merge pull request #32026 from sdurrheimer/zsh-completion-network-inspect-verbose
...
Add zsh completion for 'docker network inspect --verbose'
Upstream-commit: 18cf0a59103a89e896dccefc7114295452f9623e
Component: engine
2017-03-22 21:59:26 -04:00
8f0cf5fe95
Merge pull request #32017 from sdurrheimer/zsh-completion-build-add-host
...
Add zsh completion for 'docker build --add-host'
Upstream-commit: b573c23e6b898dd449d28b3c644b8d99c39ad187
Component: engine
2017-03-22 21:58:47 -04:00
99e2b2fba6
Merge pull request #32024 from sdurrheimer/zsh-completion-service-create-update-placement-ref
...
Add zsh completion for 'docker service {create,update} --placement-pref'
Upstream-commit: 9e538fb4b0708af893b3fc8c0b5943eabc95f149
Component: engine
2017-03-22 21:58:26 -04:00
0e21058181
Merge pull request #31631 from aaronlehmann/swarm-failure-on-startup
...
cluster: Proceed with startup if cluster component can't be created
Upstream-commit: 9b33edfa7e1f8fcd32b1c19120bc591ae22a5a8f
Component: engine
2017-03-22 16:40:49 -07:00
ffaf7e6335
Add zsh completion for 'docker secret ls --format'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 414704825679cbc5d340306934404002569adc1f
Component: engine
2017-03-22 23:56:29 +01:00
a4e552e0fc
Add zsh completion for 'docker service ls --filter mode'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 94b6e810e0cae6ff96e54846b8ca31972bb87084
Component: engine
2017-03-22 23:52:36 +01:00
ef52126a2e
Add zsh completion for 'docker network inspect --verbose'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: b30906e29ccfd0b75a1b7215e8377ece4b4cb061
Component: engine
2017-03-22 23:35:07 +01:00
b9bc0edbea
Add zsh completion for 'docker service {create,update} --placement-pref'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 415e453a55faa8c3b60559ff360735caa6753f60
Component: engine
2017-03-22 23:30:22 +01:00
68e9275441
Add zsh completion for 'docker logs --no-task-ids --no-trunc'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 516edbcabbba2e3e4ba38d7b9fbda927a92de8eb
Component: engine
2017-03-22 23:26:33 +01:00
0e04cd7ace
Merge pull request #32002 from vdemeester/compose-remove-type-dict
...
Remove compose types.Dict alias
Upstream-commit: bb1ae453a6f8b8bc1c5d03972d3223e6d9f70c40
Component: engine
2017-03-22 23:08:09 +01:00
fafd64c2a3
Add zsh completion for 'docker service {create,update} --stop-signal'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 6121a011ba1db455626c823d1660aee473c45df6
Component: engine
2017-03-22 22:49:57 +01:00
0fbaab526f
[ppc64le] fix notary vendor link
...
Notary switched to vendor a while ago, so make that change here. Change
is consistent with all other dockerfiles.
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: 28b99648aea000b01eb9634743110900d025238c
Component: engine
2017-03-22 17:47:23 -04:00
00a9f5f73c
Add zsh completion for 'docker service {create,update} --rollback-*'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 169745ce29ac735b4c6c5c810224e50eebfb8f01
Component: engine
2017-03-22 22:40:46 +01:00
d6f71ce6ed
Add missing test for daemon kill with plugins running.
...
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com >
Upstream-commit: b748debb76110e577cfde7c5d5c362e69ddf86ce
Component: engine
2017-03-22 14:38:55 -07:00
4fb897d687
Add zsh completion for 'docker build --add-host'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: fbedc588bec4f6b4669e744450eded9f5e4bf799
Component: engine
2017-03-22 22:28:09 +01:00
30a11974ed
Merge pull request #31930 from anusha-ragunathan/authz-disable
...
When authz plugin is disabled, remove from authz middleware chain.
Upstream-commit: bbce24997c7a31454edd1d3d979823582bcdd95d
Component: engine
2017-03-22 14:17:38 -07:00
ed9e56a592
Merge pull request #31715 from anusha-ragunathan/ipc-host
...
Add support in plugin config for accessing host ipc and pid namespace.
Upstream-commit: 0caced4644c0b188b9644e9ab5fe7a31ac855968
Component: engine
2017-03-22 14:17:21 -07:00
df8db8303f
remove the duplicate line from doc and rebase with master for 'example of ADD and COPY with special characters file name'
...
Signed-off-by: Foysal Iqbal <foysal.iqbal.fb@gmail.com >
Upstream-commit: dacf8fa27c576512cecea4a15b9adb93808c9743
Component: engine
2017-03-22 15:08:17 -04:00
2034662b7a
When authz plugin is disabled, remove from authz middleware chain.
...
When the daemon is configured to run with an authorization-plugin and if
the plugin is disabled, the daemon continues to send API requests to the
plugin and expect it to respond. But the plugin has been disabled. As a
result, all API requests are blocked. Fix this behavior by removing the
disabled plugin from the authz middleware chain.
Tested using riyaz/authz-no-volume-plugin and observed that after
disabling the plugin, API request/response is functional.
Fixes #31836
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com >
Upstream-commit: 38de272bd4dfea945985b7031cd353ac5f6507c5
Component: engine
2017-03-22 12:07:39 -07:00
3866c616c0
Merge pull request #31980 from JohnMaguire/doc-update
...
Add note regarding Windows VOLUME limitations
Upstream-commit: c33c457852bd6901ecc1f81449b59984a555a963
Component: engine
2017-03-22 12:01:36 -07:00
c8fe0a8414
Add note regarding Windows VOLUME limitations
...
Signed-off-by: John Maguire <jmaguire@duosecurity.com >
Upstream-commit: 020ec88542e88bb561c30a1ec984d0a17c74b7f9
Component: engine
2017-03-22 14:57:42 -04:00
fde81cc335
Merge pull request #31992 from tonistiigi/fix-builder-exit-code
...
Return proper exit code on builder panic
Upstream-commit: 0f9ec7e47072b0c2e954b5b821bde5c1fe81bfa7
Component: engine
2017-03-22 19:04:09 +01:00
e82f1456b4
Embed DockerVersion in plugin config.
...
Embedding DockerVersion in plugin config when the plugin is created,
enables users to do a docker plugin inspect and know which version
the plugin was built on. This is helpful in cases where users are
running a new plugin on older docker releases and confused at
unexpected behavior.
By embedding DockerVersion in the config, we claim that there's no
guarantee that if the plugin config's DockerVersion is greater that
the version of the docker engine the plugin is executed against, the
plugin will work as expected.
For example, lets say:
- in 17.03, a plugin was released as johndoe/foo:v1
- in 17.05, the plugin uses the new ipchost config setting and author
publishes johndoe/foo:v2
In this case, johndoe/foo:v2 was built on 17.05 using ipchost, but is
running on docker-engine version 17.03. Since 17.05 > 17.03, there's
no guarantee that the plugin will work as expected. Ofcourse, if the
plugin did not use newly added config settings (ipchost in this case)
in 17.05, it would work fine in 17.03.
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com >
Upstream-commit: 342ed107bc6283cfc9b3301142e71f20aae0aaca
Component: engine
2017-03-22 10:26:20 -07:00
f3536ca0df
Remove compose types.Dict alias
...
It is just an alias type and make the code a little bit more complex
and hard to use from outside `compose` package.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: d3dc27d145a36b3c81fd5999f2c525af95d9596a
Component: engine
2017-03-22 16:16:20 +01:00
dfbe94cc62
Merge pull request #31996 from aboch/drst
...
Fix stop/start/restart of detached container
Upstream-commit: d8406fd7a029f38ece55421294568045d1c9de92
Component: engine
2017-03-22 10:24:45 -04:00
