c7be93cd96
Merge pull request #32436 from thaJeztah/refactor-tiny-version-parsing
...
Refactor tiny version parsing
Upstream-commit: 51aa2a226e21e20c5b4634a28245c760f4e18f37
Component: engine
2017-04-08 17:36:40 +02:00
36c4c39157
Refactor "init" version parsing, and add unit-test
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 72eddf4258db8c10b145ded188d13c50e4a5530b
Component: engine
2017-04-08 11:28:37 +02:00
137edd889c
Merge pull request #32339 from aluzzardi/selinux
...
services: Add support for Credential Spec and SELinux
Upstream-commit: 091b5e68ea735bf4e8ece708bbc8c413a32eab73
Component: engine
2017-04-08 01:37:17 +02:00
ddc6479238
Merge pull request #32154 from dperny/refactor-logs
...
Refactor logs and support service logs with TTY
Upstream-commit: 4a1a64c67768d6fbcf20a1b37ee58212b7e870c6
Component: engine
2017-04-07 18:06:50 -04:00
e41369fcc4
services: Add support for Credential Spec and SELinux
...
- Defined "normalized" type for Credential Spec and SELinux
- Added --credential-spec to docker service create & update
- SELinux is API only at the time
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
Upstream-commit: 89a995a9d77cc4f95a29579e0a2b12cb3d805749
Component: engine
2017-04-07 11:30:54 -07:00
593669c329
Merge pull request #32283 from aboch/clearingress
...
Daemon to take care of ingress cleanup on cluster leave and graceful shutdown
Upstream-commit: 87562af45bf32efce55d9fceb141a655b82a33c4
Component: engine
2017-04-07 20:09:27 +02:00
e48f925bda
Fix tini version parsing
...
Invalid version strings for the init (tini)
binary were still accepted, which lead to (e.g.)
"hello world"
Being used as "vhello world"
This makes the version parsing slightly stricter
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 984d99e19cd5fbc6889528c9588f4875e3c40cc5
Component: engine
2017-04-07 17:12:07 +02:00
f6c6c2dac3
Merge pull request #30261 from aaronlehmann/rollout-mode
...
swarm: Add update/rollback order
Upstream-commit: 3de58eb2bca720be0f5940cdd928de7a96220174
Component: engine
2017-04-06 22:41:11 -04:00
be0fe36691
Merge pull request #30669 from catinthesky/issue30580
...
Fixing issue of docker top command failure when dealing with -m option
Upstream-commit: 7d8bf5d177127c61208e397bf8cf53b2f52ac9e7
Component: engine
2017-04-06 21:14:26 -04:00
334f054f13
refactor logs and support service logs /w tty
...
Refactor container logs system to make communicating log messages
internally much simpler. Move responsibility for marshalling log
messages into the REST server. Support TTY logs. Pave the way for fixing
the ambiguous bytestream format. Pave the way for fixing details.
Signed-off-by: Drew Erny <drew.erny@docker.com >
Upstream-commit: 1044093bb0aa12eb8972361a93b9bc8c4ddd857b
Component: engine
2017-04-06 17:54:11 -07:00
1623433ab1
Add support for update order
...
This parameter controls the order of operations when rolling out an
update task. Either the old task is stopped before starting the new one,
or the new task is started first, and the running tasks will briefly
overlap.
This commit adds Rollout to the API, and --update-order / --rollback-order
flags to the CLI.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 9b54994a8ada6ae15a4d2c3b925568e2061200ad
Component: engine
2017-04-06 17:23:36 -07:00
e25f6c5a1b
Added start period option to health check.
...
Signed-off-by: Elias Faxö <elias.faxo@gmail.com >
Upstream-commit: e401f63735d8ebcff387c571d1f61ce52bdea86e
Component: engine
2017-04-06 12:35:34 +02:00
7647ce4c36
Re-vendor docker/swarmkit to d2e48a332063ccd4ea26b6262ee717de997de560
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
Upstream-commit: 367b57d9859d2e3b4a651eb31d2d17f425329783
Component: engine
2017-04-05 18:49:23 -07:00
55def0f77c
Daemon to take care of ingress cleanup on leave & shutdown
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 6f4bb796ddb82d04a1c379a950db93bc61c64c04
Component: engine
2017-04-05 16:31:43 -07:00
3d4ee5930c
Merge pull request #32268 from cpuguy83/volume_err_obfuscate
...
don't obfuscate error during volume create
Upstream-commit: b7c3b312c92c6a0f897379f583befa6b5ab9c4fe
Component: engine
2017-04-05 09:05:10 -04:00
1eb46d2b87
Merge pull request #32350 from vdemeester/start-stack-trap-earlier
...
Start the stack trap earlier for daemon
Upstream-commit: 5f14f4a94928a4de60944eb822cc379ab1aee7e3
Component: engine
2017-04-04 23:56:36 +02:00
b9f1a5c537
Start the stack trap earlier for daemon
...
That way we can get stack dump earlier if there is something that
locks the daemon during start/restore phase.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 94d44066f3abb7c7eea7fcb81e8419ae7331d1fd
Component: engine
2017-04-04 16:23:14 +02:00
85ee795bf6
Merge pull request #32274 from mlaventure/fix-healthcheck-rm-race
...
Ensure health probe is stopped when a container exits
Upstream-commit: d7e7aa67ea5278467644074f19d428851ebc34f4
Component: engine
2017-04-04 16:14:10 +02:00
ffbcc00dc9
Merge pull request #29099 from dattatrayakumbhar/28755_Err_Duplicate_checkpoint
...
#28755 : [experimental] Proper error handling for checkpoint conflict
Upstream-commit: 6b06cc54d02fe05d354fef8ddef65b8fe77abeb5
Component: engine
2017-04-04 14:40:20 +02:00
ac33a30857
Merge pull request #32015 from dperny/service-logs-support-task-logs
...
Add Support for Service Task Logs
Upstream-commit: 170be9c26745b953dbfc5cafdc63eb3895c2c541
Component: engine
2017-04-04 00:15:13 -07:00
5d64c25526
28755: Proper error handling for checkpoint conflict
...
Signed-off-by: Dattatrayakumbhar <dattatraya.kumbhar@gslab.com >
Upstream-commit: d400518f4d139733f1f5b9333f493b1f9d76b8a1
Component: engine
2017-04-04 05:18:19 +00:00
93e346635c
Add support for task and arbitrary combo logs
...
Refactored the API to more easily accept new endpoints. Added REST,
client, and CLI endpoints for getting logs from a specific task. All
that is needed after this commit to enable arbitrary service log
selectors is a REST endpoint and handler.
Task logs can be retrieved by putting in a task ID at the CLI instead of
a service ID.
Signed-off-by: Drew Erny <drew.erny@docker.com >
Upstream-commit: d330dc3223df7e6c2b066373718709e34e19efca
Component: engine
2017-04-03 18:40:54 -07:00
f25b712a8b
Merge pull request #32312 from thaJeztah/unit-test-remove-errormessage
...
create unit tests for rm (running, paused, restarting) errormessages
Upstream-commit: 53c7995c8bf581f5d5ec17a5eca616f1fbaeb952
Component: engine
2017-04-03 21:05:30 -04:00
c96fd9ee7b
don't obfuscate error during create
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 3b80094665b82bd095cb98528a0cf6ff34a43a58
Component: engine
2017-04-03 21:04:40 -04:00
84fd8f0bc0
Merge pull request #31144 from aaronlehmann/synchronous-service-commands
...
Synchronous service create and service update
Upstream-commit: 21ec12b9676f95aaa69c3082b97d0b10031cc90a
Component: engine
2017-04-03 17:44:03 -07:00
235108e14b
Merge pull request #31827 from erikstmartin/master
...
Add mount point to cgroup root when initializing cgroup paths for cpu.rt_runtime
Upstream-commit: b0235fd515eb25eebb9395f87044fbd11b864b75
Component: engine
2017-04-03 22:39:49 +02:00
04b3ba3655
create unit tests for rm (running, paused, restarting) errormessages
...
These integration tests were basically testing if a
decent error message was printed when attempting
to remove a running, paused, or restarting container.
Moving these tests to a unit-test to make the tests
not flaky (especially on the "restarting" container
test).
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 2759194d44634b88d7a39134a24a61ca8d60c0ab
Component: engine
2017-04-03 21:58:05 +02:00
6efdf7963e
Ensure health probe is stopped when a container exits
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 04ae628ca55904a2768b4fec59a99803b6fe0850
Component: engine
2017-04-03 09:57:04 -07:00
8796370b47
Merge pull request #32072 from coolljt0725/fix_log_dead
...
Fix docker logs a dead container
Upstream-commit: 9518a71ceff0f1aa9abada5b51cbac40f8e8c80e
Component: engine
2017-04-03 10:42:32 -04:00
76455dae27
Merge pull request #32012 from cpuguy83/remove_uneeded_relabel
...
Remove undeeded and broken selinux relabel call
Upstream-commit: 2c68e026da302d3b768b026ab8946d2217e05b64
Component: engine
2017-04-03 15:25:23 +02:00
9230ef4691
Merge pull request #28723 from dattatrayakumbhar/filter-on-network-id
...
28722: List of containers with networkID filter is not working
Upstream-commit: 33aae7c5cc3b3689faaef39046cc6d2c6fcda4b6
Component: engine
2017-04-02 21:06:09 +02:00
60092c3889
Add support for UpToDate filter, for internal use
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 91c86c7e26c40ff3e422adcdd88d1649dd9dbc9b
Component: engine
2017-03-31 10:01:32 -07:00
3f185ca5af
Merge pull request #27565 from rothrock/env-by-regex
...
[splunk] Use a regex to match environment variables
Upstream-commit: 1325f667eeb42b717c2f9d369f2ee6d701a280e3
Component: engine
2017-03-31 10:46:48 -04:00
b3bf6afbcc
28722: List of containers with networkID filter is not working
...
Signed-off-by: dattatrayakumbhar04 <dattatraya.kumbhar@gslab.com >
Upstream-commit: 59b70cdabe3b5f3592e40d241377c6a9f2127dfc
Component: engine
2017-03-31 08:57:09 +00:00
fd940e1e8e
Deprecate --graph flag; Replace with --data-root
...
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
Upstream-commit: 261ef1fa27c4dfefa5f686b0a4ef354a43040e58
Component: engine
2017-03-30 11:24:56 +02:00
0564af85e5
Merge pull request #31741 from mlaventure/cleanup-tmp-on-start
...
Cleanup docker tmp dir on start
Upstream-commit: f16d1a47ccc3203f5031b10f54c109e790a12c8d
Component: engine
2017-03-30 03:14:55 +02:00
521bbe4929
Merge pull request #32085 from aboch/bd
...
Do not panic on redundant UpdateAttachment
Upstream-commit: a1099010b097ad1090d6c50e626de7c49c113af2
Component: engine
2017-03-29 12:04:05 +02:00
61aef99b4b
Merge pull request #32187 from tianon/tini-version-parsing
...
Update "tini --version" parsing to be more forgiving of Tini's output format (release build vs git build)
Upstream-commit: d9c4261964fc4c93d2e34de650a33936ebbf7f9c
Component: engine
2017-03-29 12:01:03 +02:00
dbb9dec606
Merge pull request #32186 from aaronlehmann/cluster-omitempty
...
api: Omit Cluster, Nodes, and Managers from swarm info when unavailable
Upstream-commit: 4180211d808c74682636f98ed16cd1990c842fc2
Component: engine
2017-03-29 10:38:52 +02:00
3ac53cbeaa
Merge pull request #32167 from miaoyq/print-a-err-return
...
The returned err should be printed
Upstream-commit: 02faf807a2944936b1308092499d35fd650edab4
Component: engine
2017-03-29 10:36:05 +02:00
c3332b9e26
The returned err should be printed
...
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
Upstream-commit: 87d0a3ad890ea0d12f5e7b28f34ea835048696bd
Component: engine
2017-03-29 09:00:50 +08:00
3e14f1327b
Update "tini --version" parsing to be more forgiving of Tini's output format (release build vs git build)
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 87f9362975341e5e12db5b484f662cbc525a1e41
Component: engine
2017-03-28 15:18:39 -07:00
65370eec05
api: Omit Cluster, Nodes, and Managers from swarm info when unavailable
...
Currently these fields are included in the response JSON with zero
values. It's better not to include them if the information is
unavailable (for example, on a worker node).
This turns Cluster into a pointer so that it can be left out.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 3894254dddc56bf283d7361dc88953a167a3be1f
Component: engine
2017-03-28 14:20:25 -07:00
ba4d313c47
Fix docker system prune failing with Swarm mode disabled
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 4f2ed03092def6d3ccfbb05d9df8e1b5f2f78149
Component: engine
2017-03-28 16:35:24 +02:00
38224530f1
Add NetworkManager and ClusterStatus interfaces
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 8f4f85dd5b5b6b7268428b8f95f56c1ba8608ac3
Component: engine
2017-03-28 16:35:14 +02:00
96699fb127
Merge pull request #30652 from rhatdan/selinux
...
If caller specifies label overrides, don't override security options
Upstream-commit: b6cb416051585f265530169346475b97ff9afd8d
Component: engine
2017-03-28 10:24:47 -04:00
b8233dd3d5
Merge pull request #30810 from allencloud/make-secret-ls-support-filter
...
make secret ls support filters in CLI
Upstream-commit: 4df350b8c7a53dc82d8a6e187882faf8f90ce766
Component: engine
2017-03-28 13:43:19 +02:00
a71cefb645
Merge pull request #32152 from darrenstahlmsft/RevertWaitOOBE
...
Windows: Revert change to wait for OOBE
Upstream-commit: 1c7a3d3e6c03e911775d8bed8675d5bc5dc1cfcd
Component: engine
2017-03-28 10:22:03 +02:00
3670f999ce
Merge pull request #30763 from ripcurld0/fix_30714
...
Fix the create API when fromSrc has a bad URL
Upstream-commit: 35e5975b9049f341f947c1bf281b06af45cb1a48
Component: engine
2017-03-28 10:20:59 +02:00
753f67cb4f
Windows:Revert change to wait for OOBE
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 6eed7f0cac10495c95a8e4b74548e707af933f8c
Component: engine
2017-03-27 14:32:18 -07:00
Sebastiaan van Stijn
Sebastiaan van Stijn
Brian Goff
Andrea Luzzardi
Vincent Demeester
Drew Erny
Aaron Lehmann
Elias Faxö
Alessandro Boch
Victor Vieux
dattatrayakumbhar04
Kenfe-Mickael Laventure
Antonio Murdaca
Josh Hawn
Yanqiang Miao
Tianon Gravi
Darren Stahl