Vincent Demeester
93ffbb76c3
Merge pull request #32333 from dnephin/fix-endpoint-mode
...
Fix endpoint mode loading from Compose file in stack deploy
2017-04-04 14:12:26 +02:00
Sebastiaan van Stijn
b1dcf5e9a5
Merge pull request #32288 from pacoxu/patch-2
...
fix documentation error: volume-opt in service create
2017-04-04 13:50:05 +02:00
Sebastiaan van Stijn
ebdb7a4a1e
Merge pull request #32342 from thaJeztah/master-fix-changelog
...
[master] fix version of containerd in changelog
2017-04-04 10:17:30 +02:00
Victor Vieux
c3639d1126
Merge pull request #32298 from thaJeztah/fix-changelog
...
[17.03.x] fix version of containerd in changelog
(cherry picked from commit bcb63f3677
)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-04-04 09:45:03 +02:00
Victor Vieux
170be9c267
Merge pull request #32015 from dperny/service-logs-support-task-logs
...
Add Support for Service Task Logs
2017-04-04 00:15:13 -07:00
Drew Erny
d330dc3223
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>
2017-04-03 18:40:54 -07:00
Brian Goff
53c7995c8b
Merge pull request #32312 from thaJeztah/unit-test-remove-errormessage
...
create unit tests for rm (running, paused, restarting) errormessages
2017-04-03 21:05:30 -04:00
Victor Vieux
21ec12b967
Merge pull request #31144 from aaronlehmann/synchronous-service-commands
...
Synchronous service create and service update
2017-04-03 17:44:03 -07:00
Daniel Nephin
25f00866e3
Fix endpoint mode in Compose format.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-04-03 17:51:31 -04:00
Sebastiaan van Stijn
d61c5882cf
Merge pull request #32329 from albers/completion--awslogs-create-group
...
Improve bash completion for `--log-opt awslogs-create-group`
2017-04-03 23:15:05 +02:00
Vincent Demeester
b0235fd515
Merge pull request #31827 from erikstmartin/master
...
Add mount point to cgroup root when initializing cgroup paths for cpu.rt_runtime
2017-04-03 22:39:49 +02:00
Vincent Demeester
3fb84ca2f5
Merge pull request #32076 from tmp6154/master
...
Bump up nproc in TestExecUlimits
2017-04-03 22:30:28 +02:00
Sebastiaan van Stijn
2759194d44
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>
2017-04-03 21:58:05 +02:00
Harald Albers
a70ca85891
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>
2017-04-03 11:29:31 -07:00
Aaron Lehmann
330a003533
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>
2017-04-03 09:46:01 -07:00
Brian Goff
9518a71cef
Merge pull request #32072 from coolljt0725/fix_log_dead
...
Fix docker logs a dead container
2017-04-03 10:42:32 -04:00
Vincent Demeester
d9c3c1928d
Merge pull request #31989 from aaronlehmann/node-ps-outside-swarm-mode
...
cli: Wrong error message from "node ps" outside swarm mode
2017-04-03 16:15:24 +02:00
Vincent Demeester
9f17b97820
Merge pull request #30907 from Hyzhou/master
...
Add Aliyun mirror support to hack/install.sh
2017-04-03 16:13:59 +02:00
Vincent Demeester
7f90590841
Merge pull request #32307 from jlhawn/update_TestRmRestartingContainer
...
Fix Flakiness in TestRmRestartingContainer
2017-04-03 15:48:19 +02:00
Sebastiaan van Stijn
93955bd215
Merge pull request #32305 from albers/completion-secret-ls--format
...
Add bash completion for `secret ls --format`
2017-04-03 15:43:12 +02:00
Antonio Murdaca
2c68e026da
Merge pull request #32012 from cpuguy83/remove_uneeded_relabel
...
Remove undeeded and broken selinux relabel call
2017-04-03 15:25:23 +02:00
Vincent Demeester
022552ac87
Merge pull request #31889 from cpuguy83/all_the_pprof
...
Use generic handler for pprof profile lookups
2017-04-03 15:14:12 +02:00
Vitaly Ostrosablin
d4e132f84d
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>
2017-04-03 10:43:43 +03:00
Josh Hawn
e979cf7464
Fix Flakiness in TestRmRestartingContainer
...
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
2017-04-02 17:45:30 -07:00
Harald Albers
f844e57315
Add bash completion for secret ls --format
...
Signed-off-by: Harald Albers <github@albersweb.de>
2017-04-02 15:32:33 -07:00
Sebastiaan van Stijn
6311e9fc9d
Merge pull request #32027 from sdurrheimer/zsh-completion-ps-format
...
Add zsh completion for 'docker {node,service,stack} ps --format'
2017-04-02 23:38:22 +02:00
Vincent Demeester
33aae7c5cc
Merge pull request #28723 from dattatrayakumbhar/filter-on-network-id
...
28722: List of containers with networkID filter is not working
2017-04-02 21:06:09 +02:00
Justin Cormack
c526588c79
Merge pull request #32279 from darrenstahlmsft/WindowsRestore
...
Windows: Wait to delete container when restoring
2017-04-02 18:38:12 +01:00
Sebastiaan van Stijn
2347020706
Merge pull request #32304 from thaJeztah/master-cherry-pick-32265
...
[master] cherry-pick Updated legacy_plugins.md to include BeeGFS plugin
2017-04-02 12:31:47 +02:00
Sebastiaan van Stijn
5df76be508
Merge pull request #32265 from breuner/patch-1
...
Updated legacy_plugins.md to include BeeGFS plugin
(cherry picked from commit d0057bd12d
)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-04-02 12:27:54 +02:00
Vincent Demeester
16be072793
Merge pull request #32271 from krasi-georgiev/update-containerd-9048e5e50717ea4497b757314bad98ea3763c145
...
update containerd to 9048e5e50717ea4497b757314bad98ea3763c145
2017-04-02 11:02:08 +02:00
Sebastiaan van Stijn
75a7eca958
Merge pull request #32286 from vieux/add_ehazlett_and_johnstep_random_assign
...
add ehazlett and johnstep to random_assign
2017-04-02 01:16:57 +02:00
Victor Vieux
4fe11d49ca
add ehazlett and johnstep to random_assign
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-04-02 01:15:19 +02:00
Sebastiaan van Stijn
571e403168
Merge pull request #32282 from mstanleyjones/improve-attach-desc
...
Clarify meaning of docker attach
2017-04-01 20:52:26 +02:00
Sebastiaan van Stijn
a96de091d6
Merge pull request #32244 from Microsoft/jjh/panicfix
...
Windows - fix panic and stderr output when service
2017-04-01 20:00:59 +02:00
徐俊杰
775c66a58c
fix documentation error: volume-opt in service create
...
Signed-off-by: pacoxu<paco.xu@daocloud.io>
Signed-off-by: pacoxu <paco.xu@daocloud.io>
2017-04-01 11:54:09 +08:00
Victor Vieux
3dfce9fbb8
Merge pull request #31022 from jmzwcn/issue30994
...
docker version output is not consistent when there are downgrades or incompatibilities #30994
2017-03-31 15:55:03 -07:00
Victor Vieux
e45483964f
Merge pull request #31800 from ripcurld0/checkpoint_ls
...
Use formatter in docker checkpoint ls
2017-03-31 15:54:22 -07:00
Krasi Georgiev
d1a0afacc2
update criu to 2.12.1
...
Signed-off-by: Krasi Georgiev <krasi@vip-consult.solutions>
2017-04-01 00:54:28 +03:00
Misty Stanley-Jones
1922eac4cc
Clarify meaning of docker attach
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2017-03-31 13:22:21 -07:00
Kenfe-Mickaël Laventure
3d31198cda
Merge pull request #31599 from ripcurld0/diff_cmd_format
...
Use formatter in docker diff
2017-03-31 11:19:41 -07:00
Darren Stahl
dbdc8bbee4
Wait to delete container when restoring on Windows
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
2017-03-31 10:59:00 -07:00
Vincent Demeester
d57825cb1e
Merge pull request #31183 from thaJeztah/log-upgrade-rollback-error
...
log error if restoring plugin fails
2017-03-31 19:44:31 +02:00
Aaron Lehmann
91c86c7e26
Add support for UpToDate filter, for internal use
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-03-31 10:01:32 -07:00
John Howard
141a83b820
Windows - fix panic and stderr
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-03-31 09:51:50 -07:00
Krasi Georgiev
a3c2ccacd0
update containerd to 9048e5e50717ea4497b757314bad98ea3763c145
...
Signed-off-by: Krasi Georgiev <krasi@vip-consult.solutions>
2017-03-31 19:47:05 +03:00
Vincent Demeester
9f9cc221bd
Merge pull request #31634 from AkihiroSuda/clarify-env-without-value
...
api: clarify that Env var without `=` is removed from the environment
2017-03-31 17:34:32 +02:00
Brian Goff
1325f667ee
Merge pull request #27565 from rothrock/env-by-regex
...
[splunk] Use a regex to match environment variables
2017-03-31 10:46:48 -04:00
Sebastiaan van Stijn
5d25195f29
fix cleanup logic if restoring plugin fails
...
The "err" output variable was masked by the "if" statement,
so the error was never updated.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-03-31 16:42:30 +02:00
dattatrayakumbhar04
59b70cdabe
28722: List of containers with networkID filter is not working
...
Signed-off-by: dattatrayakumbhar04 <dattatraya.kumbhar@gslab.com>
2017-03-31 08:57:09 +00:00