Commit Graph

31995 Commits

Author SHA1 Message Date
Sebastiaan van Stijn 8d96619e5a Merge pull request #32358 from mstanleyjones/fix-liquid
Escape some double brackets
2017-04-05 00:35:45 +02:00
Victor Vieux b9e9518bfe Merge pull request #32352 from KarthikNayak/32174
Docs: Add the flag `--api-enable-cors` to deprecated.md
2017-04-04 15:22:04 -07:00
Vincent Demeester 5f14f4a949 Merge pull request #32350 from vdemeester/start-stack-trap-earlier
Start the stack trap earlier for daemon
2017-04-04 23:56:36 +02:00
Vincent Demeester cb0c905b6a Merge pull request #32346 from thaJeztah/dont-warn-on-make-install
do not show errors on make install
2017-04-04 23:55:54 +02:00
Victor Vieux 2e96c1739b Merge pull request #32063 from tonistiigi/named-contexts
Add support for named build stages
2017-04-04 12:53:59 -07:00
Yong Tang 7328ae12cc Add hidden placeholder of `.Self` for `docker node ls --format`
This commit adds a hidden placeholder of `.Self` for
`docker node ls --format` so that if the node is the same
as the current docker daemon, then a `*` is outputed.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2017-04-04 12:46:44 -07:00
Arash Deshmeh 243a8e69ff added unit tests for package cli/command/secret
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
2017-04-04 15:35:08 -04:00
Yong Tang 32e21ecbfe Add `--format` for `docker node ls`
This fix tries to address the comment https://github.com/docker/docker/pull/30376#discussion_r97465334
where it was not possible to specify `--format` for `docker node ls`. The `--format` flag
is a quite useful flag that could be used in many places such as completion.

This fix implements `--format` for `docker node ls` and add `nodesFormat` in config.json
so that it is possible to specify the output when `docker node ls` is invoked.

Related documentations have been updated.

A set of unit tests have been added.

This fix is related to #30376.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2017-04-04 11:26:35 -07:00
Misty Stanley-Jones 622bdadfd7 Escape some double brackets
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2017-04-04 10:06:32 -07:00
Tonis Tiigi 79ccb3478f Add a multi stage trusted build testcase
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-04-04 09:56:00 -07:00
Vincent Demeester f6b7dc9837 Merge pull request #32347 from cpuguy83/fix_volumestore_panic
Fix panic on error looking up volume driver
2017-04-04 18:55:13 +02:00
Tõnis Tiigi 6abbc933ae Merge pull request #31750 from dnephin/some-builder-cleanup
Fix `docker build --label` when the label includes single quotes and a space
2017-04-04 09:37:00 -07:00
Tonis Tiigi 672ea30a94 Add support for `FROM` using named block
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-04-04 09:34:28 -07:00
Tonis Tiigi 73b4b8ed7f Implicit copy-from with reference
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-04-04 09:34:28 -07:00
Tonis Tiigi 87512bbc84 Add named context support
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-04-04 09:34:28 -07:00
Sebastiaan van Stijn fe4d7db1ec Merge pull request #30813 from yongtang/30232-service-ls-ports
Add `PORTS` field for `docker service ls` (`ingress`)
2017-04-04 17:04:27 +02:00
Karthik Nayak 85f92ef359
Docs: Add the flag `--api-enable-cors` to deprecated.md
Signed-off-by: Karthik Nayak <Karthik.188@gmail.com>
2017-04-04 20:04:42 +05:30
Vincent Demeester 94d44066f3
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>
2017-04-04 16:23:14 +02:00
Vincent Demeester d7e7aa67ea Merge pull request #32274 from mlaventure/fix-healthcheck-rm-race
Ensure health probe is stopped when a container exits
2017-04-04 16:14:10 +02:00
Brian Goff 5baf8a4118 Fix panic on error looking up volume driver
(-‸ლ)

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-04-04 09:22:01 -04:00
Sebastiaan van Stijn 2443decdd5
do not show errors on make install
When running "make install" in a build container,
docker is not installed the first time it's
run, causing these errors to appear;

    $ make install
    hack/make/.detect-daemon-osarch: line 11: docker: command not found
    hack/make/.detect-daemon-osarch: line 11: docker: command not found
    hack/make/.detect-daemon-osarch: line 11: docker: command not found
    hack/make/.detect-daemon-osarch: line 11: docker: command not found
    KEEPBUNDLE=1 hack/make.sh install-binary

This patch checks if docker exists, and if not
just continues silently :)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-04-04 15:19:50 +02:00
Sebastiaan van Stijn 6b06cc54d0 Merge pull request #29099 from dattatrayakumbhar/28755_Err_Duplicate_checkpoint
#28755: [experimental] Proper error handling for checkpoint conflict
2017-04-04 14:40:20 +02:00
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 bcb63f367775c9c4339d9858f0cec5de5c220fa5)
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
dattatrayakumbhar04 d400518f4d 28755: Proper error handling for checkpoint conflict
Signed-off-by: Dattatrayakumbhar <dattatraya.kumbhar@gslab.com>
2017-04-04 05:18:19 +00: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
Yong Tang c877c7b2bf 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>
2017-04-03 18:40:15 -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
Brian Goff 3b80094665 don't obfuscate error during create
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-04-03 21:04:40 -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
Kenfe-Mickael Laventure 04ae628ca5 Ensure health probe is stopped when a container exits
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-04-03 09:57:04 -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