d51100a9ef
Add named context support
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 87512bbc8490aca261133a7f3a3ea6518d703c34
Component: engine
2017-04-04 09:34:28 -07:00
a23d7a9c18
Merge pull request #30813 from yongtang/30232-service-ls-ports
...
Add `PORTS` field for `docker service ls` (`ingress`)
Upstream-commit: fe4d7db1eceae8aad6a27d0ce4164ae4bf974346
Component: engine
2017-04-04 17:04:27 +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
914851bace
Merge pull request #32333 from dnephin/fix-endpoint-mode
...
Fix endpoint mode loading from Compose file in stack deploy
Upstream-commit: 93ffbb76c3286d96d693c6232ad39db6bcfafc66
Component: engine
2017-04-04 14:12:26 +02:00
5c8467c21d
Merge pull request #32288 from pacoxu/patch-2
...
fix documentation error: volume-opt in service create
Upstream-commit: b1dcf5e9a55f6673e5b3b1526c1a1fb648ead2af
Component: engine
2017-04-04 13:50:05 +02:00
f460fdefc8
Merge pull request #32298 from thaJeztah/fix-changelog
...
[17.03.x] fix version of containerd in changelog
(cherry picked from commit bcb63f367775c9c4339d9858f0cec5de5c220fa5)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: c3639d11268aff12726dbb2e7de5117af5d4faa4
Component: engine
2017-04-04 09:45:03 +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
881ae30412
Add PORTS field for docker service ls (ingress)
...
This fix is related to 30232 wherw `docker service ls`
does not show `PORTS` information like `docker service ps`.
This fix adds `PORTS` fields for services that publish
ports in ingress mode.
Additional unit tests cases have been updated.
This fix is related to 30232.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: c877c7b2bf0ed20ff9054dcbec98362d9e88c145
Component: engine
2017-04-03 18:40:15 -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
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
31fe55c058
Fix endpoint mode in Compose format.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 25f00866e3c0ec1d74c717d4e5974611479dc8ad
Component: engine
2017-04-03 17:51:31 -04:00
ed1d986125
Merge pull request #32329 from albers/completion--awslogs-create-group
...
Improve bash completion for `--log-opt awslogs-create-group`
Upstream-commit: d61c5882cfd832764e2b8b58dbdc7e7f180371ab
Component: engine
2017-04-03 23:15:05 +02: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
8b68d758b1
Merge pull request #32076 from tmp6154/master
...
Bump up nproc in TestExecUlimits
Upstream-commit: 3fb84ca2f51c6f544797d8a84b11180f829f8e15
Component: engine
2017-04-03 22:30:28 +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
c64006e8bd
Improve bash completion for --log-opt awslogs-create-group
...
Add completion for the possible values `true`|`false`, correct sort order.
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: a70ca85891b173e03aeaf9e93cf190884848107e
Component: engine
2017-04-03 11:29:31 -07: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
e84d96f81f
Synchronous service create and service update
...
Change "service create" and "service update" to wait until the creation
or update finishes, when --detach=false is specified. Show progress bars
for the overall operation and for each individual task (when there are a
small enough number of tasks), unless "-q" / "--quiet" is specified.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 330a0035334871d92207b583c1c36d52a244753f
Component: engine
2017-04-03 09:46:01 -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
a2c8d31405
Merge pull request #31989 from aaronlehmann/node-ps-outside-swarm-mode
...
cli: Wrong error message from "node ps" outside swarm mode
Upstream-commit: d9c3c1928d6089f0bc064cd0032b82505133231d
Component: engine
2017-04-03 16:15:24 +02:00
5482d2a7f3
Merge pull request #30907 from Hyzhou/master
...
Add Aliyun mirror support to hack/install.sh
Upstream-commit: 9f17b97820912001a1bf7fd827a65b0298b4dd1f
Component: engine
2017-04-03 16:13:59 +02:00
ea6ce1829e
Merge pull request #32307 from jlhawn/update_TestRmRestartingContainer
...
Fix Flakiness in TestRmRestartingContainer
Upstream-commit: 7f905908416bea18afa9708ac76e1a7d0cfe7b48
Component: engine
2017-04-03 15:48:19 +02:00
1417b08e8d
Merge pull request #32305 from albers/completion-secret-ls--format
...
Add bash completion for `secret ls --format`
Upstream-commit: 93955bd215642d52d691c68ab30c0c082ae9e92c
Component: engine
2017-04-03 15:43:12 +02: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
694fa58dc1
Merge pull request #31889 from cpuguy83/all_the_pprof
...
Use generic handler for pprof profile lookups
Upstream-commit: 022552ac873939db018722cb4a2e8289c6927e5e
Component: engine
2017-04-03 15:14:12 +02:00
291e5291fe
Change TestExecUlimits to use nofile instead of nproc
...
Test used to check whether ulimits applied by docker are in effect by
setting up nproc. However, in some environments (e.g. inside Virtuozzo
Containers), number of processes is higher and testcase fails. Hence, we
instead change testcase to check ulimits by setting nofile limit instead
of nproc.
Signed-off-by: Vitaly Ostrosablin <vostrosablin@virtuozzo.com >
Upstream-commit: d4e132f84da72b5c2f2f63c95a8ca5cddabf8433
Component: engine
2017-04-03 10:43:43 +03:00
8939f52c95
Fix Flakiness in TestRmRestartingContainer
...
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
Upstream-commit: e979cf74640213ffe4d883cb00adecb957056e9a
Component: engine
2017-04-02 17:45:30 -07:00
a3149edca7
Add bash completion for secret ls --format
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: f844e5731544e1d3910f993911b7c6cb6992a1ce
Component: engine
2017-04-02 15:32:33 -07:00
9cde86d209
Merge pull request #32027 from sdurrheimer/zsh-completion-ps-format
...
Add zsh completion for 'docker {node,service,stack} ps --format'
Upstream-commit: 6311e9fc9d34bd874e1a6d197daef5c9c4d89791
Component: engine
2017-04-02 23:38:22 +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
6a9778f8bb
Merge pull request #32279 from darrenstahlmsft/WindowsRestore
...
Windows: Wait to delete container when restoring
Upstream-commit: c526588c7906b00659c93195aae66accab07544d
Component: engine
2017-04-02 18:38:12 +01:00
08931d138b
Merge pull request #32265 from breuner/patch-1
...
Updated legacy_plugins.md to include BeeGFS plugin
(cherry picked from commit d0057bd12dae5276b83e931e9e9ea185c58486a2)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 5df76be5086fe5fee747be85fc92a0bb3ae8dada
Component: engine
2017-04-02 12:27:54 +02:00
e14b82cb5f
Merge pull request #32271 from krasi-georgiev/update-containerd-9048e5e50717ea4497b757314bad98ea3763c145
...
update containerd to 9048e5e50717ea4497b757314bad98ea3763c145
Upstream-commit: 16be0727930ef4b4683ab2d32ea60639a504d0e9
Component: engine
2017-04-02 11:02:08 +02:00
06b562ba1d
add ehazlett and johnstep to random_assign
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: 4fe11d49ca464848ec5ab5550aa1f53260e410a7
Component: engine
2017-04-02 01:15:19 +02:00
1156f2a813
Merge pull request #32282 from mstanleyjones/improve-attach-desc
...
Clarify meaning of docker attach
Upstream-commit: 571e4031685e730ba7cb0c49620e9f9580fdabc6
Component: engine
2017-04-01 20:52:26 +02:00
5d994cf1a3
Merge pull request #32244 from Microsoft/jjh/panicfix
...
Windows - fix panic and stderr output when service
Upstream-commit: a96de091d644db1c31b699a7a22d9ef63b376560
Component: engine
2017-04-01 20:00:59 +02:00
f82dd4d1b5
fix documentation error: volume-opt in service create
...
Signed-off-by: pacoxu<paco.xu@daocloud.io >
Signed-off-by: pacoxu <paco.xu@daocloud.io >
Upstream-commit: 775c66a58c620d9f1b469f9248a733b1d29f21c8
Component: engine
2017-04-01 11:54:09 +08:00
e0362b90f0
Merge pull request #31022 from jmzwcn/issue30994
...
docker version output is not consistent when there are downgrades or incompatibilities #30994
Upstream-commit: 3dfce9fbb813511a0dbfea1fa3bc80a37e7072c4
Component: engine
2017-03-31 15:55:03 -07:00
1d7af76811
Merge pull request #31800 from ripcurld0/checkpoint_ls
...
Use formatter in docker checkpoint ls
Upstream-commit: e45483964fc26116afa754fc9defcf1ab1dbca26
Component: engine
2017-03-31 15:54:22 -07:00
6e6d76551e
update criu to 2.12.1
...
Signed-off-by: Krasi Georgiev <krasi@vip-consult.solutions >
Upstream-commit: d1a0afacc25ad25600ea6851d3b002734725df7e
Component: engine
2017-04-01 00:54:28 +03:00
aa11c20963
Clarify meaning of docker attach
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 1922eac4cc7190e1f3fa98796e7613c3e5b8b2bd
Component: engine
2017-03-31 13:22:21 -07:00
8ae037ac7f
Merge pull request #31599 from ripcurld0/diff_cmd_format
...
Use formatter in docker diff
Upstream-commit: 3d31198cda7d1230415b37970172480b5190c1e3
Component: engine
2017-03-31 11:19:41 -07:00
8cd4fe0243
Wait to delete container when restoring on Windows
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: dbdc8bbee4a26093e6342f93bb63a09fbe850f58
Component: engine
2017-03-31 10:59:00 -07:00
43db0dfd5f
Merge pull request #31183 from thaJeztah/log-upgrade-rollback-error
...
log error if restoring plugin fails
Upstream-commit: d57825cb1edaa5ef3833584ea09a87d282248685
Component: engine
2017-03-31 19:44:31 +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
75453ad8e7
Windows - fix panic and stderr
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 141a83b820140fac130840b2a0ea9df75ab4e55d
Component: engine
2017-03-31 09:51:50 -07:00
6183c882a6
update containerd to 9048e5e50717ea4497b757314bad98ea3763c145
...
Signed-off-by: Krasi Georgiev <krasi@vip-consult.solutions >
Upstream-commit: a3c2ccacd08d4ff6717ea9bd1fb6ec3e0c1223c4
Component: engine
2017-03-31 19:47:05 +03:00
