Commit graph

1525 commits

Author SHA1 Message Date
Sebastiaan van Stijn
bb6fe56e88 Merge pull request #26268 from AkihiroSuda/eventsjsonl
add `docker events --format`
2016-09-19 17:30:27 +02:00
Michael Crosby
efe4e914ef Merge pull request #26207 from splunk/splunk-logging-driver-performance-improvements
Splunk Logging Driver performance improvements
2016-09-16 10:22:09 -07:00
Akihiro Suda
5af5a1be62 add docker events --format
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-09-15 09:55:29 +00:00
Carl Loa Odin
fa255c92df Add errexit to mkimage-yum.sh
Add errexit to mkimage-yum bash script to abort early. This to prevent
disaster when mktemp fails and leave $target variable empty.

Signed-off-by: Carl Loa Odin <carlodin@gmail.com>
2016-09-14 12:04:04 +02:00
Vincent Demeester
0deae9f2fa Merge pull request #26478 from sdurrheimer/zsh-completion-service-group-add-rm
Add zsh completion for 'service {create,update} --group-{add,rm}'
2016-09-13 10:18:27 +02:00
Steve Durrheimer
1df220d51f
Add zsh completion for 'service {create,update} --group-{add,rm}'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-09-13 10:15:22 +02:00
Denis Gladkikh
4907cc7793 Splunk Logging Driver performance improvements
New driver options:

- `splunk-gzip` - gzip compress all requests to Splunk HEC
(enabled by default)
- `splunk-gzip-level` - change compression level.

Messages are sent in batches by 1000, with frequency of 5 seconds.
Maximum buffer is 10,000 events. If HEC will not be available, Splunk
Logging Driver will keep retrying while it can hold messages in buffer.

Added unit tests for driver.

Signed-off-by: Denis Gladkikh <denis@gladkikh.email>
2016-09-12 09:00:16 -07:00
Michael Holzheu
73df9b4e87 s390x: Enable "make deb" for Ubuntu Xenial (16.04)
With this patch and Docker PR 25883 ("Add a Dockerfile for generating
manpages on s390x") "make deb" creates the following packages for s390x:

 # cd bundles/1.13.0-dev/build-deb/
 # find .
   .
   ./ubuntu-xenial
   ./ubuntu-xenial/docker-engine_1.13.0~dev~git20160823.161729.0.2693af4-0~xenial_s390x.deb
   ./ubuntu-xenial/docker-engine_1.13.0~dev~git20160823.161729.0.2693af4-0~xenial.dsc
   ./ubuntu-xenial/docker-engine_1.13.0~dev~git20160823.161729.0.2693af4-0~xenial_s390x.changes
   ./ubuntu-xenial/Dockerfile.build
   ./ubuntu-xenial/docker-engine_1.13.0~dev~git20160823.161729.0.2693af4-0~xenial.tar.gz
   ./docker.log
   ./test.log

Package "docker-engine_1.13.0~dev~git20160823.161729.0.2693af4-0~xenial_s390x.deb"
could be successfully installed on a s390x Ubuntu system:

 # cat /etc/issue
 Ubuntu 16.04.1 LTS \n \l
 # dpkg -i docker-engine_1.13.0~dev~git20160823.161729.0.2693af4-0~xenial_s390x.deb
 ...
 Installing new version of config file /etc/init.d/docker ...
 Installing new version of config file /etc/init/docker.conf ...
 Processing triggers for systemd (229-4ubuntu7) ...
 Processing triggers for ureadahead (0.100.0-19) ...
 Processing triggers for man-db (2.7.5-1) ...

 # docker version
 Client:
  Version:      1.13.0-dev
  API version:  1.25
  Go version:   go1.7
  Git commit:   2693af4-unsupported
  Built:        Wed Aug 24 11:41:13 2016
  OS/Arch:      linux/s390x

 Server:
 ...

The s390x "generate.sh" is a modified version of "ppc64le/generate.sh".
We removed seccomp for s390x because we need at least libseccomp version
2.3.1 which is not provided by Ubuntu Xenial.

Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
2016-09-12 16:10:36 +02:00
Brian Goff
5ada5f129f Merge pull request #26301 from albers/completion-service-groups
Add bash completion for `service {create,update} --group-{add,rm}`
2016-09-12 09:05:49 -04:00
allencloud
af4461ad29 support docker node ps multiNodes
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-09-10 02:52:48 +08:00
Harald Albers
d5a79579d3 Add completion for docker events -f event=health_status
Signed-off-by: Harald Albers <github@albersweb.de>
2016-09-06 13:46:21 -07:00
Harald Albers
be455538aa Add bash completion for service {create,update} --group-{add,rm}
Signed-off-by: Harald Albers <github@albersweb.de>
2016-09-04 05:52:50 -07:00
Akihiro Suda
f3d9214d0b fix the man page and zsh completion for docker images
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-09-02 09:52:10 +00:00
Harald Albers
7f9096adb7 Remove bash completion for docker volume create --name
Signed-off-by: Harald Albers <github@albersweb.de>
2016-08-31 09:50:11 +02:00
Fabio Rapposelli
6c7e1863d5
Add rpm builder for VMware Photon OS
Signed-off-by: Fabio Rapposelli <fabio@vmware.com>
2016-08-30 17:05:32 -07:00
allencloud
b13f5dfd13 make node ps default to self in swarm node
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-08-30 17:34:16 +08:00
Steve Durrheimer
85071bda33
Replace zsh completion for 'docker volume create --name' by 'docker volume create {name}'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-08-28 12:40:10 +02:00
Brian Goff
95fca642a1 Merge pull request #26008 from resin-os/fix-btrfs-check
check-config.sh: Add check for CONFIG_BTRFS_FS_POSIX_ACL
2016-08-25 12:39:35 -04:00
Alexander Morozov
78771b6225 Merge pull request #25786 from splunk/splunk-logging-driver-raw-format-using-json
Splunk Logging Driver: formats and verifyconnection
2016-08-25 09:12:31 -07:00
Andrei Gherzan
1c886a70df check-config.sh: Add check for CONFIG_BTRFS_FS_POSIX_ACL
docker is trying to set system.posix_acl_access but using BTRFS this fails if
CONFIG_BTRFS_FS_POSIX_ACL is not activated.

Signed-off-by: Andrei Gherzan <andrei@resin.io>
2016-08-25 13:20:18 +01:00
Neyazul Haque
10cebd4c74 Change TMPDIR to DOCKER_TMPDIR
TMPDIR was changed to DOCKER_TMPDIR in pull request 7113 but the file still asks user to set TMPDIR.
I am new to docker and wasted sometime this morning because of this.
I am using docker version 1.12.1 on ubuntu server 14.04

Signed-off-by: Neyazul Haque <nuhaque@gmail.com>
2016-08-23 08:45:46 +05:30
Brian Goff
2fb2bbe407 Merge pull request #25869 from cjdmax/master
debian sysvinitscript one missed DOCKER->DOCKERD change
2016-08-22 12:24:31 -04:00
Antonio Murdaca
12e2c2687e
Bump go to 1.7
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-08-21 19:04:15 +02:00
Vincent Demeester
09b929083d Merge pull request #23436 from yongtang/23367-out-of-band-volume-driver-deletion
Add `--force` in `docker volume rm` to fix out-of-band volume driver deletion
2016-08-19 22:09:57 +02:00
Alexander Morozov
bf61c916ee Merge pull request #23438 from tophj-ibm/ppc64le-build-xenial-debs
ppc64le: add support for building docker debs for xenial
2016-08-19 08:35:31 -07:00
Liam Macgillavry
11eda60848 missed DOCKER->DOCKERD change in 1ac1b78b3a for 'status'
Signed-off-by: Liam Macgillavry <liam@kumina.nl>
2016-08-19 11:08:52 +02:00
Christopher Jones
64881dc331
ppc64le: add support for building docker debs for xenial
This PR adds the ability to make docker debs for xenial on power

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2016-08-18 22:25:14 -04:00
Yong Tang
7fd2c80962 Update zsh and bash completion scripts.
This is to update the zsh and bash completion script for
23367.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-08-18 18:41:15 -07:00
Vincent Demeester
426046db3a Merge pull request #25708 from timfeirg/master
expose RemovalInProgress in StateString #25652
2016-08-18 21:54:48 +02:00
timfeirg
37466cc8c8 expose RemovalInProgress in StateString #25652
Signed-off-by: timfeirg <kkcocogogo@gmail.com>
2016-08-18 11:25:27 +08:00
Sebastiaan van Stijn
2ae49a0887 Merge pull request #25789 from sdurrheimer/zsh-completion-network-volume-ls-format
Add zsh completion for 'docker {network,volume} ls --format'
2016-08-17 16:51:51 +02:00
Steve Durrheimer
25009687be
Add zsh completion for 'docker {network,volume} ls --format'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-08-17 08:21:15 +02:00
Steve Durrheimer
d1870019a0
Add zsh completion for 'docker volume ls --filter label'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-08-17 08:15:26 +02:00
Denis Gladkikh
603fd08315 Splunk Logging Driver: formats and verifyconnection
`--log-opt splunk-format=inline|json|raw` allows to change how logging
driver sends data to Splunk, where

`inline` - default value, format used before, message is injected as a
line in JSON payload
`json` - driver will try to parse each line as a JSON object and embed it
inside of the JSON payload
`raw` - driver will send Raw payload instead of JSON, tag and attributes
will be prefixed before the message

`--log-opt splunk-verify-connection=true|false` - allows to skip
verification for Splunk Url

Signed-off-by: Denis Gladkikh <denis@gladkikh.email>
2016-08-16 21:45:16 -07:00
Tõnis Tiigi
8f8bb8ad4c Merge pull request #25188 from armills/nuke-graph-directory
nuke-graph-directory.sh: Improve subvolume search
2016-08-16 09:47:33 -07:00
Michael Crosby
0c8b0faef8 Merge pull request #25337 from jhorwit2/jah/25332
Add --no-trunc to service/node/stack ps output
2016-08-16 09:25:45 -07:00
Josh Horwitz
204c4d39d3 Add --no-trunc to service/node/stack ps output
Signed-off-by: Josh Horwitz <horwitzja@gmail.com>
2016-08-16 10:19:11 -04:00
Harald Albers
5d43a78763 Add bash completion for docker {network,volume} ls --format
Signed-off-by: Harald Albers <github@albersweb.de>
2016-08-16 14:10:28 +02:00
Sebastiaan van Stijn
0309eeb5dd Merge pull request #25745 from albers/completion-volume-ls-filter-label
Add bash completion for `docker volume ls --filter label`
2016-08-16 13:27:14 +02:00
Harald Albers
41511f8911 Add bash completion for docker volume ls --filter label
Signed-off-by: Harald Albers <github@albersweb.de>
2016-08-16 09:10:46 +02:00
Akihiro Suda
dc38c9a047 add --format flag to docker info
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-08-16 04:03:52 +00:00
Tõnis Tiigi
5ac0342e82 Merge pull request #25675 from DieterReuter/master
Fix build deb for ARMv6
2016-08-13 10:16:29 -07:00
Dieter Reuter
5907e4a872 Fix build deb for ARMv6
Signed-off-by: Dieter Reuter <dieter.reuter@me.com>
2016-08-13 00:40:29 +02:00
Michael Crosby
05d1dcfca2 Merge pull request #23116 from glensc/mkimage-pld
add script to make base image for PLD Linux
2016-08-12 15:38:36 -07:00
Tibor Vass
faaab62f73 Merge pull request #25593 from thtanaka/oracle-selinux
Add Oracle Linux distro specific selinux policy
2016-08-11 11:27:54 -07:00
Ramon Brooker
73e08286f9
deal with firewalld/docker startup issues
added the firewalld.service symbol in the After line docker
will always start after firewalld, thus eliminating the issue
of firewall blocking all mapped traffic.

Signed-off-by: Ramon Brooker <Ramon.Brooker@imaginecommunications.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-11 00:13:33 +02:00
Thomas Tanaka
d6cae872c7 Add Oracle Linux distro specific selinux policy
With the latest OL7.2, selinux policy that is shipped
might not be the latest for it to work or build with
selinux policy for docker-1.12.

To be able to achieve that here is what is done:
1. Added systemd_machined policy which is part of systemd.
2. Temporarily comment out unconfined_typebounds because the
current OL7's selinux doesn't have unconfineduser selinux policy,
to include this will be too much. Will revisit this once we have
updated the selinux policy.

Fixes: #24612

Signed-off-by: Thomas Tanaka <thomas.tanaka@oracle.com>
2016-08-10 13:33:56 -07:00
Tibor Vass
fc40ed24d8 Merge pull request #25334 from crosbymichael/selinux-fedora
Add selinux policy per distro/version
2016-08-10 11:40:33 -07:00
Adam Mills
c3aa75c5a7 nuke-graph-directory.sh: Improve subvolume search
This change allows btrfs subvolumes to be found in additional system
configurations. The old logic failed to correctly identify subvolumes
when the root fs was mounted as a subvolume that was not the btrfs
filesystem root.

Signed-off-by: Adam Mills <adam@armills.info>
2016-08-08 13:00:21 -04:00
Lei Jitang
b72a41b32e Merge pull request #25442 from albers/completion--env
Fix bash completion for `docker service {create,update} {-e,--env}`
2016-08-06 10:47:18 +08:00
Vincent Demeester
54e2cbc11e Merge pull request #25447 from albers/completion-swarm-interfaces
Improve bash completion for `docker swarm {init,join} --{advertise,listen}-addr}`
2016-08-05 19:59:32 +02:00
Brian Goff
e9bfb9b4cb Merge pull request #25448 from albers/completion-swarm-join--adveritse-addr
Fix bash completion for `docker swarm join --advertise-addr`
2016-08-05 13:50:26 -04:00
Harald Albers
fa1b82e5eb Fix bash completion for docker swarm join --advertise-addr
Signed-off-by: Harald Albers <github@albersweb.de>
2016-08-05 19:14:13 +02:00
Harald Albers
07f6655286 Improve bash completion for docker swarm {init,join} --{advertise,listen}-addr}
Signed-off-by: Harald Albers <github@albersweb.de>
2016-08-05 18:56:17 +02:00
Harald Albers
b63a7692d6 Add self to bash completion of docker node inspect
Signed-off-by: Harald Albers <github@albersweb.de>
2016-08-05 18:06:25 +02:00
Harald Albers
197f23da49 Fix bash completion for docker service {create,update} {-e,--env}
Signed-off-by: Harald Albers <github@albersweb.de>
2016-08-05 17:41:40 +02:00
Michael Crosby
32b1f26c51 Add selinux policy per distro
This adds the ability to have different profiles for individual distros
and versions of the distro because they all ship with and depend on
different versions of policy packages.

The `selinux` dir contains the unmodified policy that is being used
today.  The `selinux-fedora` dir contains the new policy for fedora 24
with the changes for it to compile and work on the system.

The fedora policy is from commit
4a6ce94da5

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-08-04 14:29:22 -07:00
Steve Durrheimer
b58ef479a6
Add zsh completion for 'docker node rm --force'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-08-04 08:01:04 +02:00
Harald Albers
46d3464362 Add bash completion for docker node rm --force
Signed-off-by: Harald Albers <github@albersweb.de>
2016-08-03 11:08:28 +02:00
Vincent Demeester
016c0076ee Merge pull request #25229 from bboreham/multi-unix-sockets
Fix Upstart post-start script when using multiple Unix sockets
2016-08-01 19:43:07 +02:00
allencloud
6c5988ed8c update command description in CLI
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-07-31 00:06:18 +08:00
Bryan Boreham
68dab9bd09 Use the name of the first unix socket in DOCKER_OPTS
Otherwise the while loop waits forever, checking for
a filename made up of all the names.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2016-07-29 14:04:43 +01:00
Sebastiaan van Stijn
3b7ea4d8c3 Merge pull request #25208 from sdurrheimer/zsh-completion-service-create-update-container-labels
Add zsh completion for 'docker service {create,update} --container-label{-add,-rm}
2016-07-29 09:59:46 +02:00
Steve Durrheimer
ab95ec3dd9
Add zsh completion for 'docker service {create,update} --container-label{-add,-rm}'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-07-29 07:54:10 +02:00
Steve Durrheimer
f146f6127c
Remove zsh completion for 'docker swarm inspect'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-07-29 07:41:27 +02:00
Alexander Morozov
4084bf7ad2 Merge pull request #24555 from thaJeztah/to-infinity-and-beyond
Don't set ulimits (nproc) for all init scripts
2016-07-28 16:48:16 -07:00
Sebastiaan van Stijn
8a8a63aa32 Merge pull request #25137 from justincormack/32bit-seccomp-test
Add a test that the default seccomp profile allows execution of 32 bit binaries
2016-07-28 17:01:04 +02:00
Stephen J Day
0aa4e1e689
cli: docker service|node|stack ps instead of tasks
Rather than conflict with the unexposed task model, change the names of
the object-oriented task display to `docker <object> ps`. The command
works identically to `docker service tasks`. This change is superficial.

This provides a more sensical docker experience while not trampling on
the task model that may be introduced as a top-level command at a later
date.

The following is an example of the display using `docker service ps`
with a service named `condescending_cori`:

```
$ docker service ps condescending_cori
ID                         NAME                  SERVICE             IMAGE   LAST STATE              DESIRED STATE  NODE
e2cd9vqb62qjk38lw65uoffd2  condescending_cori.1  condescending_cori  alpine  Running 13 minutes ago  Running        6c6d232a5d0e
```

The following shows the output for the node on which the command is
running:

```console
$ docker node ps self
ID                         NAME                  SERVICE             IMAGE   LAST STATE              DESIRED STATE  NODE
b1tpbi43k1ibevg2e94bmqo0s  mad_kalam.1           mad_kalam           apline  Accepted 2 seconds ago  Accepted       6c6d232a5d0e
e2cd9vqb62qjk38lw65uoffd2  condescending_cori.1  condescending_cori  alpine  Running 12 minutes ago  Running        6c6d232a5d0e
4x609m5o0qyn0kgpzvf0ad8x5  furious_davinci.1     furious_davinci     redis   Running 32 minutes ago  Running        6c6d232a5d0e
```

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2016-07-27 11:06:42 -07:00
Justin Cormack
93bbc76ee5 Add a test that the default seccomp profile allows execution of 32 bit binaries
While testing #24510 I noticed that 32 bit syscalls were incorrectly being
blocked and we did not have a test for this, so adding one.

This is only tested on amd64 as it is the only architecture that
reliably supports 32 bit code execution, others only do sometimes.

There is no 32 bit libc in the buildpack-deps so we cannot build
32 bit C code easily so use the simplest assembly program which
just calls the exit syscall.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-27 18:42:34 +01:00
Michael Crosby
3cddda3bbb Remove the Require on the socket for the rpm
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-07-26 14:56:27 -07:00
Sebastiaan van Stijn
00295c4bb3 Merge pull request #25060 from albers/completion-swarm-inspect
Remove bash completion for `docker swarm inspect`
2016-07-26 13:56:11 +02:00
Harald Albers
34d9a82409 Remove bash completion for docker swarm inspect
Signed-off-by: Harald Albers <github@albersweb.de>
2016-07-26 04:51:27 -07:00
Harald Albers
13c138ec2a bash completion for container labels to service {create,update}
Signed-off-by: Harald Albers <github@albersweb.de>
2016-07-26 04:45:57 -07:00
Tibor Vass
c65925f24b Merge pull request #24943 from aaronlehmann/rolling-updates
Add failure action for rolling updates
2016-07-25 10:15:28 -07:00
Aaron Lehmann
57ae29aa74 Add failure action for rolling updates
This changes the default behavior so that rolling updates will not
proceed once an updated task fails to start, or stops running during the
update. Users can use docker service inspect --pretty servicename to see
the update status, and if it pauses due to a failure, it will explain
that the update is paused, and show the task ID that caused it to pause.
It also shows the time since the update started.

A new --update-on-failure=(pause|continue) flag selects the
behavior. Pause means the update stops once a task fails, continue means
the old behavior of continuing the update anyway.

In the future this will be extended with additional behaviors like
automatic rollback, and flags controlling parameters like how many tasks
need to fail for the update to stop proceeding. This is a minimal
solution for 1.12.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-07-25 08:51:19 -07:00
Vincent Demeester
40044cb18f Merge pull request #24963 from allencloud/fix-typos
fix typos
2016-07-25 09:39:48 +02:00
Steve Durrheimer
a04bba8b89
Add zsh completion for 'docker swarm join-token' command
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-07-25 08:39:33 +02:00
Aaron Lehmann
a0ccd0d42f Split advertised address from listen address
There are currently problems with "swarm init" and "swarm join" when an
explicit --listen-addr flag is not provided. swarmkit defaults to
finding the IP address associated with the default route, and in cloud
setups this is often the wrong choice.

Introduce a notion of "advertised address", with the client flag
--advertise-addr, and the daemon flag --swarm-default-advertise-addr to
provide a default. The default listening address is now 0.0.0.0, but a
valid advertised address must be detected or specified.

If no explicit advertised address is specified, error out if there is
more than one usable candidate IP address on the system. This requires a
user to explicitly choose instead of letting swarmkit make the wrong
choice. For the purposes of this autodetection, we ignore certain
interfaces that are unlikely to be relevant (currently docker*).

The user is also required to choose a listen address on swarm init if
they specify an explicit advertise address that is a hostname or an IP
address that's not local to the system. This is a requirement for
overlay networking.

Also support specifying interface names to --listen-addr,
--advertise-addr, and the daemon flag --swarm-default-advertise-addr.
This will fail if the interface has multiple IP addresses (unless it has
a single IPv4 address and a single IPv6 address - then we resolve the
tie in favor of IPv4).

This change also exposes the node's externally-reachable address in
docker info, as requested by #24017.

Make corresponding API and CLI docs changes.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-07-24 09:23:07 -07:00
allencloud
4e959ef2f7 fix typos
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-07-23 11:32:23 +08:00
Tibor Vass
771cf83807 Merge pull request #24934 from albers/completion-swarm-join-token
bash completion for `docker swarm join-token`
2016-07-22 11:24:25 -07:00
Vincent Demeester
97039324c0 Merge pull request #24885 from vdemeester/24875-registrauth-with
Rename `--registry-auth` to `--with-registry-auth`
2016-07-22 19:05:49 +02:00
Harald Albers
42b4d6ebe4 bash completion for docker swarm join-token
Signed-off-by: Harald Albers <github@albersweb.de>
2016-07-22 17:39:55 +02:00
Sebastiaan van Stijn
c4ab20c5f8
remove "secrets" from completion scripts
Swarm join has been changed in f5e1f6f688,
removing various options and the "node accept" command.

This removes the removed options from the completion
scripts.

NOTE: a new command ("docker swarm join-token") was
also added, but is not part of this commit.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-22 14:26:21 +02:00
Vincent Demeester
8426f72107
Append --registry-auth with with
`--with-registry-auth` is more explicit.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-07-22 10:38:56 +02:00
Aaron Lehmann
2cc5bd33ee Replace secrets with join tokens
Implement the proposal from
https://github.com/docker/docker/issues/24430#issuecomment-233100121

Removes acceptance policy and secret in favor of an automatically
generated join token that combines the secret, CA hash, and
manager/worker role into a single opaque string.

Adds a docker swarm join-token subcommand to inspect and rotate the
tokens.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-07-21 15:23:03 -07:00
Harald Albers
6c98d5bfac Add manual support for macvlan networks to bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
2016-07-20 13:13:14 -07:00
Harald Albers
492fdf1f57 Update completions for syslog log driver options
Signed-off-by: Harald Albers <github@albersweb.de>
2016-07-20 12:35:04 -07:00
Vincent Demeester
5527763f8c Merge pull request #24828 from sdurrheimer/zsh-completion-node-update-label-add-rm
Add zsh completion for 'docker node update --label-{add,rm}'
2016-07-20 11:47:03 +02:00
Steve Durrheimer
45484f5458
Add zsh completion for 'docker service {create,update} --log-{driver,opt}'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-07-20 09:18:59 +02:00
Steve Durrheimer
cdb8383d7f
Add zsh completion for 'docker node update --label-{add,rm}'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-07-20 09:11:16 +02:00
Tibor Vass
39327a67e8 Merge pull request #24804 from crosbymichael/rpm-socket
Remove docker.socket from rpm based systems
2016-07-19 11:18:22 -07:00
Michael Crosby
04104c3a1e Remove docker.socket from rpm based systems
Fixes #23981

The selinux issue we are seeing in the report is related to the socket
file for docker and nothing else. By removing the socket docker starts
up correctly.

However, there is another motivation for removing socket activation from
docker's systemd files and that is because when you have daemons running
with --restart always whenever you have a host reboot those daemons
will not be started again because the docker daemon is not started by
systemd until a request comes into the docker API.

Leave it for deb based systems because everything is working correctly
for both socket activation and starting normally at boot.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-07-19 09:31:43 -07:00
Sebastiaan van Stijn
be2e2fca08 Merge pull request #24791 from albers/completion-node-update-labels
bash completion for `docker node update --label-{add,rm}`
2016-07-19 15:22:29 +02:00
Harald Albers
823e161de7 bash completion for docker service {create,update} --log-{driver,opt}
Signed-off-by: Harald Albers <github@albersweb.de>
2016-07-19 13:20:40 +02:00
Harald Albers
bc6e3c0b5e bash completion for docker node update --label-{add,rm}
Signed-off-by: Harald Albers <github@albersweb.de>
2016-07-19 13:09:28 +02:00
Sebastiaan van Stijn
589bafddf3
bump Go to 1.6.3
following the announcement;
https://groups.google.com/forum/m/#!topic/golang-announce/7JTsd70ZAT0

> [security] Go 1.6.3 and Go 1.7rc2 pre-announcement
>
> Hello gophers,
> We plan to issue Go 1.6.3 and Go 1.7rc2 on Monday July 18 at approximately 2am UTC.
> These are minor release to fix a security issue.
>
> Following our policy at https://golang.org/security, this is the pre-announcement of those releases.
>
> Because we are so late in the release cycle for Go 1.7, we will not issue a minor release of Go 1.5.
> Additionally, we plan to issue Go 1.7rc3 later next week, which will include any changes between 1.7rc1 and tip.
>
> Cheers,
> Chris on behalf of the Go team

**Note:**
the man/Dockerfile is not yet updated, because
the official image for Go 1.6.2 has not yet
been updated.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-18 23:15:03 +02:00
Arnaud Porterie
de64324109 Merge pull request #24705 from thaJeztah/update-flag-descriptions
Improve flag help consistency, and update docs
2016-07-18 16:07:23 +00:00
Sebastiaan van Stijn
ff1040bafc Merge pull request #24599 from vdemeester/small-zsh-completion-fix
Small zsh completion fix on --pretty & --no-resolve
2016-07-16 02:55:32 +02:00
Sebastiaan van Stijn
64a8317a5a Improve flag help consistency, and update docs
This adds the `--live-restore` option to the documentation.

Also synched usage description in the documentation
with the actual description, and re-phrased some
flag descriptions to be a bit more consistent.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-16 01:58:01 +02:00
Sebastiaan van Stijn
983fc99509 Merge pull request #24668 from sdurrheimer/zsh-completion-service-endpoint-mode
Update zsh completion for 'docker service {create,update} {--endpoint…
2016-07-15 14:40:45 +02:00
Steve Durrheimer
2e6922a6d3
Update zsh completion for 'docker service {create,update} {--endpoint-mode,--mode}'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-07-15 14:36:18 +02:00
Sebastiaan van Stijn
a968f83c55 Merge pull request #24666 from sdurrheimer/zsh-completion-dockerd-oom-score-adjust
Add zsh completion for 'dockerd --oom-score-adjust'
2016-07-15 13:47:39 +02:00
Vincent Demeester
2a888c02a6 Merge pull request #24667 from sdurrheimer/zsh-completion-docker-service-create-update-registry-auth
Add zsh completion for 'docker service {create,update} --registry-auth'
2016-07-15 11:15:55 +02:00
Vincent Demeester
d69fcf10cb Merge pull request #24665 from sdurrheimer/zsh-completion-run-network
Rename zsh completion for 'docker {create,run} --net --net-alias' to …
2016-07-15 11:15:35 +02:00
Steve Durrheimer
64f08906a2
Add zsh completion for 'docker service {create,update} --registry-auth'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-07-15 08:23:57 +02:00
Steve Durrheimer
5d29732bdf
Add zsh completion for 'dockerd --oom-score-adjust'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-07-15 08:16:15 +02:00
Steve Durrheimer
ba5d9f63a3
Rename zsh completion for 'docker {create,run} --net --net-alias' to '--network --network-alias'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-07-15 08:09:20 +02:00
Paul Furtado
acb41ddc9d Change $prog back to docker in sysvinit-redhat
(and set $exec to dockerd instead)

This ensures end users do not need to make any configuration changes
due to the rename from docker to dockerd in version 1.12.

Signed-off-by: Paul Furtado <pfurtado@hubspot.com>
2016-07-14 17:21:59 -04:00
Sebastiaan van Stijn
7925de9098 Merge pull request #24598 from albers/completion-daemon--oom-score-adjust
bash completion for `docker daemon --oom-score-adjust`
2016-07-13 23:34:54 +02:00
Vincent Demeester
698bd5ab65
Small zsh completion fix on --pretty & --no-resolve
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-07-13 22:03:11 +02:00
Harald Albers
e1e310ea1f bash completion for docker daemon --oom-score-adjust
Signed-off-by: Harald Albers <github@albersweb.de>
2016-07-13 12:31:55 -07:00
Sebastiaan van Stijn
7bf0faf423
Remove shorthand flags for "mount", "pretty", and "no-resolve"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-13 18:47:29 +02:00
Arnaud Porterie
58624acf11 Merge pull request #24525 from vdemeester/24196-remove-command-flag-on-service-update
Remove --command flag for service update
2016-07-13 16:01:11 +00:00
Sebastiaan van Stijn
428d7337e8
Don't set ulimits (nproc)
There is a not-insignificant performance overhead for all containers (if
containerd is a child of Docker, which is the current setup) if rlimits are
set on the main Docker daemon process (because the limits
propogate to all children).

We recommend using cgroups to do container-local accounting.

This applies the change added in 8db61095a3
to other init scripts.

Note that nfile cannot be set to unlimited, and the limit
is hardcoded to 1048576 (2^20) , see:
http://stackoverflow.com/a/1213069/1811501

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-13 17:15:19 +02:00
Vincent Demeester
e4a024d590
Remove --command flag for service update
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-07-13 16:19:21 +02:00
Sebastiaan van Stijn
a9a8d807f0 Merge pull request #24583 from albers/completion-run--network
Change bash completion for `docker run --net*` to `--network*`
2016-07-13 12:46:58 +02:00
Harald Albers
c4846f6972 Change bash completion for docker run --net* to --network*
Ref: https://github.com/docker/docker/pull/23324

Signed-off-by: Harald Albers <github@albersweb.de>
2016-07-13 12:42:33 +02:00
Sebastiaan van Stijn
5d11a7987b Merge pull request #24301 from coolljt0725/add_dummy_to_check_config
Add IPVLAN and DUMMY to check-config.sh
2016-07-13 12:38:27 +02:00
Antonio Murdaca
ae1a809c39 Merge pull request #24581 from albers/completion-service--endpoint-mode
Update bash completion for `docker service {create,update} {--mode,--…
2016-07-13 09:52:52 +00:00
Harald Albers
a394490d38 Update bash completion for docker service {create,update} {--mode,--endpoint-mode}
Signed-off-by: Harald Albers <github@albersweb.de>
2016-07-13 11:37:31 +02:00
Harald Albers
a44e71c427 bash completion for docker service {create,update} --registry-auth
Signed-off-by: Harald Albers <github@albersweb.de>
2016-07-13 11:20:02 +02:00
Sebastiaan van Stijn
fa077f7496
use tabs for indentation
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-12 23:16:55 +02:00
Dillon Dixon
9b5622a6df Changed to 1800 second timeout for all ARMV*
Signed-off-by: Dillon Dixon <dillondixon@gmail.com>
2016-07-10 18:47:14 -07:00
Dillon Dixon
84d285d28f Fixed arm arch image maker to support arm versions other than 7
Signed-off-by: Dillon Dixon <dillondixon@gmail.com>
2016-07-10 18:46:35 -07:00
Brian Goff
2664f37452 Merge pull request #24119 from albers/completion-swarm-mode
Fix & improve bash completion for swarm mode commands
2016-07-08 15:34:51 -04:00
Lei Jitang
f5940ef725 Add IPVLAN and DUMMY to check-config.sh
This commit add DUMMY and IPVLAN to check-config.sh
because they are need for ipvlan and macvlan network
driver.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-07-07 21:21:57 -04:00
Vincent Demeester
a859a33647
Use "on-failure" for both containers and services
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-07-07 11:32:19 +02:00
Jonathan Lomas
7631dc80a6
Remove unmatched bracket from _docker for zsh
Signed-off-by: Jonathan Lomas <jonathan@floatinglomas.ca>
2016-07-06 08:57:28 -07:00
Brian Goff
34a9e9d051 Merge pull request #24307 from cyphar/remove-systemd-rlimits
contrib: systemd: set Limit* to infinity
2016-07-05 16:02:47 -04:00
Steve Durrheimer
f5d768e2c5
Add zsh completion for 'docker service' commands
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-07-04 15:14:58 +02:00
Aleksa Sarai
8db61095a3
contrib: systemd: set Limit* to infinity
There is a not-insignificant performance overhead for all containers (if
containerd is a child of Docker, which is the current setup) if systemd
sets rlimits on the main Docker daemon process (because the limits
propogate to all children).

Signed-off-by: Aleksa Sarai <asarai@suse.de>
2016-07-04 23:00:28 +10:00
Antonio Murdaca
d97233ca88 Merge pull request #24276 from sdurrheimer/zsh-completion-daemon-add-runtime
Add zsh completion for 'docker daemon --runtimes' and 'docker run --r…
2016-07-04 14:40:56 +02:00
Steve Durrheimer
7ae3caa4e9
Add zsh completion for 'docker plugin' commands
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-07-03 23:45:23 +02:00
Steve Durrheimer
2086663abd
Add zsh completion for 'docker swarm' commands
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-07-03 23:28:38 +02:00
Sebastiaan van Stijn
df3e3a227b Merge pull request #24272 from sdurrheimer/zsh-completion-node
Add zsh completion for 'docker node' commands
2016-07-03 13:58:14 -07:00
Steve Durrheimer
1dc9cf4901
Add zsh completion for 'docker ps --last'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-07-03 20:38:54 +02:00
Harald Albers
009d50e2d8 bash completion for default port on docker swarm {init,join}
Signed-off-by: Harald Albers <github@albersweb.de>
2016-07-03 10:48:37 -07:00
Harald Albers
715754ee61 bash completion can be configured to show node and service IDs
Signed-off-by: Harald Albers <github@albersweb.de>
2016-07-03 10:48:37 -07:00
Harald Albers
2b34fa0511 bash completion for docker {service,node} filters
Signed-off-by: Harald Albers <github@albersweb.de>
2016-07-03 10:48:37 -07:00
Harald Albers
dd883b0ce2 Add bash completion for docker ps --last
Signed-off-by: Harald Albers <github@albersweb.de>
2016-07-03 10:36:34 -07:00
Steve Durrheimer
a5c7eb607e
Add zsh completion for 'docker daemon --runtimes' and 'docker run --runtime'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-07-03 10:03:53 +02:00
Steve Durrheimer
024698718f
Add zsh completion for 'docker node' commands
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-07-03 01:10:30 +02:00
allencloud
184afb92bf make cmd short short consistency and change docs
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-06-30 21:17:51 +08:00
Brian Goff
9e14002ced Add ip_vs to check-config script
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-06-28 13:42:38 -04:00
Brian Goff
cccfe63e86 Merge pull request #23868 from albers/completion-swarm-enhancements
bash completion enhancements for `docker {swarm,node,service}`
2016-06-27 10:55:54 -04:00
Vincent Demeester
18398b2933 Merge pull request #23859 from aboch/vnd
Update check-config.sh, netlink and libnetwork vendoring
2016-06-23 20:34:02 +02:00
Antonio Murdaca
0b83f27328 contrib: builder: rpm: add Fedora 24
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-06-23 12:31:11 +02:00
Vincent Demeester
e3a698fcd0 Merge pull request #23888 from sdurrheimer/zsh-completion-event-load-save
Add zsh completion for 'load' and 'save' image events
2016-06-23 10:13:01 +02:00
Vincent Demeester
28f4a8ca55 Merge pull request #23890 from sdurrheimer/zsh-completion-link-local-ip
Add zsh completion for 'docker {create,run,network connect} --link-lo…
2016-06-23 10:12:05 +02:00
Vincent Demeester
6211570de1 Merge pull request #23891 from sdurrheimer/zsh-completion-run-storage-opt
Add zsh completion for 'docker run --storage-opt size='
2016-06-23 10:11:02 +02:00
Vincent Demeester
29717dd347 Merge pull request #23892 from sdurrheimer/zsh-completion-cpu-shares-c
Re-Add zsh completion for '-c' alias to '--cpu-shares'
2016-06-23 10:09:59 +02:00
Steve Durrheimer
4c23ac0ae5
Re-Add zsh completion for '-c' alias to '--cpu-shares'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-06-23 08:57:39 +02:00
Steve Durrheimer
857e7d6ae4
Add zsh completion for 'docker run --storage-opt size='
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-06-23 08:52:42 +02:00
Steve Durrheimer
704d9b6864
Add zsh completion for 'docker {create,run,network connect} --link-local-ip'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-06-23 08:44:08 +02:00
Steve Durrheimer
8e582a2573
Add zsh completion for 'docker daemon --storage-driver (overlay2|vfs)'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-06-23 08:35:36 +02:00
Steve Durrheimer
e2f1f699b3
Add zsh completion for 'load' and 'save' image events
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-06-23 08:29:24 +02:00
Harald Albers
e3339a75d3 bash completion enhancements for docker {swarm,node,service}
Signed-off-by: Harald Albers <github@albersweb.de>
2016-06-22 20:23:46 +02:00
Alessandro Boch
c355e059cc Add modules for secure overlay network to check-config.sh
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-06-22 10:51:13 -07:00
Sven Dowideit
a6f7167c0a Merge pull request #23805 from albers/completion--cpu-shares--c
bash completion for `-c` alias to `--cpu-shares`
2016-06-21 21:19:06 +10:00
Sven Dowideit
5ba6b1e89c Merge pull request #23804 from albers/completion-btrfs-min_space
bash completion for `docker daemon --storage-opt btrfs.min_space`
2016-06-21 21:18:49 +10:00
Sven Dowideit
a1eb6528eb Merge pull request #23803 from albers/completion-run--storage-opt
bash completion for `docker {run,create} --storage-opt`
2016-06-21 21:18:32 +10:00
Sven Dowideit
38b07e7fa6 Merge pull request #23800 from albers/completion-events-load-save
bash completion for `load` and `save` image events
2016-06-21 21:18:16 +10:00
Sven Dowideit
d5939876be Merge pull request #23799 from albers/completion-storage-driver-overlay2
bash completion for `docker daemon --storage-driver olverlay2`
2016-06-21 21:18:01 +10:00
Sven Dowideit
a7a0269624 Merge pull request #23798 from albers/completion--link-local-ip
bash completion for `docker {run,create,network connect} --link-local…
2016-06-21 21:17:37 +10:00
Harald Albers
79296b2770 bash completion for -c alias to --cpu-shares
Signed-off-by: Harald Albers <github@albersweb.de>
2016-06-21 11:30:26 +02:00
Harald Albers
f693b99870 bash completion for docker daemon --storage-opt btrfs.min_space
Signed-off-by: Harald Albers <github@albersweb.de>
2016-06-21 11:11:11 +02:00
Harald Albers
7d2ffa00c0 bash completion for docker {run,create} --storage-opt
Signed-off-by: Harald Albers <github@albersweb.de>
2016-06-21 11:04:09 +02:00
Harald Albers
5334520bf0 bash completion for load and save image events
Signed-off-by: Harald Albers <github@albersweb.de>
2016-06-21 10:26:21 +02:00
Harald Albers
d96eeff194 bash completion for docker daemon --storage-driver olverlay2
Signed-off-by: Harald Albers <github@albersweb.de>
2016-06-21 10:19:07 +02:00
Harald Albers
98483f57ed bash completion for docker {run,create,network connect} --link-local-ip
Signed-off-by: Harald Albers <github@albersweb.de>
2016-06-21 09:43:34 +02:00
Steve Durrheimer
8036fc794a
Add zsh completion for 'docker daemon --live-restore'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-06-21 08:31:28 +02:00
Harald Albers
e65f036e13 fix bash completion for docker {swarm,node} subcommands
Signed-off-by: Harald Albers <github@albersweb.de>
2016-06-18 10:28:20 -07:00
Harald Albers
19753ec84d correct sort order in new bash completions
The completion for the new `docker service`, `docker swarm` and
`docker node` command families were partly added in non-alphabetical
order.

Signed-off-by: Harald Albers <github@albersweb.de>
2016-06-18 09:54:44 -07:00
Mike Goelzer
5cf73a47f5 Add bash completion for docker service scale
Signed-off-by: Mike Goelzer <mike.goelzer@docker.com>

Conflicts:
	contrib/completion/bash/docker
2016-06-18 09:27:06 -07:00
Sebastiaan van Stijn
2989e7b2a0 Merge pull request #23665 from albers/fix-completion-service
fix bash completion for `docker service` subcommands
2016-06-17 17:54:49 -07:00
Antonio Murdaca
e72b7ee425 Merge pull request #23664 from leonhartX/i23017
fix #23017, add zsh completion for dockerd
2016-06-17 19:44:43 +02:00
Harald Albers
42f3b1f4ad fix bash completion for docker service subcommands
Signed-off-by: Harald Albers <github@albersweb.de>
2016-06-17 09:49:46 +02:00
Ke Xu
bd1fc1e5c2 fix #23017, add zsh completion for dockerd
Signed-off-by: Ke Xu <leonhartx.k@gmail.com>
2016-06-17 16:16:13 +09:00
Harald Albers
dc2fc75d42 bash completion for docker swarm update --cert-expiry
Signed-off-by: Harald Albers <github@albersweb.de>
2016-06-17 08:49:06 +02:00
Michael Crosby
db435f526a Set systemd KillMode
Change the kill mode to process so that systemd does not kill container
processes when the daemon is shutdown but only the docker daemon

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-06-16 11:46:04 -07:00
Arnaud Porterie (icecrime)
e6e1fd5d06
Make --dispatcher-heartbeat-period a duration
Make `--dispatcher-heartbeat-period` a duration in `docker swarm
update`, allowing to express the value as "5s", "1h", etc.

Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
2016-06-14 18:10:49 -07:00
Mike Goelzer
35e2970b98 Update bash completion for Docker 1.12 CLI commands
Signed-off-by: Mike Goelzer <mike.goelzer@docker.com>
2016-06-14 12:57:40 -07:00
Kenfe-Mickael Laventure
6e9bf4d316 Add bash completion support for --runtime and --add-runtime
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-06-14 07:47:31 -07:00
Kenfe-Mickael Laventure
1a6ed50e1f Add missing completion for --config-file
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-06-14 07:47:31 -07:00
Lei Jitang
74873f192a Merge pull request #23506 from albers/completion-daemon---live-restore
bash completion for `docker daemon --live-restore`
2016-06-14 17:24:00 +08:00
Harald Albers
73882e8f83 bash completion for docker daemon --live-restore
Signed-off-by: Harald Albers <github@albersweb.de>
2016-06-14 09:14:25 +02:00
Dmitry Smirnov
546594eaaa Fix syntax errors in bash-completion (Closes: #23483)
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2016-06-13 19:12:31 +10:00
Brian Goff
aaef5297bf Merge pull request #22152 from flixr/armhf-ubuntu-trusty-deb
build armhf deb for ubuntu-trusty
2016-06-12 16:27:54 -04:00
Steve Durrheimer
734260886c
Add zsh completion for 'docker run' healthcheck options
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-06-12 13:00:05 +02:00
Vincent Demeester
a29376dfd0 Merge pull request #23456 from sdurrheimer/zsh-completion-ps-filter-network
Add zsh completion for 'docker ps --filter=network'
2016-06-11 18:52:48 +02:00
Sebastiaan van Stijn
b133737cb7 Merge pull request #23455 from sdurrheimer/zsh-completion-events-filter-values
Add zsh completion for 'docker events --filter' values
2016-06-11 18:29:17 +02:00
Steve Durrheimer
b5498a8b0b
Add zsh completion for 'docker events --filter' values
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-06-11 17:02:26 +02:00
Steve Durrheimer
60c435e7d0
Add zsh completion for 'docker ps --filter=network'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-06-11 16:53:26 +02:00
Steve Durrheimer
654aaa055e
Add zsh completion for 'docker {create,run} --pid' values
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-06-11 15:30:27 +02:00
Felix Ruess
a229e1f4b7 build armhf deb for ubuntu-trusty
Signed-off-by: Felix Ruess <felix.ruess@roboception.de>
2016-06-09 14:06:19 +02:00
Harald Albers
337eaab5d1 bash completion for docker ps --filter network
Signed-off-by: Harald Albers <github@albersweb.de>
2016-06-07 12:44:17 -07:00
Vincent Demeester
4b2b5214a4 Merge pull request #23299 from albers/completion-dockerd-path
fix bash completion for dockerd invoked with path
2016-06-06 13:40:15 +02:00
Sebastiaan van Stijn
ab0c683f5d Merge pull request #23295 from sdurrheimer/zsh-completion-search-limit
Add zsh completion for 'docker search --limit'
2016-06-06 11:46:57 +02:00
Harald Albers
e8c67e8d8d fix bash completion for dockerd with path
Signed-off-by: Harald Albers <github@albersweb.de>
2016-06-06 10:01:15 +02:00
Vincent Demeester
3ac1787b7e Merge pull request #23098 from capkurmagati/23097-fix-zsh-completion-docker-rm-f
fixes #23097 zsh completion on `docker rm -f`
2016-06-06 09:20:16 +02:00
Steve Durrheimer
41f2183f8a
Add zsh completion for 'docker search --limit'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-06-06 09:05:22 +02:00
Brian Goff
282067e83a Merge pull request #23272 from thaJeztah/update-syntax
Update Dockerfile highlight/syntax definitions
2016-06-05 15:38:16 -04:00
Sebastiaan van Stijn
4cb71f8082
Update Dockerfile highlight definitions
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-06-05 17:45:21 +02:00
Harald Albers
9c9cbd2c0f bash completion for detach events
Signed-off-by: Harald Albers <github@albersweb.de>
2016-06-05 08:41:58 -07:00
Vincent Demeester
5429f4ef61 Merge pull request #23239 from albers/completion-run-healthcheck
bash completion for `docker run` healthcheck options
2016-06-03 18:17:15 +02:00
Harald Albers
f738e6a732 bash completion for docker run healthcheck options
Signed-off-by: Harald Albers <github@albersweb.de>
2016-06-03 17:04:04 +02:00
Harald Albers
4b5ccd7342 bash completion for docker search --limit
Signed-off-by: Harald Albers <github@albersweb.de>
2016-06-03 16:32:37 +02:00
Sebastiaan van Stijn
791f98290e Merge pull request #22806 from errordeveloper/master
Remove MountFlags in systemd unit to allow shared mount propagation
2016-06-02 20:04:08 +02:00
Brian Goff
273ab8591e Merge pull request #22867 from justincormack/checklimits
Begin a section in the check-config script to check limits
2016-06-01 20:42:54 -04:00
Vincent Demeester
09be7d9ee4 Merge pull request #23085 from icecrime/gitdm.config
Add gitdm configuration
2016-06-01 18:12:59 +02:00
Elan Ruusamäe
e2f1793b99 add script to make base image for PLD Linux
https://www.pld-linux.org/packages/docker

Signed-off-by: Elan Ruusamäe <glen@pld-linux.org>
2016-05-31 09:20:51 +03:00
Tianyi Wang
2d4bced30c Fix zsh completion
- List all containers on `docker rm -f`

Signed-off-by: Tianyi Wang <capkurmagati@gmail.com>
2016-05-30 18:58:36 +09:00
Harald Albers
5f1c5b28a7 bash completion for dockerd
Signed-off-by: Harald Albers <github@albersweb.de>
2016-05-29 07:09:05 -07:00
Arnaud Porterie
bf6d52bba1 Add gitdm configuration
Update .mailmap and add gitdm configuration.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2016-05-28 21:08:20 -07:00
Stefan Scherer
d59458c12d Update golang 1.6.2
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
2016-05-27 23:00:05 +02:00
Stefan Scherer
46c61497a0 Build deb for raspbian-jessie
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
2016-05-27 22:54:50 +02:00
Alexander Morozov
9b0d385975 Merge pull request #22840 from runcom/go1.6
Upgrade to golang 1.6.2
2016-05-27 06:54:57 -07:00
Vincent Demeester
750e16f57c
Add before and since filter to images
Add support for two now filter on the `images` command : `before` and
`since`. They work the same as the one on the `ps` command but for
images.

        $ docker images --filter before=myimage
        # display all images older than myimage
        $ docker images --filter since=myimage
        # display all images younger than myimage

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-05-25 13:49:10 +02:00
Stefan Scherer
f32ccb080a Update golang 1.6.2 for ARM
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-05-25 11:58:48 +02:00
Antonio Murdaca
40b21745cc Upgrade to golang 1.6.2
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-05-25 11:58:48 +02:00
Harald Albers
c49d327406 bash completion for docker ps -f {before,since}
Signed-off-by: Harald Albers <github@albersweb.de>
2016-05-25 09:35:33 +02:00
Harald Albers
cc6a1b8bb3 bash completion for daemon events
Signed-off-by: Harald Albers <github@albersweb.de>
2016-05-24 17:19:03 +02:00
Ilya Dmitrichenko
2aee081cad Remove MountFlags in systemd unit to allow shared mount propagation
Signed-off-by: Ilya Dmitrichenko <errordeveloper@gmail.com>
2016-05-24 12:51:31 +01:00
Steve Durrheimer
11da243273
Add zsh completion for 'docker images' filters
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-05-22 13:01:08 +02:00
Justin Cormack
4e2d98761d Begin a section in the check-config script to check limits
Initially this checks the kernel's maxkeys setting which is
low in some older distribution kernels, such that only 200 containers
can be created, reported in #22865.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-05-20 16:05:25 -07:00
Fabrizio Soppelsa
e009ebdf4c
Add a --filter option to docker search
The filtering is made server-side, and the following filters are
supported:

* is-official (boolean)
* is-automated (boolean)
* has-stars (integer)

Signed-off-by: Fabrizio Soppelsa <fsoppelsa@mirantis.com>
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-05-20 13:41:28 +02:00
Mrunal Patel
fb43ef649b Add support for --pid=container:<id>
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-05-17 13:49:05 -04:00
Sebastiaan van Stijn
09cb57b773
Fix typo in zsh completion
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-05-17 13:38:46 +02:00
Qiang Huang
27d7b135d4 Update check_config for MEMCG_KMEM
CONFIG_MEMCG_KMEM is removed since 4.6, it's accounted by default
since 4.6, so it's merged to CONFIG_MEMCG.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-05-16 13:55:24 +08:00
Sebastiaan van Stijn
fbf3741f0d Merge pull request #22740 from sdurrheimer/zsh-completion-network-ls-filter-label
Add zsh completion for 'docker network ls --filter label'
2016-05-14 22:27:00 +02:00
Sebastiaan van Stijn
c80f926997 Merge pull request #22739 from sdurrheimer/zsh-completion-daemon-concurrent
Add zsh completion for 'docker daemon --max-concurrent-downloads --ma…
2016-05-14 22:25:59 +02:00
Steve Durrheimer
afca8a454a
Add zsh completion for 'docker network ls --filter label'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-05-14 19:38:39 +02:00
Steve Durrheimer
bf9a1d5027
Add zsh completion for 'docker daemon --max-concurrent-downloads --max-concurrent-uploads'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-05-14 19:20:20 +02:00
Steve Durrheimer
dcca0f6dd1
Add zsh completion for 'docker logs --details'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-05-14 19:13:01 +02:00
Sebastiaan van Stijn
a213a446d7 Merge pull request #22714 from albers/completion-logs--details
bash completion for `docker logs --details`
2016-05-13 14:37:45 +02:00
Harald Albers
d166c8fbb2 bash completion for docker logs --details
Signed-off-by: Harald Albers <github@albersweb.de>
2016-05-13 08:42:43 +02:00
Harald Albers
cc6bcaaddc bash completion for docker daemon --max-concurrent-{down,up}load
Signed-off-by: Harald Albers <github@albersweb.de>
2016-05-13 08:25:53 +02:00
Arnaud Porterie
f7c79cdeae Merge pull request #22455 from Anvil/bash-completion-failglob
docker bash completions fails when failglob is enabled
2016-05-11 13:08:48 -10:00
Arnaud Porterie
78e9f2e9e7 Merge pull request #22368 from tianon/wheezy-lts
Update contrib/mkimage/debootstrap to include wheezy-lts
2016-05-11 12:49:26 -10:00
Arnaud Porterie
bacce5ef4f Merge pull request #22365 from dnephin/fix_selinux_for_dockerd
Update the binary name in docker-engine-selinux/docker.fc
2016-05-11 12:44:55 -10:00
Alexander Morozov
fd3a795a47 Merge pull request #22278 from runcom/fixies-dockerd
Fixies dockerd
2016-05-11 07:57:00 -07:00
Antonio Murdaca
1ac1b78b3a contrib: init: use dockerd
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-05-11 11:00:11 +02:00
Kenfe-Mickael Laventure
6a033e617f Allow changing wheezy deb builder backport mirror
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-05-09 09:10:30 -07:00
Kenfe-Mickael Laventure
05dec0b032 Fix rpm generation on oraclelinux-6
The uek kernel needs to be install first in order to get the correct
btrfs tools version.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-05-05 12:12:49 -07:00
Tianon Gravi
084c72e760 Update contrib/mkimage/debootstrap to account for Debian LTS changes
See https://www.debian.org/News/2016/20160425 and https://wiki.debian.org/LTS/Using for more details.

> For Debian 7 "Wheezy" LTS there will be no requirement to add a separate wheezy-lts suite to your sources.list any more. In fact you will not notice the switch to LTS because after the official security support by the Debian Security Team ends, security updates will be provided via security.debian.org 's wheezy/updates.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2016-05-04 08:39:45 -07:00
Sebastiaan van Stijn
9c52a04f38 Merge pull request #22446 from thaJeztah/add-daemon-reload
Add support for reloading daemon configuration through systemd
2016-05-04 12:38:40 +02:00
Vincent Demeester
2a6980c5cb Merge pull request #22452 from cpuguy83/fix_zsh_completion_psformat
Make zsh completion work when ps output is custom
2016-05-02 17:39:46 +02:00
Damien Nadé
79490a6ad3 contrib/completion/bash/docker: _docker_docker: quoting __docker_to_extglob result to avoid failglob interference
Signed-off-by: Damien Nadé <github@livna.org>
2016-05-02 16:53:43 +02:00
Brian Goff
ba3f8a9fef
Make zsh completion work when ps output is custom
When `psFormat` is used in the docker client config json, if the output
is non-standard it breaks some of the completion handling for
containers.

This fixes that by ensuring that calls to `ps` use the default/standard
formatting by calling `docker ps --format 'table'`

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-05-02 09:45:01 -04:00
Sebastiaan van Stijn
f74b856e1a
Add support for reloading daemon configuration through systemd
This adds support for reloading the docker daemon
(SIGHIUP) so that changes in '/etc/docker/daemon.json'
can be loaded at runtime by reloading the service
through systemd ('systemctl reload docker')

Before this change, systemd would output an error
that "reloading" is not supported for the docker
service;

  systemctl reload docker
  Failed to reload docker.service: Job type reload is not applicable for unit docker.service.

After this change, the docker daemon can be reloaded
through 'systemctl reload docker', which reloads
the configuration;

  journalctl -f -u docker.service

  May 02 03:49:20 testing systemd[1]: Reloading Docker Application Container Engine.
  May 02 03:49:20 testing docker[28496]: time="2016-05-02T03:49:20.143964103-04:00" level=info msg="Got signal to reload configuration, reloading from: /etc/docker/daemon.json"
  May 02 03:49:20 testing systemd[1]: Reloaded Docker Application Container Engine.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-05-02 10:27:07 +02:00