6a340d99fd98e98178cfaab4cbb7875a8ed51e3b

Message

Merge pull request #3988 from UserTaken/docker_update

Docker run and create options

Diff

This diff is truncated to protect this page.

  1diff --git a/plugins/docker/_docker b/plugins/docker/_docker
  2index e95a22bfd453ffe39d979d2400f777d8ace155d0..25f55beca384ecdd3d4b9c970a322676e9e4599c 100644
  3--- a/plugins/docker/_docker
  4+++ b/plugins/docker/_docker
  5@@ -36,7 +36,7 @@ __docker_images() {
  6 # ---------------------------
  7 __attach() {
  8     _arguments \
  9-        '--no-stdin[Do not attach stdin]' \
 10+        '--no-stdin[Do not attach STDIN]' \
 11         '--sig-proxy[Proxify all received signal to the process (even in non-tty mode)]'
 12     __docker_containers
 13 }
 14@@ -52,16 +52,59 @@ __build() {
 15 
 16 __commit() {
 17     _arguments \
 18-        '(-a,--author=)'{-a,--author=}'[Author (eg. "John Hannibal Smith <hannibal@a-team.com>"]' \
 19+        '(-a,--author=)'{-a,--author=}'[Author (e.g. "John Hannibal Smith <hannibal@a-team.com>")]' \
 20+        '(-c,--change=)'{-c,--change=}'[Apply Dockerfile instruction to the created image]' \
 21         '(-m,--message=)'{-m,--message=}'[Commit message]' \
 22-        '--run=[Config automatically applied when the image is run.]'
 23-    __docker_containers
 24+        '(-p,--pause=)'{-p,--pause=}'[Pause container during commit]' \
 25 }
 26 
 27 __cp() {
 28     __docker_containers
 29 }
 30 
 31+__create() {
 32+    _arguments \
 33+        '(-P,--publish-all=)'{-P,--publish-all=}'[Publish all exposed ports to the host interfaces]' \
 34+        '(-a,--attach=)'{-a,--attach=}'[Attach to STDIN, STDOUT or STDERR]' \
 35+        '--add-host=[Add a custom host-to-IP mapping]' \
 36+        '--cap-add=[Add Linux capabilities]' \
 37+        '--cap-drop=[Drop Linux capabilities]' \
 38+        '--cpuset-cpus=[CPUs in which to allow execution (0-3, 0,1)]' \
 39+        '(-c,--cpu-shares=)'{-c,--cpu-shares=}'[CPU shares (relative weight)]' \
 40+        '--cidfile=[Write the container ID to the file]' \
 41+        '--device=[Add a host device to the container]' \
 42+        '--dns=[Set custom dns servers]' \
 43+        '--dns-search=[Set custom DNS search domains]' \
 44+        '(-e,--env=)'{-e,--env=}'[Set environment variables]' \
 45+        '--env-file=[Read in a file of environment variables]' \
 46+        '--entrypoint=[Overwrite the default entrypoint of the image]' \
 47+        '--expose=[Expose a port from the container without publishing it to your host]' \
 48+        '(-h,--hostname=)'{-h,--hostname=}'[Container host name]' \
 49+        '(-i,--interactive=)'{-i,--interactive=}'[Keep STDIN open even if not attached]' \
 50+        '--ipc=[IPC namespace to use]' \
 51+        '(-l,--label=)'{-l,--label=}'[Set meta data on a container]' \
 52+        '--link=[Add link to another container (name:alias)]' \
 53+        '--log-driver=[Logging driver for the container]' \
 54+        '--lxc-conf=[Add custom LXC options]' \
 55+        '--mac-address=[Container MAC address (e.g. 92:d0:c6:0a:29:33)]' \
 56+        '(-m,--memory=)'{-m,--memory=}'[Memory limit (format: <number><optional unit>, where unit = b, k, m or g)]' \
 57+        '--net=[Set the Network mode for the container]' \
 58+        '--name=[Assign a name to the container]' \
 59+        '--pid=[PID namespace to use]' \
 60+        '(-p,--publish=)'{-p,--publish=}'[Publish a container''s port to the host (format: ip:hostPort:containerPort/protocol)]' \
 61+        '--privileged=[Give extended privileges to this container]' \
 62+        '--restart=[Restart policy to apply when a container exits]' \
 63+        '--security-opt=[Security Options]' \
 64+        '--sig-proxy=[Proxify all received signal to the process (even in non-tty mode)]' \
 65+        '(-t,--tty=)'{-t,--tty=}'[Allocate a pseudo-tty]' \
 66+        '(-u,--user=)'{-u,--user=}'[Username or UID]' \
 67+        '--ulimit=[Ulimit options]' \
 68+        '(-v,--volume=)'{-v,--volume=}'[Bind mount a volume (e.g. -v /host:/container or -v /container)]' \
 69+        '--volumes-from=[Mount volumes from the specified container(s)]' \
 70+        '(-w,--workdir=)'{-w,--workdir=}'[Working directory inside the container]'
 71+    __docker_images
 72+}
 73+
 74 __diff() {
 75     __docker_containers
 76 }
 77@@ -180,28 +223,43 @@ __rmi() {
 78 __run() {
 79     _arguments \
 80         '(-P,--publish-all=)'{-P,--publish-all=}'[Publish all exposed ports to the host interfaces]' \
 81-        '(-a,--attach=)'{-a,--attach=}'[Attach to stdin, stdout or stderr.]' \
 82-        '(-c,--cpu-shares=)'{-c,--cpu-shares=}': CPU shares (relative weight)]' \
 83+        '(-a,--attach=)'{-a,--attach=}'[Attach to STDIN, STDOUT or STDERR]' \
 84+        '--add-host=[Add a custom host-to-IP mapping]' \
 85+        '--cap-add=[Add Linux capabilities]' \
 86+        '--cap-drop=[Drop Linux capabilities]' \
 87+        '--cpuset-cpus=[CPUs in which to allow execution (0-3, 0,1)]' \
 88+        '(-c,--cpu-shares=)'{-c,--cpu-shares=}'[CPU shares (relative weight)]' \
 89         '--cidfile=[Write the container ID to the file]' \
 90-        '(-d,--detach=)'{-d,--detach=}'[Detached mode: Run container in the background, print new container id]' \
 91+        '(-d,--detach=)'{-d,--detach=}'[Run container in the background, print new container id]' \
 92+        '--device=[Add a host device to the container]' \
 93         '--dns=[Set custom dns servers]' \
 94+        '--dns-search=[Set custom DNS search domains]' \
 95         '(-e,--env=)'{-e,--env=}'[Set environment variables]' \
 96+        '--env-file=[Read in a file of environment variables]' \
 97         '--entrypoint=[Overwrite the default entrypoint of the image]' \
 98         '--expose=[Expose a port from the container without publishing it to your host]' \
 99         '(-h,--hostname=)'{-h,--hostname=}'[Container host name]' \
100-        '(-i,--interactive=)'{-i,--interactive=}'[Keep stdin open even if not attached]' \
101+        '(-i,--interactive=)'{-i,--interactive=}'[Keep STDIN open even if not attached]' \
102+        '--ipc=[IPC namespace to use]' \
103+        '(-l,--label=)'{-l,--label=}'[Set meta data on a container]' \
104         '--link=[Add link to another container (name:alias)]' \