Commit graph

4914 commits

Author SHA1 Message Date
Yong Tang
7025247324 Add label filter for docker system prune
This fix tries to address the issue raised in 29999 where it was not
possible to mask these items (like important non-removable stuff)
from `docker system prune`.

This fix adds `label` and `label!` field for `--filter` in `system prune`,
so that it is possible to selectively prune items like:
```
$ docker container prune --filter label=foo

$ docker container prune --filter label!=bar
```

Additional unit tests and integration tests have been added.

This fix fixes 29999.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2017-04-06 09:11:25 -07:00
Andrea Luzzardi
367b57d985 Re-vendor docker/swarmkit to d2e48a332063ccd4ea26b6262ee717de997de560
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2017-04-05 18:49:23 -07:00
Brian Goff
b7c3b312c9 Merge pull request #32268 from cpuguy83/volume_err_obfuscate
don't obfuscate error during volume create
2017-04-05 09:05:10 -04: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
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
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
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
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
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
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
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
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
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
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
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
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
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
Josh Hawn
261ef1fa27 Deprecate --graph flag; Replace with --data-root
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
2017-03-30 11:24:56 +02:00
Sebastiaan van Stijn
f16d1a47cc Merge pull request #31741 from mlaventure/cleanup-tmp-on-start
Cleanup docker tmp dir on start
2017-03-30 03:14:55 +02:00
Sebastiaan van Stijn
a1099010b0 Merge pull request #32085 from aboch/bd
Do not panic on redundant UpdateAttachment
2017-03-29 12:04:05 +02:00
Sebastiaan van Stijn
d9c4261964 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)
2017-03-29 12:01:03 +02:00
Vincent Demeester
4180211d80 Merge pull request #32186 from aaronlehmann/cluster-omitempty
api: Omit Cluster, Nodes, and Managers from swarm info when unavailable
2017-03-29 10:38:52 +02:00
Vincent Demeester
02faf807a2 Merge pull request #32167 from miaoyq/print-a-err-return
The returned err should be printed
2017-03-29 10:36:05 +02:00
Yanqiang Miao
87d0a3ad89 The returned err should be printed
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2017-03-29 09:00:50 +08:00
Tianon Gravi
87f9362975 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>
2017-03-28 15:18:39 -07:00
Aaron Lehmann
3894254ddd 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>
2017-03-28 14:20:25 -07:00
Sebastiaan van Stijn
4f2ed03092 Fix docker system prune failing with Swarm mode disabled
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-03-28 16:35:24 +02:00
Sebastiaan van Stijn
8f4f85dd5b
Add NetworkManager and ClusterStatus interfaces
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-03-28 16:35:14 +02:00
Brian Goff
b6cb416051 Merge pull request #30652 from rhatdan/selinux
If caller specifies label overrides, don't override security options
2017-03-28 10:24:47 -04:00
Sebastiaan van Stijn
4df350b8c7 Merge pull request #30810 from allencloud/make-secret-ls-support-filter
make secret ls support filters in CLI
2017-03-28 13:43:19 +02:00
Vincent Demeester
1c7a3d3e6c Merge pull request #32152 from darrenstahlmsft/RevertWaitOOBE
Windows: Revert change to wait for OOBE
2017-03-28 10:22:03 +02:00
Vincent Demeester
35e5975b90 Merge pull request #30763 from ripcurld0/fix_30714
Fix the create API when fromSrc has a bad URL
2017-03-28 10:20:59 +02:00
Darren Stahl
6eed7f0cac Windows:Revert change to wait for OOBE
Signed-off-by: Darren Stahl <darst@microsoft.com>
2017-03-27 14:32:18 -07:00
Alessandro Boch
3bf164e48d Do not panic on redundant UpdateAttachment
Signed-off-by: Alessandro Boch <aboch@docker.com>
2017-03-27 08:52:03 -07:00
Madhu Venugopal
04295d26df Merge pull request #31714 from aboch/cingr
Allow user to replace ingress network
2017-03-27 07:30:42 -07:00
Vincent Demeester
e2f60837eb Merge pull request #31755 from miaoyq/heartbeat-maybe-zero
The variable heartbeat might be 0
2017-03-27 09:39:01 +02:00
allencloud
3935074016 make secret ls support filters in CLI
Signed-off-by: allencloud <allen.sun@daocloud.io>
2017-03-27 10:16:45 +08:00
Yanqiang Miao
fb2bc35210 The variable heartbeat might be 0
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

perfect the test case for 'discoveryOpts'

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2017-03-27 10:07:58 +08:00
Alessandro Boch
d59d19c328 Allow user to modify ingress network
Signed-off-by: Alessandro Boch <aboch@docker.com>
2017-03-26 15:46:18 -07:00
Boaz Shuster
e050f1760d Fix the create API when fromSrc has a bad URL
When sending a bad URL in the fromSrc parameter using cURL
the response will have status code 200 while it should have 404
or 500 (depends on the error).

This commit addresses this problem in the following ways:
 * Before, `src` was parsed using url.Parse and if the
   returned `url.Scheme` was empty it was set to 'http'
   and `url.Host` was set to `src`.
   This is bad because if `src` was 'web.com/tars/image1.tar'
   The `url.String()` returns 'web.com%2Ftars%2Fimage1.tar`
   which will cause the daemon to fail downloading the file
 * Before writing the "Downloading" message, the image
   is attempted to be downloaded and if there is no error
   the "Downloading" message is sent.

Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
2017-03-26 15:21:13 +03:00
Lei Jitang
238ad8c36a Fix docker logs a dead container
If a container is dead or marked for removal, the json log
file could have been removed, so docker logs will return
`<id>-json.log: no such file or directory`.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
2017-03-24 21:20:52 -04:00
Tõnis Tiigi
2fa8fe400d Merge pull request #31257 from tonistiigi/nested-build
build: add multi-stage build support
2017-03-23 19:14:13 -07:00
Tonis Tiigi
f95f58283b Add support for COPY from previous rootfs
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-03-23 15:12:15 -07:00
Aaron Lehmann
9b33edfa7e Merge pull request #31631 from aaronlehmann/swarm-failure-on-startup
cluster: Proceed with startup if cluster component can't be created
2017-03-22 16:40:49 -07:00
Anusha Ragunathan
bbce24997c Merge pull request #31930 from anusha-ragunathan/authz-disable
When authz plugin is disabled, remove from authz middleware chain.
2017-03-22 14:17:38 -07:00