Commit Graph

1466 Commits

Author SHA1 Message Date
2fdd11175c Merge pull request #27869 from bltavares/nuke-when-graphdir-is-a-mount
Nuke when graphdir is a mount
Upstream-commit: d1fe79ca84487b679d8e860e971ab82a3cc2dacf
Component: engine
2016-11-01 23:21:49 -07:00
c22d6298d7 Merge pull request #27855 from justincormack/check-ext3
Do not warn in check-config script about ext3 if provided by ext4
Upstream-commit: b5589fba89bdea5424b3555a892c43921a681974
Component: engine
2016-11-01 20:21:48 -07:00
cbd967cd2a Nuke when graphdir is a mount
Previously, when the graphdir was a root of a mountpoint, we would not
be able to cleanup the graphdir, as the script would umount in case
target dir is a mount itself

```/etc/mtab
/dev/xvdc1 /var/lib/docker btrfs
```

When running the script, the graphdir would be unmounted and it would
remove a (possibly) empty folder.

```
Nuking /var/lib/docker ...
  (if this is wrong, press Ctrl+C NOW!)

  + sleep 10

  + umount -f /var/lib/docker
  + rm -rf /var/lib/docker
  ```

This PR includes the necessary changes to nuke the folder on this
scenario, including when the graphdir is a btrfs mount iself.

Signed-off-by: Bruno Tavares <btavare@thoughtworks.com>
Upstream-commit: 5f98b977496b5c8430162b129cb94c88efb0f3b6
Component: engine
2016-11-01 22:22:25 -02:00
d375460d63 Merge pull request #27879 from sdurrheimer/zsh-completion-ps-health-filter
Add zsh completion for 'docker ps --filter health='
Upstream-commit: 17aaa0890a7f53cbd9c8806a93de73898ea92813
Component: engine
2016-10-29 19:23:55 +02:00
596b96c39e Merge pull request #27881 from albers/completion-ps--filter-health
Add bash completion for `docker ps --filter health`
Upstream-commit: e1369f2f394bde84f9d0a3b262a9ce94971e039b
Component: engine
2016-10-29 10:05:24 -07:00
4011d7083d Add bash completion for docker ps --filter health
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 5e6a59b59f567d5e69d9ae9df98a89a69b2664bd
Component: engine
2016-10-29 04:26:08 -07:00
1fda59702c Add zsh completion for 'docker ps --filter health='
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 8df3d6a2a7e02ff1c7baf0a273d20b2422e38f39
Component: engine
2016-10-29 12:13:29 +02:00
34bac6f06e Fix bunch of typos
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: e6866492c4492db3bb9546afa2fbaed20f4c1883
Component: engine
2016-10-29 15:03:26 +08:00
ed2e1f6e2b Service create --group param
--group-add was used for specifying groups for both service create
and service update. For create it was confusing since we don't have
an existing set of groups. Instead I added --group to create, and
moved --group-add to service update only, like --group-rm
This deals with issue 27646

Signed-off-by: Lily Guo <lily.guo@docker.com>

Update flag documentation

Specify that --group, --group-add and --groupd-rm refers to
supplementary user groups

Signed-off-by: Lily Guo <lily.guo@docker.com>

Fix docs for groups and update completion scripts

Signed-off-by: Lily Guo <lily.guo@docker.com>
Upstream-commit: 2f58494ae6e796325329f849cf547bcf94bb68e3
Component: engine
2016-10-28 13:26:31 -07:00
86df94b9ba Merge pull request #27369 from cezarsa/hc
Add --health-* flags to service create and update
Upstream-commit: f860289131e36ad2dde5ebe60d15a86fd97934b5
Component: engine
2016-10-28 21:59:52 +02:00
62e380aa24 Merge pull request #27731 from albers/completion-export--output
Add bash completion for `docker export --output`
Upstream-commit: 9842f019ec458ee4a5f892a08e76c319bd2c6a24
Component: engine
2016-10-28 10:59:05 -07:00
a4d5c582a1 Merge pull request #27732 from albers/completion-pause-multiple-containers
Add support for multiple containers to bash completion for `docker pause`
Upstream-commit: a52b9b4591b6146436d55d6579790fe6e842a714
Component: engine
2016-10-28 10:58:34 -07:00
c05d99582c Add --health-* commands to service create and update
A HealthConfig entry was added to the ContainerSpec associated with the
service being created or updated.

Signed-off-by: Cezar Sa Espinola <cezarsa@gmail.com>
Upstream-commit: 7bd2611789e6898576f7229255c238f7c1129293
Component: engine
2016-10-28 15:19:08 -02:00
98f1727b06 Merge pull request #27856 from albers/completion-service-create--env-file
Add bash completion for `docker service create --env-file`
Upstream-commit: 1462ea37d0014ef5f7f3e4bd9d174bcd0185e71d
Component: engine
2016-10-28 19:00:06 +02:00
26bb847ac1 Do not warn in check-config script about ext3 if provided by ext4
Many distributions now use ext4 to provide ext2 and ext3 support,
so do not warn about possibly missing ext3 support if the config
option is used.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: b28619046a92977f33be6b3ddba5e60c589b3c0f
Component: engine
2016-10-28 12:51:09 +01:00
b1f2523820 Add bash completion for docker service create --env-file
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: b2db0cdae7b353c7bd4608579758f6c4a272f9fe
Component: engine
2016-10-28 12:53:32 +02:00
c162aa9149 Add zsh completion for 'docker service create --env-file'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 60813045c128b43cdd31f938a452abab9e9ebbc1
Component: engine
2016-10-28 08:10:42 +02:00
ef5cf518c7 Merge pull request #27654 from gaocegege/add-quiet-mode-to-service-ps
Add -q option to `docker service ps`
Upstream-commit: 89011970e04614dd285ea4c3423ec7a86602488b
Component: engine
2016-10-28 05:21:03 +02:00
0df16199a0 fixes #27643
Signed-off-by: Ce Gao <ce.gao@outlook.com>
Upstream-commit: 9efa472bd1cfe1274248612c952937334ea3e252
Component: engine
2016-10-28 08:02:57 +08:00
c04a526463 Merge pull request #26988 from thaJeztah/remove-service-update-name-flag
Remove service update name flag
Upstream-commit: 3a3a87bff8dcc2f880e849e186bda02a8cee8d90
Component: engine
2016-10-27 16:55:47 -07:00
4cadaabc3f Remove --name flag from service update
The --name flag was inadvertently added to
docker service update, but is not supported,
as it has various side-effects (e.g., existing
tasks are not renamed).

This removes the flag from the service update
command.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 047e44eeb186a8bde41765a44c5966a150fa84f3
Component: engine
2016-10-27 09:16:29 -07:00
aa72e9f745 Move bash completion logic to new subcommand: info
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: a3efa05d3ad6e38540c4fa6b55100e7b979cc260
Component: engine
2016-10-27 09:10:39 +02:00
3c813f7ba6 Move bash completion logic to new subcommand: events
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 1de8e84a5cdc5146bdb75307be02bc881f5fb437
Component: engine
2016-10-27 09:08:18 +02:00
f88d0a2192 Add bash completion for new docker system command family
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 5290f748789474d9c826e84342f59e6b43e96c4e
Component: engine
2016-10-27 09:05:21 +02:00
91360fabc0 Merge pull request #27719 from albers/completion-image
Add bash completion for new `docker image` command family
Upstream-commit: 362eb4cfbb09b5dc0fe648360a2e6d0546bf6613
Component: engine
2016-10-27 00:41:26 +02:00
ae3423b0ca Merge pull request #23430 from erikstmartin/realtime-threads
Implementing support for --cpu-rt-period and --cpu-rt-runtime
Upstream-commit: 80d6d2e129805e8ee9257641b922e47a01f16736
Component: engine
2016-10-27 00:22:06 +02:00
b5a5162877 Merge pull request #27724 from sdurrheimer/zsh-completion-dockerd-experimental
Add zsh completion for 'dockerd --experimental'
Upstream-commit: 2a2f183627af25fb6f1c93c5fc2c4d04ab7e75bb
Component: engine
2016-10-26 09:02:27 -07:00
3affb6aba8 Implementing support for --cpu-rt-period and --cpu-rt-runtime so that
containers may specify these cgroup values at runtime. This will allow
processes to change their priority to real-time within the container
when CONFIG_RT_GROUP_SCHED is enabled in the kernel. See #22380.

Also added sanity checks for the new --cpu-rt-runtime and --cpu-rt-period
flags to ensure that that the kernel supports these features and that
runtime is not greater than period.

Daemon will support a --cpu-rt-runtime flag to initialize the parent
cgroup on startup, this prevents the administrator from alotting runtime
to docker after each restart.

There are additional checks that could be added but maybe too far? Check
parent cgroups to ensure values are <= parent, inspecting rtprio ulimit
and issuing a warning.

Signed-off-by: Erik St. Martin <alakriti@gmail.com>
Upstream-commit: 56f77d5ade945b3b8816a6c8acb328b7c6dce9a7
Component: engine
2016-10-26 11:33:06 -04:00
29eec9aad7 Remove unmaintained Dockerfile syntax for Kate
We don't support this and no maintainers uses Kate.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: a2f695d7fae47481eba68b92b33257605e4cbada
Component: engine
2016-10-25 15:42:27 -07:00
7db4393674 Merge pull request #27620 from andrewhsu/fix-debian-stretch-apt-mirror
sed replace apt mirror with default deb.debian.org for debian distros
Upstream-commit: f7e2f8ac1c2a3a127595486ac00515bd051eac8f
Component: engine
2016-10-25 15:30:07 -07:00
c0d067f26a sed replace apt mirror with default deb.debian.org for debian distros
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: dbe17defd15d16d1d85d794c8beaea595df1d0ba
Component: engine
2016-10-25 13:25:21 -07:00
c9ec2e296d Merge pull request #27716 from sdurrheimer/zsh-completion-daemon-shutdown-timeout
Add zsh completion for 'dockerd --shutdown-timeout'
Upstream-commit: 95b459df6d87e1820675e77c85aa7703ca7aaef1
Component: engine
2016-10-25 08:58:34 -07:00
24c6a05fd5 Merge pull request #27715 from sdurrheimer/zsh-completion-create-run-stop-timeout
Add zsh completion for 'docker {create,run} --stop-timeout'
Upstream-commit: c851aea2b6fe01927f7c7631ca401ca56cf4cf4e
Component: engine
2016-10-25 08:58:18 -07:00
2b6cc62479 Merge pull request #27721 from albers/completion-dockerd--experimental
Add bash completion for `dockerd --experimental`
Upstream-commit: 9643f0e816d81785b68c002115b2a29d8462e1ed
Component: engine
2016-10-25 07:10:23 -07:00
1e590ce972 Add support for multiple containers to bash completion for docker pause
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 2e44e74874e721d7bc635b91b6870f5d000be177
Component: engine
2016-10-25 14:24:59 +02:00
2c4abfd9cc Add bash completion for docker export --output
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 3ac19862f2a797d8136e0248615fe16d6cc2faeb
Component: engine
2016-10-25 14:18:13 +02:00
8c365fa5ad Add zsh completion for 'dockerd --experimental'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 11b6c4c58a5fe46bc2094276dcc27b552b607398
Component: engine
2016-10-25 11:26:39 +02:00
757c98f6b1 Add bash completion for dockerd --experimental
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: e63f19653661c3d39a5d4fccf6e335cdb5ed2c6b
Component: engine
2016-10-25 10:04:48 +02:00
7b5e480927 Move bash completion logic to new subcommand: tag
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 28469b572033e2a0cd3509d1789dc70a63e2a141
Component: engine
2016-10-25 09:57:47 +02:00
94d4fdd472 Move bash completion logic to new subcommand: save
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 18e8c59fbbf2356d502982f1051ea6dc60a3113f
Component: engine
2016-10-25 09:57:47 +02:00
6054af3621 Move bash completion logic to new subcommand: rmi
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 01c259e08a43679e6cd406d236b1da48ad1e7204
Component: engine
2016-10-25 09:57:47 +02:00
1e98008b15 Move bash completion logic to new subcommand: push
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 2d139df59cc2791ef3c343f773311aa3ae000413
Component: engine
2016-10-25 09:57:47 +02:00
d190c409fe Move bash completion logic to new subcommand: pull
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 6864f3ae5a3acb127fe4199540d789fba1ef0bd4
Component: engine
2016-10-25 09:57:47 +02:00
915231aaf9 Move bash completion logic to new subcommand: images
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: df486631bcaff7cb54f5e326f687085724e8de79
Component: engine
2016-10-25 09:57:47 +02:00
af1d3eba23 Move bash completion logic to new subcommand: load
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 75aede3a7c23385a7cc44c81710a6e790199870e
Component: engine
2016-10-25 09:57:47 +02:00
73e8ea8277 Delegate bash completion for docker {container,image} inspect to parameterized function
In #23614 `docker inspect` was semantically enhanced to inspect "everything".
Therefore moving its logic to `_docker_container_inspect` was not correct.

This commit moves it back to its original top-level location (`_docker_inspect`)
so that it can be called by `_docker_{container,image}_inspect` and others (will
be added in follow-up PRs).
Parameterization was added in order to get caller-specific behavior.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 9eb1f554028aab84beaed0d5ff6ecbcbd3848594
Component: engine
2016-10-25 09:57:38 +02:00
b218d45d9c Fix zsh completion for 'docker exec --env'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 94b6376ee5c9ccb52bbab9101360cfe97727b4b1
Component: engine
2016-10-25 09:05:07 +02:00
e853b13d88 Add zsh completion for 'dockerd --shutdown-timeout'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 20890b4aadad4deb52d3896572b32c550fd369f0
Component: engine
2016-10-25 08:59:23 +02:00
eaf4354320 Add zsh completion for 'docker {create,run} --stop-timeout'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 34f5d97468ca92c2209312205b0637a96c39a593
Component: engine
2016-10-25 08:55:00 +02:00
b64eef3181 Move bash completion logic to new subcommand: import
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: e93298650d052c7ed29148a3012f4b710620af2f
Component: engine
2016-10-24 01:37:52 -07:00