Commit Graph

1732 Commits

Author SHA1 Message Date
189d700cd2 Merge pull request #30438 from albers/completion-windows-specific
Add windows specific bash completion for `docker run|create|build`
Upstream-commit: cd7f3e7f9ae6e551a824c057f0f48e1d7e8706f6
Component: engine
2017-01-26 14:25:35 -08:00
b0cadb1839 Rename helper function in bash completion for consistency
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 93e43b42be7e600a266c17c64a3d718a0a4737a6
Component: engine
2017-01-25 15:55:04 -08:00
19e6c32abb Hide bash completion for docker run|create|build --isolation on non-windows
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: fceaae95b5a61954ea40913b45b37b7dd1dd4d8a
Component: engine
2017-01-25 15:55:04 -08:00
61a58b02fd Merge pull request #30376 from albers/completion-fix-node-list
Fix bash completion for completing nodes
Upstream-commit: db657a558ecff8e64490ebef15d744af7ef19d50
Component: engine
2017-01-25 11:52:13 -08:00
619883aba7 Add windows specific bash completion for docker run|create
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: f2ee29ed96a9ba9c13cc1bec8b393565f5da9041
Component: engine
2017-01-25 10:24:27 +01:00
1245f22731 Merge pull request #30269 from sdurrheimer/zsh-completion-service-ps-multi
Add zsh completion for multiple service for 'docker service ps'
Upstream-commit: f07f54951fcf918423463d57c67d6fe04b82941b
Component: engine
2017-01-24 16:33:30 -05:00
dbe5a280c8 Merge pull request #30283 from albers/completion-run--init-path
Add bash completion and docs for `docker run|create --init-path`
Upstream-commit: b13ecbc7b530fa17e4c7a4509c8c7d9e1a6c1e90
Component: engine
2017-01-24 10:06:44 -08:00
aca0d9b25a Merge pull request #30268 from sdurrheimer/zsh-completion-plugin-install-alias
Add zsh completion for 'docker plugin install --alias'
Upstream-commit: 34d06190740d555b63cbe814028c207b13b4c2cc
Component: engine
2017-01-24 10:08:57 -05:00
c26a6ba57a Merge pull request #30399 from albers/completion-swarm-lock
Add bash completion for `docker swarm unlock|unlock-key`
Upstream-commit: aa180e5f31c78f2216fe664378828baac0954175
Component: engine
2017-01-24 09:43:07 -05:00
648cda85d5 Merge pull request #30398 from albers/completion-swarm-init
Add missing options to bash completion for `docker swarm init|update`
Upstream-commit: 3bc021cdf371f539295e87d1b22ca9066eda6e87
Component: engine
2017-01-24 09:41:30 -05:00
1c12016321 Merge pull request #30373 from albers/completion-fix-service-update
Fix bash completion for `docker service update`
Upstream-commit: 47da8175be65ac401348a7b03c321914d07a910a
Component: engine
2017-01-24 09:31:53 -05:00
f80b2ebc4e Merge pull request #30248 from albers/completion-capabilities
Improve bash completion for `docker run --cap-{add,drop}`
Upstream-commit: d417dd7886f420bd369361a6f137364222998488
Component: engine
2017-01-24 12:10:14 +01:00
cac1776108 Merge pull request #30371 from albers/completion-fix-plugin-ls
Fix bash completion for `docker plugin ls`
Upstream-commit: bb9f7cb280a98c14eb8ec338a1ee1f037c5a1645
Component: engine
2017-01-24 11:46:13 +01:00
fa3a411dc8 Add bash completion for docker swarm unlock|unlock-key
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 07bd5152b3731c108e2dba57b1f51e6609b55ba3
Component: engine
2017-01-24 10:11:38 +01:00
4626e249f0 Add missing options to bash completion for docker swarm init|update
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: f93da79dc18a989a727978350cca8e941e9daeca
Component: engine
2017-01-24 10:00:18 +01:00
b26449222d Fix bash completion for completing nodes
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 550947e437fab42a0b661bad5cb2645f61861aa1
Component: engine
2017-01-24 09:24:34 +01:00
8cc16f0566 Merge pull request #30375 from albers/completion-service-ps--filter-node
Add bash completion for `docker service ps --filter node`
Upstream-commit: 929ae4a0b6f2be28512faa2d80d67b95774dea0f
Component: engine
2017-01-24 11:49:16 +09:00
57ab4be8fc Merge pull request #30318 from sdurrheimer/zsh-completion-init
Add zsh completion for 'dockerd --init' and 'docker {create,run} --init'
Upstream-commit: b157b3c6489917f7633c93f730416b76513cadbf
Component: engine
2017-01-23 16:28:25 -05:00
3c793c2ca4 Add bash completion for docker service ps --filter node
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: a39a2bb6c29405148df3e45216f46f54263cd5ea
Component: engine
2017-01-23 19:05:00 +01:00
ac8ec79951 Fix bash completion for docker service update
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 01ac33ce165835a3ccde7d151d7d2905c8391461
Component: engine
2017-01-23 18:48:21 +01:00
8d31dfb88a Fix bash completion for docker plugin ls
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 72bd2f8fd3ac456300cc2d3415667cb380faf184
Component: engine
2017-01-23 18:24:51 +01:00
95d98b384a Add bash completion for newly added options to "docker plugin ls"
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com>
Upstream-commit: 6d6a7fc70c91e2f10dd5b48725c3b583a724bc88
Component: engine
2017-01-20 15:59:44 -08:00
6d01039fe4 Merge pull request #29959 from cpuguy83/master_fix_selinux_packaging
[master] Fix conflicts with newly updated selinux policies
Upstream-commit: 7a97705b52e7f5c65d31870579cb1dcc09506d89
Component: engine
2017-01-20 15:13:18 -08:00
4e1939a186 Merge pull request #30282 from sdurrheimer/zsh-completion-swarm-join-availability
Add zsh completion for 'docker swarm --availability'
Upstream-commit: ae99820357877c010ee76892fb64068f1212e7ae
Component: engine
2017-01-20 17:52:06 +01:00
ae952f464c Merge pull request #30317 from sdurrheimer/zsh-completion-prune-filter
Add zsh completion for 'docker {container,image,network,system} prune --filter
Upstream-commit: 156d402133849f74b9e9ac1c57a574fd9e552aee
Component: engine
2017-01-20 16:25:42 +01:00
ad6c5e2334 Add zsh completion for 'dockerd --init' and 'docker {create,run} --init'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: cdf57782fd6323549e37aaccc3eeaef1b4aa91f3
Component: engine
2017-01-20 16:06:22 +01:00
1f960a59bb Add zsh completion for 'docker {container,image,network,system} prune --filter'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 784ebccffaa8329aee9e88877e6039b5002ad8e3
Component: engine
2017-01-20 15:49:21 +01:00
da2ad487f8 Add bash completion for run|create --init-path
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 182048f18592259633d21ac55bd5b73903de50b9
Component: engine
2017-01-19 08:33:05 -08:00
aa09155ed2 Add zsh completion for 'docker swarm --availability'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: ee2ce82c61c11b1c14f9febf811fbbc19d69b750
Component: engine
2017-01-19 16:54:36 +01:00
97ca330cd9 Add zsh completion for multiple service for 'docker service ps'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 82e62b15f39f2759a84123c1117b6bf85830c367
Component: engine
2017-01-19 09:04:51 +01:00
eff5310721 Add zsh completion for 'docker plugin install --alias'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 455b7bcbabd4eb7e440448b5834f626cb08c69e0
Component: engine
2017-01-19 08:58:44 +01:00
56fef9c9c4 Add bash completion for dockerd --init and docker run|create --init
Fixes #30263

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 20762617572f2e02b8e397844343083506144e86
Component: engine
2017-01-19 08:22:14 +01:00
ae5b65a856 Merge pull request #30208 from justincormack/no-sqlite
Remove sqlite dependency
Upstream-commit: 0e8c7d72771847227df295471ac73180cbb3caa9
Component: engine
2017-01-18 13:15:38 -05:00
fe85c352df Improve bash completion for docker run --cap-{add,drop}
Docker has several capabilities enabled by default and some not.
It seems natural to follow this distinction in --cap-add and
--cap-drop.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 36d8b66cb9aab26bd2552083b786b7a11272d9b9
Component: engine
2017-01-18 16:04:46 +01:00
ecfeb35159 Remove sqlite
This drops support for migrations from pre-1.10 Docker versions, which
should be done via an external tool or an intermediate upgrade.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: f8119bb7a76b5c42defb6e0a2dc67bd77ad29a5e
Component: engine
2017-01-18 12:27:21 +00:00
9c9701a340 Block obsolete socket families in the default seccomp profile
Linux supports many obsolete address families, which are usually available in
common distro kernels, but they are less likely to be properly audited and
may have security issues

This blocks all socket families in the socket (and socketcall where applicable) syscall
except
- AF_UNIX - Unix domain sockets
- AF_INET - IPv4
- AF_INET6 - IPv6
- AF_NETLINK - Netlink sockets for communicating with the ekrnel
- AF_PACKET - raw sockets, which are only allowed with CAP_NET_RAW

All other socket families are blocked, including Appletalk (native, not
over IP), IPX (remember that!), VSOCK and HVSOCK, which should not generally
be used in containers, etc.

Note that users can of course provide a profile per container or in the daemon
config if they have unusual use cases that require these.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: 7e3a596a63fd8d0ab958132901b6ded81f8b44c0
Component: engine
2017-01-17 17:50:44 +00:00
a44db0ca35 Add bash completion for build --squash
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: e91dbba7ff62a92bd395bc419f522fa66618ae7b
Component: engine
2017-01-17 08:52:18 +01:00
2292a0956f Add bash completion for container|image|network prune --filter until
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 217786423cfab26b4d7370f5cc1f4da9f4ca3c1e
Component: engine
2017-01-16 10:47:52 +01:00
485690f98a Merge pull request #30163 from albers/completion-fix-hide-legacy-commands
Fix treatment of DOCKER_HIDE_LEGACY_COMMANDS in bash completion
Upstream-commit: fd0ea7693143b1eecf3c6bba52e091f3f793af99
Component: engine
2017-01-16 10:01:44 +01:00
5b63ac99e9 Merge pull request #30143 from tophj-ibm/multi-get-go-from-own-dockerfile
[multi-arch] get go version from arch dockerfile
Upstream-commit: 96f7cf254babd715bb675d36d26d246f520c710a
Component: engine
2017-01-15 15:47:55 +01:00
848651eae6 Merge pull request #29902 from caervs/add_autorestart
Add on-failure to default restart policy
Upstream-commit: 0fcd55072b0199db5f24be66ff92ce6c0e771e01
Component: engine
2017-01-14 16:40:02 -05:00
ea092d3119 Merge pull request #30125 from albers/completion-plugin-install--disable-content-trust
Add bash completion for `plugin install --disable-content-trust`
Upstream-commit: 1bbd75c743df8310fefb7ac026e7aa1d8228cac1
Component: engine
2017-01-14 09:04:51 -05:00
c2ac78f864 Fix treatment of DOCKER_HIDE_LEGACY_COMMANDS in bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 12952f537cf1851bfe84706a4e0eb283dc970379
Component: engine
2017-01-14 04:48:41 -08:00
b1a42a3384 [multi-arch] get go version from arch dockerfile
Changes a couple of generate scripts so that the architecture
gets the go version from its own Dockerfile. This should cover a
rare case where the go version might have to be different from
the x86 Dockerfile.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: fa17ac256019729a15f6c33c2c2dad34acef9e4a
Component: engine
2017-01-13 16:48:41 -05:00
2ac8b7a385 Honour $DOCKER_HIDE_LEGACY_COMMANDS in bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: aa006f128065fa8b1f017d1fdfdfebdbd08e31c9
Component: engine
2017-01-13 15:43:52 +01:00
1823a6c5fd Add bash completion for plugin install --disable-content-trust
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 725a864a0496a6c10f56c30f8a45234230951343
Component: engine
2017-01-13 11:56:50 +01:00
47580bbc58 Add bash completion for swarm join --availability
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: f487b268f9ec7e4f06723261dadc2b567bf0504c
Component: engine
2017-01-11 10:30:56 -08:00
c7e15c6493 Fix conflicts with newly updated selinux policies
The base selinux policies on centos/rhel/oraclelinux have all been
updated in a way that conflicts with the policies we install with
`docker-engine-selinux`. This patch fixes these conflicts.

In addition, removes special cases for old/unsupported versions of
fedora in our selinux package, and change to use a single minimum
version for the selinux base policy package, as this is the minimum
version required to use our selinux policy package.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: ec9a05e5e2e82363fae21131f869e2e34a597c50
Component: engine
2017-01-06 16:04:24 -05:00
857c35324a Add on-failure to default restart policy
In the event that the docker daemon is managed by systemd and spontaneously
dies the default service configuration does not have docker restart. For people
who just want to install and start docker then never worry about whether docker
is running a better default may be to restart the service on a failure.

Signed-off-by: Ryan Abrams <rdabrams@gmail.com>
Upstream-commit: 7b9ecb9700ebd90c7f5854028f0f981f0fe5d03a
Component: engine
2017-01-06 10:23:44 -08:00
a6a7d0048a Merge pull request #29741 from yuexiao-wang/update-option
keep network options consistent between network connect and run
Upstream-commit: ee9bb347a678640a5305314eca99870971c1fc65
Component: engine
2017-01-06 19:01:48 +01:00