Commit Graph

31798 Commits

Author SHA1 Message Date
2b71862e00 Merge pull request #32383 from Microsoft/jjh/removeunused
Windows: Remove unused process_windows.go
Upstream-commit: 9691170de99cf2e306640ec64f2c9d787100dfa9
Component: engine
2017-04-05 23:32:40 -04:00
ed86f7c60d Merge pull request #32251 from AkihiroSuda/run-mount
cli: add `--mount` to `docker run`
Upstream-commit: 945a119c8a52118ebee6c53f46e9846ea9e76c5e
Component: engine
2017-04-05 22:34:47 +02:00
2fb37e5bc6 Merge pull request #32382 from mstanleyjones/master
Edits to CLI reference
Upstream-commit: 7b5c179ef4053e0d6a82eee319bd8220fe570879
Component: engine
2017-04-05 21:04:06 +02:00
19149ea4f2 Edits to CLI reference
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: 6d3eecd8cf303f9f1588ef851e3bd8fe83fcbb8d
Component: engine
2017-04-05 11:27:09 -07:00
e2c2909317 Windows: Remove unused process_windows.go
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 329daee5ef737fed010e1995555064b44bea1efe
Component: engine
2017-04-05 11:04:34 -07:00
5be33d2273 Merge pull request #30424 from yongtang/30376-node-ls-format
Add `--format` for `docker node ls`
Upstream-commit: 833f1f44245c9e9514b931b19831ee58594f6b10
Component: engine
2017-04-05 16:53:54 +02: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
6c1668c7bd cli: add --mount to docker run
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 77fe35b3b903831bd9cfb60a806d056195dc14b6
Component: engine
2017-04-05 04:52:08 +00:00
b6572ab4d8 Merge pull request #32358 from mstanleyjones/fix-liquid
Escape some double brackets
Upstream-commit: 8d96619e5a367798cffcb740cfc41e0a505a5232
Component: engine
2017-04-05 00:35:45 +02:00
594d540270 Merge pull request #32352 from KarthikNayak/32174
Docs: Add the flag `--api-enable-cors` to deprecated.md
Upstream-commit: b9e9518bfee26e859eee1cbd4b6ca9e7be637c42
Component: engine
2017-04-04 15:22:04 -07: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
b44fd1c414 Merge pull request #32346 from thaJeztah/dont-warn-on-make-install
do not show errors on make install
Upstream-commit: cb0c905b6a346b4b117393c8c54169d62ea1c235
Component: engine
2017-04-04 23:55:54 +02:00
b40d1c6a48 Merge pull request #32063 from tonistiigi/named-contexts
Add support for named build stages
Upstream-commit: 2e96c1739be45f2ff8342cb3e222db3eb1616839
Component: engine
2017-04-04 12:53:59 -07:00
964a70f1c3 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>
Upstream-commit: 7328ae12cc3e14b3eb6ab01f09f6d94a82a44066
Component: engine
2017-04-04 12:46:44 -07:00
c7270d4d81 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>
Upstream-commit: 32e21ecbfe3af9a8b5762ad1a549518221c4939e
Component: engine
2017-04-04 11:26:35 -07:00
e742ab9dfb Escape some double brackets
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: 622bdadfd713b03932c5b142ac46915483a0cb04
Component: engine
2017-04-04 10:06:32 -07:00
077947c0d9 Add a multi stage trusted build testcase
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 79ccb3478f2d1c541d8689a8b5c60ab51d95ca79
Component: engine
2017-04-04 09:56:00 -07:00
e4cc928144 Merge pull request #32347 from cpuguy83/fix_volumestore_panic
Fix panic on error looking up volume driver
Upstream-commit: f6b7dc983782e5800bdfd901f963494df9fbb0b7
Component: engine
2017-04-04 18:55:13 +02:00
86cf613824 Merge pull request #31750 from dnephin/some-builder-cleanup
Fix `docker build --label` when the label includes single quotes and a space
Upstream-commit: 6abbc933ae02b69afad72e229f7b9d5ef8a6f431
Component: engine
2017-04-04 09:37:00 -07:00
71418f1299 Add support for FROM using named block
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 672ea30a94933eec228d71217b033da5d6572b8d
Component: engine
2017-04-04 09:34:28 -07:00
da4a3b24f4 Implicit copy-from with reference
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 73b4b8ed7f86b8df70d7028c5ac7c2ba61ee0a8c
Component: engine
2017-04-04 09:34:28 -07:00
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
05f99a7915 Docs: Add the flag --api-enable-cors to deprecated.md
Signed-off-by: Karthik Nayak <Karthik.188@gmail.com>
Upstream-commit: 85f92ef3590b386ea17e3948262725a2d3ce4db5
Component: engine
2017-04-04 20:04:42 +05:30
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
1139afd6ff Fix panic on error looking up volume driver
(-‸ლ)

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 5baf8a411899b1aa39f921df8debfd925491be68
Component: engine
2017-04-04 09:22:01 -04:00
320a24cf4b 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>
Upstream-commit: 2443decdd5eb016ca2eb9448c033ed2b9887ef2a
Component: engine
2017-04-04 15:19:50 +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
bc0cac1b3a Merge pull request #32342 from thaJeztah/master-fix-changelog
[master] fix version of containerd in changelog
Upstream-commit: ebdb7a4a1ed9bf2754a0821011af65a59f7e9213
Component: engine
2017-04-04 10:17:30 +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
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
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