Vincent Demeester
5c9eaf9226
Merge pull request #26478 from sdurrheimer/zsh-completion-service-group-add-rm
...
Add zsh completion for 'service {create,update} --group-{add,rm}'
Upstream-commit: 0deae9f2fa3672bf7e5ce5899253e498800726b7
Component: engine
2016-09-13 10:18:27 +02:00
Steve Durrheimer
689d1a45e3
Add zsh completion for 'service {create,update} --group-{add,rm}'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 1df220d51fcba1e6f0a03bb83f80a7d45137f385
Component: engine
2016-09-13 10:15:22 +02:00
Brian Goff
0b4dde90a0
Merge pull request #26301 from albers/completion-service-groups
...
Add bash completion for `service {create,update} --group-{add,rm}`
Upstream-commit: 5ada5f129f8c845c11daf8167a92c4c92d2b917c
Component: engine
2016-09-12 09:05:49 -04:00
Harald Albers
640335fb90
Add completion for docker events -f event=health_status
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: d5a79579d38476121ff5ee49e74bdfd0d80a3bb7
Component: engine
2016-09-06 13:46:21 -07:00
Harald Albers
54fd9ae518
Add bash completion for service {create,update} --group-{add,rm}
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: be455538aa452efa086df9e1a44045bab59c7a00
Component: engine
2016-09-04 05:52:50 -07:00
Harald Albers
6b40fbbd4d
Remove bash completion for docker volume create --name
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 7f9096adb7f5aa3845e256323c7f2107c04d2ff2
Component: engine
2016-08-31 09:50:11 +02:00
Fabio Rapposelli
cc7e4cafad
Add rpm builder for VMware Photon OS
...
Signed-off-by: Fabio Rapposelli <fabio@vmware.com >
Upstream-commit: 6c7e1863d552afe156eb430575cbc0e1057a77e1
Component: engine
2016-08-30 17:05:32 -07:00
allencloud
37e3bbaff0
make node ps default to self in swarm node
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: b13f5dfd130a69b0eb655d349b7839f12a9384ed
Component: engine
2016-08-30 17:34:16 +08:00
Steve Durrheimer
87d651a44b
Replace zsh completion for 'docker volume create --name' by 'docker volume create {name}'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 85071bda33f5aa3aeee0f9feb371740b21f9c5f9
Component: engine
2016-08-28 12:40:10 +02:00
Brian Goff
6d81343bdb
Merge pull request #26008 from resin-os/fix-btrfs-check
...
check-config.sh: Add check for CONFIG_BTRFS_FS_POSIX_ACL
Upstream-commit: 95fca642a1cdb70f27c01a4595e12e9109bed0f7
Component: engine
2016-08-25 12:39:35 -04:00
Alexander Morozov
a0d759f31d
Merge pull request #25786 from splunk/splunk-logging-driver-raw-format-using-json
...
Splunk Logging Driver: formats and verifyconnection
Upstream-commit: 78771b62255456bef110a3e310eb20165e5ece9f
Component: engine
2016-08-25 09:12:31 -07:00
Andrei Gherzan
776912e30d
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 >
Upstream-commit: 1c886a70df9820e58caa14789d9ad37c366026d9
Component: engine
2016-08-25 13:20:18 +01:00
Neyazul Haque
2f475c1229
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 >
Upstream-commit: 10cebd4c741cd9e0762227148795c4ce02317579
Component: engine
2016-08-23 08:45:46 +05:30
Brian Goff
c0e81b448f
Merge pull request #25869 from cjdmax/master
...
debian sysvinitscript one missed DOCKER->DOCKERD change
Upstream-commit: 2fb2bbe4079e3b278e0a15510475c4c1b5f9ecd6
Component: engine
2016-08-22 12:24:31 -04:00
Antonio Murdaca
0f0bfaaffb
Bump go to 1.7
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 12e2c2687e5c1f47287aa3668c8853ee8b5d6706
Component: engine
2016-08-21 19:04:15 +02:00
Vincent Demeester
e3afe81751
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
Upstream-commit: 09b929083d34836a78ce8ee79b22aea082712072
Component: engine
2016-08-19 22:09:57 +02:00
Alexander Morozov
7db773fe39
Merge pull request #23438 from tophj-ibm/ppc64le-build-xenial-debs
...
ppc64le: add support for building docker debs for xenial
Upstream-commit: bf61c916ee12f2f1eda83bde7021e9bc4ee1ae15
Component: engine
2016-08-19 08:35:31 -07:00
Liam Macgillavry
d3f9e431a9
missed DOCKER->DOCKERD change in 1ac1b78b3a771c562d9cfa91c14f8a494c3723c1 for 'status'
...
Signed-off-by: Liam Macgillavry <liam@kumina.nl >
Upstream-commit: 11eda60848e476c3a1d84a035642edba74e94c8a
Component: engine
2016-08-19 11:08:52 +02:00
Christopher Jones
c49a123086
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 >
Upstream-commit: 64881dc331f1f0ff861eb82bb05eef63d6693a67
Component: engine
2016-08-18 22:25:14 -04:00
Yong Tang
d30cc14f93
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 >
Upstream-commit: 7fd2c809622e66bb3157fbf1ab797152636a2df5
Component: engine
2016-08-18 18:41:15 -07:00
Vincent Demeester
9ab2ca7546
Merge pull request #25708 from timfeirg/master
...
expose RemovalInProgress in StateString #25652
Upstream-commit: 426046db3a5c3c056f02bf3ad5efd1342ff79533
Component: engine
2016-08-18 21:54:48 +02:00
timfeirg
c8732c07e1
expose RemovalInProgress in StateString #25652
...
Signed-off-by: timfeirg <kkcocogogo@gmail.com >
Upstream-commit: 37466cc8c85ccbdade57463ae2aacac638002f8a
Component: engine
2016-08-18 11:25:27 +08:00
Sebastiaan van Stijn
3da3f4e31d
Merge pull request #25789 from sdurrheimer/zsh-completion-network-volume-ls-format
...
Add zsh completion for 'docker {network,volume} ls --format'
Upstream-commit: 2ae49a088718f675ec11c387072fe6de8b22f0c7
Component: engine
2016-08-17 16:51:51 +02:00
Steve Durrheimer
f0e6c337db
Add zsh completion for 'docker {network,volume} ls --format'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 25009687be204db821c962e341ca91e7b8324c42
Component: engine
2016-08-17 08:21:15 +02:00
Steve Durrheimer
5a61089695
Add zsh completion for 'docker volume ls --filter label'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: d1870019a02e3d74e3ad173e3cb73dbe5574e831
Component: engine
2016-08-17 08:15:26 +02:00
Denis Gladkikh
e85d8b261b
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 >
Upstream-commit: 603fd0831513257bc26d20ca1f64efcc4965eae6
Component: engine
2016-08-16 21:45:16 -07:00
Tõnis Tiigi
a42a4868ac
Merge pull request #25188 from armills/nuke-graph-directory
...
nuke-graph-directory.sh: Improve subvolume search
Upstream-commit: 8f8bb8ad4c20c8891f26b6a30dcdcfe8edbdaa8e
Component: engine
2016-08-16 09:47:33 -07:00
Michael Crosby
06f36cfa80
Merge pull request #25337 from jhorwit2/jah/25332
...
Add --no-trunc to service/node/stack ps output
Upstream-commit: 0c8b0faef8dfb2aa97575bae8afa152e54e63492
Component: engine
2016-08-16 09:25:45 -07:00
Josh Horwitz
cff5a79975
Add --no-trunc to service/node/stack ps output
...
Signed-off-by: Josh Horwitz <horwitzja@gmail.com >
Upstream-commit: 204c4d39d3241cff1b44f438b99bd0d6484e7b48
Component: engine
2016-08-16 10:19:11 -04:00
Harald Albers
7494d4ad1a
Add bash completion for docker {network,volume} ls --format
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 5d43a78763d4cb435b080d607c4605591dfea67d
Component: engine
2016-08-16 14:10:28 +02:00
Sebastiaan van Stijn
48966e7c86
Merge pull request #25745 from albers/completion-volume-ls-filter-label
...
Add bash completion for `docker volume ls --filter label`
Upstream-commit: 0309eeb5ddd9733daa18ef07f7eea0dc3c53626e
Component: engine
2016-08-16 13:27:14 +02:00
Harald Albers
a80a4f000b
Add bash completion for docker volume ls --filter label
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 41511f8911e48b1d0404ddc975243f5a6f303fb2
Component: engine
2016-08-16 09:10:46 +02:00
Akihiro Suda
1b140377f0
add --format flag to docker info
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: dc38c9a04705f0a9ad3e007f7869cfb6a8a3a8b8
Component: engine
2016-08-16 04:03:52 +00:00
Tõnis Tiigi
b690241f76
Merge pull request #25675 from DieterReuter/master
...
Fix build deb for ARMv6
Upstream-commit: 5ac0342e8282783531b61140b09268ff0d03f37e
Component: engine
2016-08-13 10:16:29 -07:00
Dieter Reuter
6b981f5f41
Fix build deb for ARMv6
...
Signed-off-by: Dieter Reuter <dieter.reuter@me.com >
Upstream-commit: 5907e4a872c7d586ab594972fa24bf4fa4e83207
Component: engine
2016-08-13 00:40:29 +02:00
Michael Crosby
c5ce25f56a
Merge pull request #23116 from glensc/mkimage-pld
...
add script to make base image for PLD Linux
Upstream-commit: 05d1dcfca25d534294cb42ffcdd7bedaeaa06ee7
Component: engine
2016-08-12 15:38:36 -07:00
Tibor Vass
682232d48f
Merge pull request #25593 from thtanaka/oracle-selinux
...
Add Oracle Linux distro specific selinux policy
Upstream-commit: faaab62f73f75af61e14cba5446fc7cd67934f01
Component: engine
2016-08-11 11:27:54 -07:00
Ramon Brooker
5b967c9349
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 >
Upstream-commit: 73e08286f920881a431fa7befd3909e72303680b
Component: engine
2016-08-11 00:13:33 +02:00
Thomas Tanaka
eb441d6504
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 >
Upstream-commit: d6cae872c704c6cf36ee7d5c9b472e33280af202
Component: engine
2016-08-10 13:33:56 -07:00
Tibor Vass
874b6f9cd1
Merge pull request #25334 from crosbymichael/selinux-fedora
...
Add selinux policy per distro/version
Upstream-commit: fc40ed24d810ea481dd358990926bc57d40c308d
Component: engine
2016-08-10 11:40:33 -07:00
Adam Mills
c7b9591ff6
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 >
Upstream-commit: c3aa75c5a73bed12f44d863618cabef780f5f5bd
Component: engine
2016-08-08 13:00:21 -04:00
Lei Jitang
8efb4bf7c6
Merge pull request #25442 from albers/completion--env
...
Fix bash completion for `docker service {create,update} {-e,--env}`
Upstream-commit: b72a41b32e683a9d4cb780e3f937e4959447ece0
Component: engine
2016-08-06 10:47:18 +08:00
Vincent Demeester
f00255fe74
Merge pull request #25447 from albers/completion-swarm-interfaces
...
Improve bash completion for `docker swarm {init,join} --{advertise,listen}-addr}`
Upstream-commit: 54e2cbc11e956863413859f492194a3dfcdd5646
Component: engine
2016-08-05 19:59:32 +02:00
Brian Goff
25b29d1992
Merge pull request #25448 from albers/completion-swarm-join--adveritse-addr
...
Fix bash completion for `docker swarm join --advertise-addr`
Upstream-commit: e9bfb9b4cbec2b3e7120a2775b74a7c4e3088397
Component: engine
2016-08-05 13:50:26 -04:00
Harald Albers
1e65234473
Fix bash completion for docker swarm join --advertise-addr
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: fa1b82e5ebc0e7dafe500e891c8b8c5fe5d4e1aa
Component: engine
2016-08-05 19:14:13 +02:00
Harald Albers
a4f26f26fe
Improve bash completion for docker swarm {init,join} --{advertise,listen}-addr}
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 07f6655286f5e383dba5063bf0dcf2ee02d5e52f
Component: engine
2016-08-05 18:56:17 +02:00
Harald Albers
fe75792b8d
Add self to bash completion of docker node inspect
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: b63a7692d6c656cfa1081e36de7be690fd007385
Component: engine
2016-08-05 18:06:25 +02:00
Harald Albers
fd0981c83c
Fix bash completion for docker service {create,update} {-e,--env}
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 197f23da497d3d82f30beb6d920211f6d2055fa3
Component: engine
2016-08-05 17:41:40 +02:00
Michael Crosby
fa68c3585a
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
https://github.com/projectatomic/docker-selinux/commit/4a6ce94da5e34868642ebcc7a67da937d4c73283
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 32b1f26c5111b22fe4277879c4f5e4687a6a72fc
Component: engine
2016-08-04 14:29:22 -07:00
Steve Durrheimer
ba54cb627c
Add zsh completion for 'docker node rm --force'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: b58ef479a6be7ddff79a354ee912f9dd73a9f41b
Component: engine
2016-08-04 08:01:04 +02:00
Vincent Demeester
Steve Durrheimer
Brian Goff
Harald Albers
Fabio Rapposelli
allencloud
Alexander Morozov
Andrei Gherzan
Neyazul Haque
Antonio Murdaca
Liam Macgillavry
Christopher Jones
Yong Tang
timfeirg
Sebastiaan van Stijn
Denis Gladkikh
Tõnis Tiigi
Michael Crosby
Josh Horwitz
Akihiro Suda
Dieter Reuter
Tibor Vass
Ramon Brooker
Thomas Tanaka
Adam Mills
Lei Jitang