Vincent Demeester
2a2b0da00b
Merge pull request #31773 from cyphar/apparmor-fix-ensure-exec
...
daemon: also ensureDefaultApparmorProfile in exec path
Upstream-commit: e311c1401982cde966e8cc8358efbfa37e2cae37
Component: engine
2017-03-13 16:15:49 +01:00
Vincent Demeester
dbf0cb1010
Merge pull request #30788 from ripcurld0/hide_win_opts
...
Hide command options that are related to Windows
Upstream-commit: be453c5a13f1945f1deb12308ba0600e72284365
Component: engine
2017-03-13 16:15:29 +01:00
Sebastiaan van Stijn
14b850d8cb
Merge pull request #30648 from allencloud/do-not-fail-fast-when-inspect
...
do not fail fast when executing inspect command
Upstream-commit: 562d2dc978c6489a776f9550416bef9e111baefd
Component: engine
2017-03-13 16:04:04 +01:00
Vincent Demeester
dc089ee246
Merge pull request #31503 from Microsoft/jjh/cleanuphcsonrestore
...
Windows: Cleanup HCS on restore
Upstream-commit: 2fca6526d6c9dfdc714f3a1b8ee880fbbab7580e
Component: engine
2017-03-13 13:43:35 +01:00
Sebastiaan van Stijn
d93297a0a4
Merge pull request #31047 from yallop/cli-v-state
...
Flags for specifying bind mount consistency
Upstream-commit: 7f6e7088b7ef083a57b11e3837119019de73487b
Component: engine
2017-03-13 11:36:10 +01:00
Aleksa Sarai
c2b7c22146
daemon: also ensureDefaultApparmorProfile in exec path
...
When 567ef8e7858c ("daemon: switch to 'ensure' workflow for AppArmor
profiles") was merged, it didn't correctly handle the exec path if
AppArmor profiles were deleted. Fix this by duplicating the
ensureDefaultApparmorProfile code in the exec code.
Fixes: 567ef8e7858c ("daemon: switch to 'ensure' workflow for AppArmor profiles")
Signed-off-by: Aleksa Sarai <asarai@suse.de >
Upstream-commit: 790a81ea9acce318d0e037771c253951b874140b
Component: engine
2017-03-13 15:20:05 +11:00
Vincent Demeester
6126368ef5
Merge pull request #31736 from mlaventure/update-runc
...
Update runc to 9c2d8d184e5da67c95d601382adf14862e4f2228
Upstream-commit: 613334eb5073e3b332d4f23babc5d4847ef66f59
Component: engine
2017-03-12 10:52:32 +01:00
Boaz Shuster
da38e7fbf1
Hide command options that are related to Windows
...
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com >
Upstream-commit: 7199522ea2e77c77bf931474eca92aa502ce0031
Component: engine
2017-03-12 08:47:17 +02:00
Sebastiaan van Stijn
da0af5d2c9
Merge pull request #31176 from adshmh/29662-stack-deploy-error-if-external-combined-with-other-volume-options
...
stack deploy exits with error if both 'external' and other options are specified for a volume
Upstream-commit: 8b02a15d527edeaae9135c3f6d23948bf95efb55
Component: engine
2017-03-11 01:59:43 +01:00
Tibor Vass
6079289459
Merge pull request #30047 from duglin/distError
...
Add the mediaType to the error
Upstream-commit: e10f9db26d7db8396d6f70419ecd1aa081190069
Component: engine
2017-03-10 16:44:49 -08:00
Tibor Vass
8d7175a239
Merge pull request #31743 from aaronlehmann/vendor-swarmkit-0e2d9eb
...
Vendor swarmkit 0e2d9eb
Upstream-commit: 43f8bce876c48d90fafd5fe9f9f223300bd06904
Component: engine
2017-03-10 16:33:15 -08:00
Kenfe-Mickael Laventure
a30a450bff
Update runc to 9c2d8d184e5da67c95d601382adf14862e4f2228
...
This fix a conflict with systemd daemon-reload (see
https://github.com/opencontainers/runc/pull/1344 )
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 6cea6d40fce0122e50b8852ff6fd6d5b9856b182
Component: engine
2017-03-10 14:07:56 -08:00
Victor Vieux
fb0a10df03
Merge pull request #31739 from mlaventure/update-containerd
...
Update containerd to 9f68f96b8c0746e254b52bc1defcf7cc0c1a62eb
Upstream-commit: b6c5b4730be86d7b27e2649c7889230f7dfdedb8
Component: engine
2017-03-10 14:04:53 -08:00
Aaron Lehmann
281516f8c3
Vendor swarmkit 0e2d9eb
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 79bf23845b7829bf68b9dda47af46886b274ac78
Component: engine
2017-03-10 11:15:44 -08:00
Brian Goff
973cfaf93a
Merge pull request #31679 from allencloud/put-secret-in-swarm-thing
...
move secret into swarm thing in swagger
Upstream-commit: c29c2a9a700fc74e9f099136ed7c0fa92b8b4afc
Component: engine
2017-03-10 13:50:25 -05:00
Brian Goff
e65dda6e42
Merge pull request #31532 from aboch/vnd
...
Vendoring libnetwork @1a01921
Upstream-commit: 05e7f956bdf52a2a42c39d9d0b36169ec60b5b3a
Component: engine
2017-03-10 12:55:19 -05:00
Kenfe-Mickael Laventure
c920474a6f
Update containerd to 9f68f96b8c0746e254b52bc1defcf7cc0c1a62eb
...
This include ensure that containerd GRPC healthcheck service is
register before the restore process is done as this can take a while.
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 07ad8c66400775ed1a51179be0b9137f051c4a0b
Component: engine
2017-03-10 09:16:12 -08:00
Brian Goff
da62433767
Merge pull request #31665 from mlaventure/aufs-lsof-oob
...
Remove aufs debugEBusy()
Upstream-commit: 2c2983cd8e58630889712c40a614714ce0c68efc
Component: engine
2017-03-10 11:51:14 -05:00
Justin Cormack
71c1fbfb02
Merge pull request #31703 from jen20/solaris-cflags
...
pkg/system: Set appropriate CFLAGS on Solaris
Upstream-commit: 400d154737cd026f29269bb381390b3d454ba6bb
Component: engine
2017-03-10 14:34:53 +00:00
Sebastiaan van Stijn
b165536c8d
Merge pull request #31730 from thaJeztah/cherry-autoremove-it
...
Add integration tests for client- and daemon-side auto-remove
Upstream-commit: 61f7f0fc9e68b804c1ea8bd49d3eb708b68ec461
Component: engine
2017-03-10 15:00:14 +01:00
Vincent Demeester
3a3dfe3c77
Merge pull request #31582 from dnephin/misc-flag-cleanup
...
Cleanup some memory flags used in the CLI
Upstream-commit: 83e29a5d87e3c1a0d4a9ae0d6dfe14a9ceb9bb20
Component: engine
2017-03-10 14:16:42 +01:00
Sebastiaan van Stijn
02a8c1ce9d
Add integration tests for client- and daemon-side auto-remove
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit 32dbb5c46569fbd404a88775c5eb58b5da0b9240)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: b3e4412ab487abd71e588c62311ec82306a41622
Component: engine
2017-03-10 11:04:00 +01:00
Sebastiaan van Stijn
9365b0d405
Merge pull request #30870 from ripcurld0/fix_msg_rm
...
Fix the rm error message when a container is restarting/paused
Upstream-commit: 6c31abde2057854bc83c03de971c38ca18264ab4
Component: engine
2017-03-10 10:04:49 +01:00
allencloud
f4e57f28a3
do not fail fast when executing inspect command
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: fb1f22b06a8785af3ddf4bf8893de75a52295cf8
Component: engine
2017-03-10 16:09:09 +08:00
Sebastiaan van Stijn
d7a987c42e
Merge pull request #31718 from aaronlehmann/broken-resp
...
cluster: Fix shadowed resp variable
Upstream-commit: 18163a42ecf5766606f30722db56d54f49533192
Component: engine
2017-03-10 08:36:12 +01:00
allencloud
c64c396174
move secret into swarm thing in swagger
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 6918624985e4859e44404b06a01e86639dcaa900
Component: engine
2017-03-10 10:20:55 +08:00
Aaron Lehmann
e92d0c63e0
cluster: Fix shadowed resp variable
...
The response would never reach the client because it was being
redeclared in the current scope.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 9d127f8de3fa489b2c0d896dd9612f43e45f7cdd
Component: engine
2017-03-09 17:58:12 -08:00
Akihiro Suda
6211769392
Merge pull request #31701 from jlaswell/master
...
Fix typo in run.md documentation
Upstream-commit: 239645c08d63c747eee523ba3459402172120bd8
Component: engine
2017-03-10 10:15:49 +09:00
Michael Crosby
76f2257338
Merge pull request #31704 from mlaventure/handle-paused-container-on-non-live-restore
...
Handle paused container when restoring without live-restore set
Upstream-commit: abb0fec9d082e56ef7b23789024e6f7061cc6905
Component: engine
2017-03-09 15:59:02 -08:00
Boaz Shuster
9298102f46
Fix the rm error message when a container is restarting/paused
...
Running the rm command on a paused/restarting container
will give an error message saying the container is running
which is incorrect.
To fix that, the error message will have the correct
container state and a procedure to remove it accordingly.
Notice: docker-py was bumped to:
4a08d04aef0595322e1b5ac7c52f28a931da85a5
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com >
Upstream-commit: 0ec8f56a3d7f1413cdb3ae7711d518e99f9282e9
Component: engine
2017-03-10 00:39:16 +02:00
Kenfe-Mickael Laventure
188830de7a
Remove aufs debugEBusy()
...
Since it was introduced no reports were made and lsof seems to cause
issues on some systems.
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: eac66b67be0710322d0e21a67a55f5731be48f68
Component: engine
2017-03-09 14:35:13 -08:00
Kenfe-Mickael Laventure
b027885182
Handle paused container when restoring without live-restore set
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: c458d3bb98bb85359ffaf3b9e54d837ee001829a
Component: engine
2017-03-09 13:37:08 -08:00
Brian Goff
28ce235441
Merge pull request #31667 from mlaventure/update-runc
...
Update runc to 54296cf40ad8143b62dbcaa1d90e520a2136ddfe
Upstream-commit: 9bf36cb4431b9f06f290658668415d9150618739
Component: engine
2017-03-09 15:50:12 -05:00
James Nugent
ce7091af99
pkg/system: Set appropriate CFLAGS on Solaris
...
The cgo in `meminfo_solaris.go` initializes variables in for loops, and
therefore requires a `-std=c99` `CFLAG` in order to compile (at least on
modern SmartOS).
Signed-off-by: James Nugent <james@jen20.com >
Upstream-commit: 4683f588ce893f3156ecfa63bfd16ebda1d09157
Component: engine
2017-03-09 13:40:05 -05:00
John Laswell
6aba7fbe3b
Fix typo in run.md documentation
...
Signed-off-by: John Laswell <john.n.laswell@gmail.com >
Upstream-commit: 4a20252137902100a8a01dd86c698e49dc00e8b2
Component: engine
2017-03-09 13:08:48 -05:00
Sebastiaan van Stijn
f54d163984
Merge pull request #31396 from kevinfeyrer/patch-2
...
Update vlan-networks.md
Upstream-commit: 705e031b984e7d976fa5a9fef61e4a76451d6e36
Component: engine
2017-03-09 15:02:58 +01:00
Brian Goff
5e81579bc9
Merge pull request #31681 from lixiaobing10051267/masterLayer
...
modify ID to ChainID to avoid confusing
Upstream-commit: 89b4c1d353b1ece4928c00f7eaa661d663c6cb78
Component: engine
2017-03-09 08:45:35 -05:00
Sebastiaan van Stijn
e5933a504d
Merge pull request #31684 from albers/fix-stop-signal-help-message
...
Fix description of `docker run|create --stop-signal` in help message
Upstream-commit: 6cf8ff5d1d47cea6a945333c602d45962905d965
Component: engine
2017-03-09 11:36:26 +01:00
lixiaobing10051267
42e1c80fbb
modify ID to ChainID to avoid confusing
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 1b0f2d71a1aa9e529357e2ffe342af2a12d7c145
Component: engine
2017-03-09 16:59:04 +08:00
Harald Albers
0d16f73693
Fix description of docker run|create --stop-signal in help message
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: b303e229ca6ec61e43b1b7a93f6ff034a3945644
Component: engine
2017-03-09 09:32:16 +01:00
Kenfe-Mickael Laventure
5ef9a2c7ea
Update runc to 54296cf40ad8143b62dbcaa1d90e520a2136ddfe
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 49131f3ad47bb6195d9ced8aa5f93faf011f9e58
Component: engine
2017-03-08 14:56:29 -08:00
kevinfeyrer
574f55f777
Update vlan-networks.md
...
Some small changes to get the examples so that they run without error for me.
Improve consistency of presentation of the examples.
Fix some typos
Signed-off-by: kevinfeyrer <kevin.feyrer@btinternet.com >
Update vlan-networks.md
Restore "ip" accidentally removed
Signed-off-by: kevinfeyrer <kevin.feyrer@btinternet.com >
Update vlan-networks.md
Change prompt from container "$$" to host "$"
Signed-off-by: kevinfeyrer <kevin.feyrer@btinternet.com >
Update vlan-networks.md
Some changes suggested by cpuguy83 and thaJeztah
Signed-off-by: kevinfeyrer <kevin.feyrer@btinternet.com >
Upstream-commit: 6ea36d7d48a41225c8573ef649320c1a414b8995
Component: engine
2017-03-08 21:53:24 +00:00
Tõnis Tiigi
e454be5cbf
Merge pull request #31535 from aaronlehmann/vendor-swarmkit-7fc7503
...
Vendor swarmkit d60ccf3
Upstream-commit: 3fe2730ab3d7bba483d7bf4fb1e95b627823ff4d
Component: engine
2017-03-08 09:52:28 -08:00
Brian Goff
8ee62e238a
Merge pull request #31654 from dnephin/add-missing-validate
...
Add compose-bindata validation to default
Upstream-commit: 71f249967e7a82574d89d23172f7c38a5e3be31f
Component: engine
2017-03-08 10:57:05 -05:00
Daniel Nephin
55df7adcd9
Add compose-bindata validation to default.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 18e0a327ca59a6d4d9cb22f309f94b032a7e3b31
Component: engine
2017-03-08 10:23:40 -05:00
Sebastiaan van Stijn
a09edbbf93
Merge pull request #31177 from allencloud/donot-allow-subsecond-in-dockerfile-healthcheck
...
do not allow sub second in healthcheck options in Dockerfile
Upstream-commit: fb1890fb9530b3f69b0d9f937fd0b6d8b1972311
Component: engine
2017-03-08 15:18:09 +01:00
Sebastiaan van Stijn
6d40d2a062
Merge pull request #31443 from james-nesbitt/export-more-compose-methods
...
exported add. cli compose loader parsing methods
Upstream-commit: fb024df8f0d18fdeff4b73979d51b44f268aeb6b
Component: engine
2017-03-08 15:12:42 +01:00
Sebastiaan van Stijn
25aab279f4
Merge pull request #31641 from amatsus/master
...
Fix typo in CHANGELOG.md
Upstream-commit: 58e787602d85ee674164fb9dae1250d2c3e98da1
Component: engine
2017-03-08 15:10:45 +01:00
Justin Cormack
ac2e133cd8
Merge pull request #31611 from tophj-ibm/skip-plugin-test
...
skip plugin test on non x86 architectures
Upstream-commit: ab8a22de3607f2b5f7afb7a8a93d298f17d124a7
Component: engine
2017-03-08 14:00:15 +00:00
Akihiro MATSUSHiMA
977a744f4a
Fix typo in CHANGELOG.md
...
Signed-off-by: Akihiro Matsushima <amatsusbit@gmail.com >
Upstream-commit: d9325e102cd449645a208fa83cfd2b8cb29ab0d2
Component: engine
2017-03-08 21:13:05 +09:00
Vincent Demeester
Sebastiaan van Stijn
Aleksa Sarai
Boaz Shuster
Tibor Vass
Kenfe-Mickael Laventure
Victor Vieux
Aaron Lehmann
Brian Goff
Justin Cormack
Sebastiaan van Stijn
allencloud
Akihiro Suda
Michael Crosby
James Nugent
John Laswell
lixiaobing10051267
Harald Albers
kevinfeyrer
Tõnis Tiigi
Daniel Nephin
Akihiro MATSUSHiMA