From f6d70d08a8bc7e5f5638d8867a8a50904268c88e Mon Sep 17 00:00:00 2001 From: Steve Durrheimer Date: Fri, 20 Jan 2017 15:46:50 +0100 Subject: [PATCH 01/36] Add zsh completion for 'docker {container,image,network,system} prune --filter' Signed-off-by: Steve Durrheimer (cherry picked from commit 784ebccffaa8329aee9e88877e6039b5002ad8e3) Signed-off-by: Victor Vieux --- contrib/completion/zsh/_docker | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/contrib/completion/zsh/_docker b/contrib/completion/zsh/_docker index 1aec353c57..7e79e6366c 100644 --- a/contrib/completion/zsh/_docker +++ b/contrib/completion/zsh/_docker @@ -474,6 +474,26 @@ __docker_complete_events_filter() { return ret } +__docker_complete_prune_filters() { + [[ $PREFIX = -* ]] && return 1 + integer ret=1 + declare -a opts + + opts=('until') + + if compset -P '*='; then + case "${${words[-1]%=*}#*=}" in + *) + _message 'value' && ret=0 + ;; + esac + else + _describe -t filter-opts "filter options" opts -qS "=" && ret=0 + fi + + return ret +} + # BO container __docker_container_commands() { @@ -731,6 +751,7 @@ __docker_container_subcommand() { (prune) _arguments $(__docker_arguments) \ $opts_help \ + "($help)*--filter=[Filter values]:filter:__docker_complete_prune_filters" \ "($help -f --force)"{-f,--force}"[Do not prompt for confirmation]" && ret=0 ;; (rename) @@ -977,6 +998,7 @@ __docker_image_subcommand() { _arguments $(__docker_arguments) \ $opts_help \ "($help -a --all)"{-a,--all}"[Remove all unused images, not just dangling ones]" \ + "($help)*--filter=[Filter values]:filter:__docker_complete_prune_filters" \ "($help -f --force)"{-f,--force}"[Do not prompt for confirmation]" && ret=0 ;; (pull) @@ -1204,6 +1226,7 @@ __docker_network_subcommand() { (prune) _arguments $(__docker_arguments) \ $opts_help \ + "($help)*--filter=[Filter values]:filter:__docker_complete_prune_filters" \ "($help -f --force)"{-f,--force}"[Do not prompt for confirmation]" && ret=0 ;; (rm) @@ -2142,6 +2165,7 @@ __docker_system_subcommand() { _arguments $(__docker_arguments) \ $opts_help \ "($help -a --all)"{-a,--all}"[Remove all unused data, not just dangling ones]" \ + "($help)*--filter=[Filter values]:filter:__docker_complete_prune_filters" \ "($help -f --force)"{-f,--force}"[Do not prompt for confirmation]" && ret=0 ;; (help) From 78e4fa2caa3e3ed8ee55e22d50714d0813821c9e Mon Sep 17 00:00:00 2001 From: Steve Durrheimer Date: Thu, 19 Jan 2017 16:54:36 +0100 Subject: [PATCH 02/36] Add zsh completion for 'docker swarm --availability' Signed-off-by: Steve Durrheimer (cherry picked from commit ee2ce82c61c11b1c14f9febf811fbbc19d69b750) Signed-off-by: Victor Vieux --- contrib/completion/zsh/_docker | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/contrib/completion/zsh/_docker b/contrib/completion/zsh/_docker index 7e79e6366c..2ff3223d4e 100644 --- a/contrib/completion/zsh/_docker +++ b/contrib/completion/zsh/_docker @@ -1611,7 +1611,7 @@ __docker_secret_subcommand() { case "$words[1]" in (create) - _arguments $(__docker_arguments) \ + _arguments $(__docker_arguments) -A '-*' \ $opts_help \ "($help)*"{-l=,--label=}"[Secret labels]:label: " \ "($help -):secret: " && ret=0 @@ -2083,9 +2083,10 @@ __docker_swarm_subcommand() { "($help)--task-history-limit=[Task history retention limit]:limit: " && ret=0 ;; (join) - _arguments $(__docker_arguments) \ + _arguments $(__docker_arguments) -A '-*' \ $opts_help \ - "($help)--advertise-addr[Advertised address]:ip\:port: " \ + "($help)--advertise-addr=[Advertised address]:ip\:port: " \ + "($help)--availability=[Availability of the node]:availability:(active drain pause)" \ "($help)--listen-addr=[Listen address]:ip\:port: " \ "($help)--token=[Token for entry into the swarm]:secret: " \ "($help -):host\:port: " && ret=0 @@ -2516,14 +2517,14 @@ __docker_subcommand() { esac ;; (login) - _arguments $(__docker_arguments) \ + _arguments $(__docker_arguments) -A '-*' \ $opts_help \ "($help -p --password)"{-p=,--password=}"[Password]:password: " \ "($help -u --user)"{-u=,--user=}"[Username]:username: " \ "($help -)1:server: " && ret=0 ;; (logout) - _arguments $(__docker_arguments) \ + _arguments $(__docker_arguments) -A '-*' \ $opts_help \ "($help -)1:server: " && ret=0 ;; @@ -2587,7 +2588,7 @@ __docker_subcommand() { __docker_image_subcommand && ret=0 ;; (search) - _arguments $(__docker_arguments) \ + _arguments $(__docker_arguments) -A '-*' \ $opts_help \ "($help)*"{-f=,--filter=}"[Filter values]:filter:->filter-options" \ "($help)--limit=[Maximum returned search results]:limit:(1 5 10 25 50)" \ From d621d74f6432d20e63151b18d4ece7ec4e5fa40e Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Thu, 19 Jan 2017 08:22:06 +0100 Subject: [PATCH 03/36] Add bash completion for `dockerd --init` and `docker run|create --init` Fixes #30263 Signed-off-by: Harald Albers (cherry picked from commit 20762617572f2e02b8e397844343083506144e86) Signed-off-by: Victor Vieux --- contrib/completion/bash/docker | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker index 24311f8ade..8b845d430d 100644 --- a/contrib/completion/bash/docker +++ b/contrib/completion/bash/docker @@ -1372,6 +1372,7 @@ _docker_container_run() { local boolean_options=" --disable-content-trust=false --help + --init --interactive -i --oom-kill-disable --privileged @@ -1728,6 +1729,7 @@ _docker_daemon() { --experimental --help --icc=false + --init --ip-forward=false --ip-masq=false --iptables=false From ba79dde9d2f30b56a2369d424ce5045a11f6bc91 Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Tue, 17 Jan 2017 08:52:18 +0100 Subject: [PATCH 04/36] Add bash completion for `build --squash` Signed-off-by: Harald Albers (cherry picked from commit e91dbba7ff62a92bd395bc419f522fa66618ae7b) Signed-off-by: Victor Vieux --- contrib/completion/bash/docker | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker index 8b845d430d..6910d509ff 100644 --- a/contrib/completion/bash/docker +++ b/contrib/completion/bash/docker @@ -2006,6 +2006,7 @@ _docker_image_build() { --quiet -q --rm " + __docker_is_experimental && boolean_options+="--squash" local all_options="$options_with_args $boolean_options" From 7bb37403861fdf9b2b959011e5916df55897449c Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Fri, 13 Jan 2017 15:43:52 +0100 Subject: [PATCH 05/36] Honour $DOCKER_HIDE_LEGACY_COMMANDS in bash completion Signed-off-by: Harald Albers (cherry picked from commit aa006f128065fa8b1f017d1fdfdfebdbd08e31c9) Signed-off-by: Victor Vieux --- contrib/completion/bash/docker | 43 ++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker index 6910d509ff..8f2d40297b 100644 --- a/contrib/completion/bash/docker +++ b/contrib/completion/bash/docker @@ -3972,11 +3972,30 @@ _docker() { local previous_extglob_setting=$(shopt -p extglob) shopt -s extglob - local commands=( - attach - build - commit + local management_commands=( container + image + network + node + plugin + secret + service + stack + system + volume + ) + + local top_level_commands=( + build + login + logout + run + search + version + ) + + local legacy_commands=( + commit cp create diff @@ -3984,20 +4003,14 @@ _docker() { exec export history - image images import info inspect kill load - login - logout logs - network - node pause - plugin port ps pull @@ -4006,23 +4019,15 @@ _docker() { restart rm rmi - run save - search - secret - service - stack start stats stop swarm - system tag top unpause update - version - volume wait ) @@ -4030,6 +4035,8 @@ _docker() { deploy ) + local commands=(${management_commands[*]} ${top_level_commands[*]} ${DOCKER_HIDE_LEGACY_COMMANDS:+${legacy_commands[*]}}) + # These options are valid as global options for all client commands # and valid as command options for `docker daemon` local global_boolean_options=" From 23e9d30cea50095226bbc02db05f84c43b34f792 Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Sat, 14 Jan 2017 04:48:41 -0800 Subject: [PATCH 06/36] Fix treatment of DOCKER_HIDE_LEGACY_COMMANDS in bash completion Signed-off-by: Harald Albers (cherry picked from commit 12952f537cf1851bfe84706a4e0eb283dc970379) Signed-off-by: Victor Vieux --- contrib/completion/bash/docker | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker index 8f2d40297b..68e122d1a7 100644 --- a/contrib/completion/bash/docker +++ b/contrib/completion/bash/docker @@ -4035,7 +4035,8 @@ _docker() { deploy ) - local commands=(${management_commands[*]} ${top_level_commands[*]} ${DOCKER_HIDE_LEGACY_COMMANDS:+${legacy_commands[*]}}) + local commands=(${management_commands[*]} ${top_level_commands[*]}) + [ -z "$DOCKER_HIDE_LEGACY_COMMANDS" ] && commands+=(${legacy_commands[*]}) # These options are valid as global options for all client commands # and valid as command options for `docker daemon` From d4e6422212c7af3c1a7a8d9cc82070b9d3f55ebc Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Tue, 24 Jan 2017 10:11:38 +0100 Subject: [PATCH 07/36] Add bash completion for `docker swarm unlock|unlock-key` Signed-off-by: Harald Albers (cherry picked from commit 07bd5152b3731c108e2dba57b1f51e6609b55ba3) Signed-off-by: Victor Vieux --- contrib/completion/bash/docker | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker index 68e122d1a7..2ac210a4c2 100644 --- a/contrib/completion/bash/docker +++ b/contrib/completion/bash/docker @@ -2910,6 +2910,8 @@ _docker_swarm() { join join-token leave + unlock + unlock-key update " __docker_subcommands "$subcommands" && return @@ -3010,6 +3012,22 @@ _docker_swarm_leave() { esac } +_docker_swarm_unlock() { + case "$cur" in + -*) + COMPREPLY=( $( compgen -W "--help" -- "$cur" ) ) + ;; + esac +} + +_docker_swarm_unlock-key() { + case "$cur" in + -*) + COMPREPLY=( $( compgen -W "--help --quiet -q --rotate" -- "$cur" ) ) + ;; + esac +} + _docker_swarm_update() { case "$prev" in --cert-expiry|--dispatcher-heartbeat|--max-snapshots|--snapshot-interval|--task-history-limit) From 9da299954faaf8c53f984942c08f8a58676d2ea4 Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Tue, 24 Jan 2017 10:00:18 +0100 Subject: [PATCH 08/36] Add missing options to bash completion for `docker swarm init|update` Signed-off-by: Harald Albers (cherry picked from commit f93da79dc18a989a727978350cca8e941e9daeca) Signed-off-by: Victor Vieux --- contrib/completion/bash/docker | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker index 2ac210a4c2..6197f063cf 100644 --- a/contrib/completion/bash/docker +++ b/contrib/completion/bash/docker @@ -2937,6 +2937,13 @@ _docker_swarm_init() { fi return ;; + --availability) + COMPREPLY=( $( compgen -W "active drain pause" -- "$cur" ) ) + return + ;; + --cert-expiry|--dispatcher-heartbeat|--external-ca|--max-snapshots|--snapshot-interval|--task-history-limit) + return + ;; --listen-addr) if [[ $cur == *: ]] ; then COMPREPLY=( $( compgen -W "2377" -- "${cur##*:}" ) ) @@ -2950,7 +2957,7 @@ _docker_swarm_init() { case "$cur" in -*) - COMPREPLY=( $( compgen -W "--advertise-addr --force-new-cluster --help --listen-addr" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "--advertise-addr --autolock --availability --cert-expiry --dispatcher-heartbeat --external-ca --force-new-cluster --help --listen-addr --max-snapshots --snapshot-interval --task-history-limit" -- "$cur" ) ) ;; esac } @@ -3030,14 +3037,14 @@ _docker_swarm_unlock-key() { _docker_swarm_update() { case "$prev" in - --cert-expiry|--dispatcher-heartbeat|--max-snapshots|--snapshot-interval|--task-history-limit) + --cert-expiry|--dispatcher-heartbeat|--external-ca|--max-snapshots|--snapshot-interval|--task-history-limit) return ;; esac case "$cur" in -*) - COMPREPLY=( $( compgen -W "--cert-expiry --dispatcher-heartbeat --help --max-snapshots --snapshot-interval --task-history-limit" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "--autolock --cert-expiry --dispatcher-heartbeat --external-ca --help --max-snapshots --snapshot-interval --task-history-limit" -- "$cur" ) ) ;; esac } From b4fd48ce322e928e283a27d2ec98876dd95abdf7 Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Mon, 23 Jan 2017 19:05:00 +0100 Subject: [PATCH 09/36] Add bash completion for `docker service ps --filter node` Signed-off-by: Harald Albers (cherry picked from commit a39a2bb6c29405148df3e45216f46f54263cd5ea) Signed-off-by: Victor Vieux --- contrib/completion/bash/docker | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker index 6197f063cf..b34d6465d7 100644 --- a/contrib/completion/bash/docker +++ b/contrib/completion/bash/docker @@ -2686,11 +2686,15 @@ _docker_service_ps() { __docker_complete_services --cur "${cur##*=}" --name return ;; + node) + __docker_complete_nodes_plus_self --cur "${cur##*=}" + return + ;; esac case "$prev" in --filter|-f) - COMPREPLY=( $( compgen -W "desired-state id name" -S = -- "$cur" ) ) + COMPREPLY=( $( compgen -W "desired-state id name node" -S = -- "$cur" ) ) __docker_nospace return ;; From 0be8ebd2a1f7bc9e5599339f328957ac460bd0e0 Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Mon, 23 Jan 2017 18:48:21 +0100 Subject: [PATCH 10/36] Fix bash completion for `docker service update` Signed-off-by: Harald Albers (cherry picked from commit 01ac33ce165835a3ccde7d151d7d2905c8391461) Signed-off-by: Victor Vieux --- contrib/completion/bash/docker | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker index b34d6465d7..933fbcf7d9 100644 --- a/contrib/completion/bash/docker +++ b/contrib/completion/bash/docker @@ -2734,7 +2734,6 @@ _docker_service_update() { --mount --network --no-healthcheck - --publish -p --replicas --reserve-cpu --reserve-memory @@ -2772,7 +2771,7 @@ _docker_service_update() { --host --mode --name - --publish + --publish -p --secret " From 0fa35e2073918ad3bae5716b7400873061c2a5ba Mon Sep 17 00:00:00 2001 From: Steve Durrheimer Date: Tue, 3 Jan 2017 14:46:37 +0100 Subject: [PATCH 11/36] Add zsh completion for 'docker plugin install --alias' Signed-off-by: Steve Durrheimer (cherry picked from commit 455b7bcbabd4eb7e440448b5834f626cb08c69e0) Signed-off-by: Victor Vieux --- contrib/completion/zsh/_docker | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/contrib/completion/zsh/_docker b/contrib/completion/zsh/_docker index 2ff3223d4e..672861a2a0 100644 --- a/contrib/completion/zsh/_docker +++ b/contrib/completion/zsh/_docker @@ -1520,11 +1520,17 @@ __docker_plugin_subcommand() { opts_help=("(: -)--help[Print usage]") case "$words[1]" in - (disable|enable|inspect|install|ls|push|rm) + (disable|enable|inspect|ls|push|rm) _arguments $(__docker_arguments) \ $opts_help \ "($help -)1:plugin:__docker_complete_plugins" && ret=0 ;; + (install) + _arguments $(__docker_arguments) \ + $opts_help \ + "($help)--alias=[Local name for plugin]:alias: " \ + "($help -)1:plugin:__docker_complete_plugins" && ret=0 + ;; (set) _arguments $(__docker_arguments) \ $opts_help \ From 1ec786944335bd21a4838a9fbe01397a1fee1b14 Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Fri, 13 Jan 2017 11:56:50 +0100 Subject: [PATCH 12/36] Add bash completion for `plugin install --disable-content-trust` Signed-off-by: Harald Albers (cherry picked from commit 725a864a0496a6c10f56c30f8a45234230951343) Signed-off-by: Victor Vieux --- contrib/completion/bash/docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker index 933fbcf7d9..df192d488c 100644 --- a/contrib/completion/bash/docker +++ b/contrib/completion/bash/docker @@ -3320,7 +3320,7 @@ _docker_plugin_install() { case "$cur" in -*) - COMPREPLY=( $( compgen -W "--alias --disable --grant-all-permissions --help" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "--alias --disable --disable-content-trust=false --grant-all-permissions --help" -- "$cur" ) ) ;; esac } From 0c169804685990d0603552df9f15fc9f2495f791 Mon Sep 17 00:00:00 2001 From: Steve Durrheimer Date: Fri, 20 Jan 2017 16:06:22 +0100 Subject: [PATCH 13/36] Add zsh completion for 'dockerd --init' and 'docker {create,run} --init' Signed-off-by: Steve Durrheimer (cherry picked from commit cdf57782fd6323549e37aaccc3eeaef1b4aa91f3) Signed-off-by: Victor Vieux --- contrib/completion/zsh/_docker | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/completion/zsh/_docker b/contrib/completion/zsh/_docker index 672861a2a0..9c83e2b920 100644 --- a/contrib/completion/zsh/_docker +++ b/contrib/completion/zsh/_docker @@ -561,6 +561,7 @@ __docker_container_subcommand() { "($help)*--group=[Set one or more supplementary user groups for the container]:group:_groups" "($help -h --hostname)"{-h=,--hostname=}"[Container host name]:hostname:_hosts" "($help -i --interactive)"{-i,--interactive}"[Keep stdin open even if not attached]" + "($help)--init[Run an init inside the container that forwards signals and reaps processes]" \ "($help)--ip=[Container IPv4 address]:IPv4: " "($help)--ip6=[Container IPv6 address]:IPv6: " "($help)--ipc=[IPC namespace to use]:IPC namespace: " @@ -2401,6 +2402,7 @@ __docker_subcommand() { "($help -g --graph)"{-g=,--graph=}"[Root of the Docker runtime]:path:_directories" \ "($help -H --host)"{-H=,--host=}"[tcp://host:port to bind/connect to]:host: " \ "($help)--icc[Enable inter-container communication]" \ + "($help)--init[Run an init inside containers to forward signals and reap processes]" \ "($help)--init-path=[Path to the docker-init binary]:docker-init binary:_files" \ "($help)*--insecure-registry=[Enable insecure registry communication]:registry: " \ "($help)--ip=[Default IP when binding container ports]" \ From b9ee1c68800eb074cd0c73960eeeced77b5e2ace Mon Sep 17 00:00:00 2001 From: Kenfe-Mickael Laventure Date: Mon, 23 Jan 2017 13:52:33 -0800 Subject: [PATCH 14/36] Ensure proper value is used when computing reclaimable space When Size was reverted to be equal to VirtualSize, the df command formatter was not correctly updated to account for the change. Signed-off-by: Kenfe-Mickael Laventure (cherry picked from commit dcc1b4baf6d0eb068010d071bc44daf72b12cd4a) Signed-off-by: Victor Vieux --- cli/command/formatter/disk_usage.go | 5 ++++- daemon/images.go | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cli/command/formatter/disk_usage.go b/cli/command/formatter/disk_usage.go index 6f97d3b0f9..5309d880a5 100644 --- a/cli/command/formatter/disk_usage.go +++ b/cli/command/formatter/disk_usage.go @@ -192,7 +192,10 @@ func (c *diskUsageImagesContext) Reclaimable() string { c.AddHeader(reclaimableHeader) for _, i := range c.images { if i.Containers != 0 { - used += i.Size + if i.VirtualSize == -1 || i.SharedSize == -1 { + continue + } + used += i.VirtualSize - i.SharedSize } } diff --git a/daemon/images.go b/daemon/images.go index 01dbced164..88fb8f8e91 100644 --- a/daemon/images.go +++ b/daemon/images.go @@ -205,7 +205,7 @@ func (daemon *Daemon) Images(imageFilters filters.Args, all bool, withExtraAttrs } if withExtraAttrs { - // Get Shared and Unique sizes + // Get Shared sizes for img, newImage := range imagesMap { rootFS := *img.RootFS rootFS.DiffIDs = nil From ecd95a41d262d7a4b89cca9f8e71eabdb6af8974 Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Thu, 19 Jan 2017 08:47:01 -0800 Subject: [PATCH 15/36] Add docs for `run|create --init|--init-path` Signed-off-by: Harald Albers (cherry picked from commit d049ef2b0db4aebfba4f85f5d8294e9884a4b7e2) Signed-off-by: Victor Vieux --- docs/reference/commandline/create.md | 2 ++ docs/reference/commandline/run.md | 2 ++ man/docker-run.1.md | 10 +++++++++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/docs/reference/commandline/create.md b/docs/reference/commandline/create.md index 0218af3a76..e6582e4a38 100644 --- a/docs/reference/commandline/create.md +++ b/docs/reference/commandline/create.md @@ -63,6 +63,8 @@ Options: --health-timeout duration Maximum time to allow one check to run (ns|us|ms|s|m|h) (default 0s) --help Print usage -h, --hostname string Container host name + --init Run an init inside the container that forwards signals and reaps processes + --init-path string Path to the docker-init binary -i, --interactive Keep STDIN open even if not attached --io-maxbandwidth string Maximum IO bandwidth limit for the system drive (Windows only) --io-maxiops uint Maximum IOps limit for the system drive (Windows only) diff --git a/docs/reference/commandline/run.md b/docs/reference/commandline/run.md index 6195647012..e57ba4bbea 100644 --- a/docs/reference/commandline/run.md +++ b/docs/reference/commandline/run.md @@ -67,6 +67,8 @@ Options: --health-timeout duration Maximum time to allow one check to run (ns|us|ms|s|m|h) (default 0s) --help Print usage -h, --hostname string Container host name + --init Run an init inside the container that forwards signals and reaps processes + --init-path string Path to the docker-init binary -i, --interactive Keep STDIN open even if not attached --io-maxbandwidth string Maximum IO bandwidth limit for the system drive (Windows only) (Windows only). The format is ``. diff --git a/man/docker-run.1.md b/man/docker-run.1.md index 0022e4d045..8c1018a1e2 100644 --- a/man/docker-run.1.md +++ b/man/docker-run.1.md @@ -41,6 +41,8 @@ docker-run - Run a command in a new container [**--group-add**[=*[]*]] [**-h**|**--hostname**[=*HOSTNAME*]] [**--help**] +[**--init**] +[**--init-path**[=*[]*]] [**-i**|**--interactive**] [**--ip**[=*IPv4-ADDRESS*]] [**--ip6**[=*IPv6-ADDRESS*]] @@ -309,7 +311,13 @@ redirection on the host system. Sets the container host name that is available inside the container. **--help** - Print usage statement + Print usage statement + +**--init** + Run an init inside the container that forwards signals and reaps processes + +**--init-path**="" + Path to the docker-init binary **-i**, **--interactive**=*true*|*false* Keep STDIN open even if not attached. The default is *false*. From 880c12df7d094914dfc49a6a1e0524e4b841968a Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Thu, 19 Jan 2017 08:33:05 -0800 Subject: [PATCH 16/36] Add bash completion for `run|create --init-path` Signed-off-by: Harald Albers (cherry picked from commit 182048f18592259633d21ac55bd5b73903de50b9) Signed-off-by: Victor Vieux --- contrib/completion/bash/docker | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker index df192d488c..8f9871745d 100644 --- a/contrib/completion/bash/docker +++ b/contrib/completion/bash/docker @@ -1327,6 +1327,7 @@ _docker_container_run() { --expose --group-add --hostname -h + --init-path --ip --ip6 --ipc @@ -1439,7 +1440,7 @@ _docker_container_run() { __docker_complete_capabilities return ;; - --cidfile|--env-file|--label-file) + --cidfile|--env-file|--init-path|--label-file) _filedir return ;; From 37be2d4e9b4fb88afbe727e68da3d32bf7e02a88 Mon Sep 17 00:00:00 2001 From: Aaron Lehmann Date: Wed, 18 Jan 2017 18:19:12 -0800 Subject: [PATCH 17/36] distribution: Add text/html and application/json as image mediatypes As noted by #30083, the new strict checking of mediatypes misses some cases where earlier bugs caused nonstandard mediatypes to be stored in manifests. Two of the known cases are text/html and application/json, which were returned by certain registries and stored by earlier versions of Docker. Add special cases for text/html and application/json. Signed-off-by: Aaron Lehmann (cherry picked from commit a215e15cb1fbecc3b22d4f90e15638728ac7ac78) Signed-off-by: Victor Vieux --- distribution/registry.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/distribution/registry.go b/distribution/registry.go index f8bb1ecf65..95e181ded8 100644 --- a/distribution/registry.go +++ b/distribution/registry.go @@ -23,7 +23,11 @@ import ( var ImageTypes = []string{ schema2.MediaTypeImageConfig, // Handle unexpected values from https://github.com/docker/distribution/issues/1621 + // (see also https://github.com/docker/docker/issues/22378, + // https://github.com/docker/docker/issues/30083) "application/octet-stream", + "application/json", + "text/html", // Treat defaulted values as images, newer types cannot be implied "", } From 25810f3f475773684c47f21ca80f6033a797da71 Mon Sep 17 00:00:00 2001 From: Kenfe-Mickael Laventure Date: Fri, 13 Jan 2017 11:06:51 -0800 Subject: [PATCH 18/36] Remove timeout on fifos opening Instead of a timeout the context is cancelled on error to ensure proper cleanup of the associated fifos' goroutines. Signed-off-by: Kenfe-Mickael Laventure (cherry picked from commit c178700a0420118fe7f632af4da1bc43abd3a9bf) Signed-off-by: Victor Vieux --- libcontainerd/client_linux.go | 20 +++++++++++++++++--- libcontainerd/container_unix.go | 11 +++++++++-- libcontainerd/process_unix.go | 5 +---- 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/libcontainerd/client_linux.go b/libcontainerd/client_linux.go index 657eda2c0d..190f981865 100644 --- a/libcontainerd/client_linux.go +++ b/libcontainerd/client_linux.go @@ -45,7 +45,7 @@ func (clnt *client) GetServerVersion(ctx context.Context) (*ServerVersion, error // AddProcess is the handler for adding a process to an already running // container. It's called through docker exec. It returns the system pid of the // exec'd process. -func (clnt *client) AddProcess(ctx context.Context, containerID, processFriendlyName string, specp Process, attachStdio StdioCallback) (int, error) { +func (clnt *client) AddProcess(ctx context.Context, containerID, processFriendlyName string, specp Process, attachStdio StdioCallback) (pid int, err error) { clnt.lock(containerID) defer clnt.unlock(containerID) container, err := clnt.getContainer(containerID) @@ -101,7 +101,14 @@ func (clnt *client) AddProcess(ctx context.Context, containerID, processFriendly Rlimits: convertRlimits(sp.Rlimits), } - iopipe, err := p.openFifos(sp.Terminal) + fifoCtx, cancel := context.WithCancel(context.Background()) + defer func() { + if err != nil { + cancel() + } + }() + + iopipe, err := p.openFifos(fifoCtx, sp.Terminal) if err != nil { return -1, err } @@ -335,7 +342,14 @@ func (clnt *client) restore(cont *containerd.Container, lastEvent *containerd.Ev } } - iopipe, err := container.openFifos(terminal) + fifoCtx, cancel := context.WithCancel(context.Background()) + defer func() { + if err != nil { + cancel() + } + }() + + iopipe, err := container.openFifos(fifoCtx, terminal) if err != nil { return err } diff --git a/libcontainerd/container_unix.go b/libcontainerd/container_unix.go index 1bd6050a72..61bab145f2 100644 --- a/libcontainerd/container_unix.go +++ b/libcontainerd/container_unix.go @@ -90,7 +90,7 @@ func (ctr *container) spec() (*specs.Spec, error) { return &spec, nil } -func (ctr *container) start(checkpoint string, checkpointDir string, attachStdio StdioCallback) error { +func (ctr *container) start(checkpoint string, checkpointDir string, attachStdio StdioCallback) (err error) { spec, err := ctr.spec() if err != nil { return nil @@ -100,7 +100,14 @@ func (ctr *container) start(checkpoint string, checkpointDir string, attachStdio defer cancel() ready := make(chan struct{}) - iopipe, err := ctr.openFifos(spec.Process.Terminal) + fifoCtx, cancel := context.WithCancel(context.Background()) + defer func() { + if err != nil { + cancel() + } + }() + + iopipe, err := ctr.openFifos(fifoCtx, spec.Process.Terminal) if err != nil { return err } diff --git a/libcontainerd/process_unix.go b/libcontainerd/process_unix.go index 514ebf643c..506fca6e11 100644 --- a/libcontainerd/process_unix.go +++ b/libcontainerd/process_unix.go @@ -9,7 +9,6 @@ import ( "path/filepath" goruntime "runtime" "strings" - "time" containerd "github.com/docker/containerd/api/grpc/types" "github.com/tonistiigi/fifo" @@ -31,13 +30,11 @@ type process struct { dir string } -func (p *process) openFifos(terminal bool) (pipe *IOPipe, err error) { +func (p *process) openFifos(ctx context.Context, terminal bool) (pipe *IOPipe, err error) { if err := os.MkdirAll(p.dir, 0700); err != nil { return nil, err } - ctx, _ := context.WithTimeout(context.Background(), 15*time.Second) - io := &IOPipe{} io.Stdin, err = fifo.OpenFifo(ctx, p.fifo(unix.Stdin), unix.O_WRONLY|unix.O_CREAT|unix.O_NONBLOCK, 0700) From 482534ff5fe9899aa4acaeeee2932f836e3117b1 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 8 Dec 2016 12:04:22 +0100 Subject: [PATCH 19/36] Ignore certificate expiry error for top-level inspect The top-level `docker inspect` command could return an error if the nodes Swarm certificates were expired. In situations where the user did not explicitly ask for an object-type (`--type=foo`), we should ignore these errors, and consider them equal to "node is not a swarm manager". This change makes `docker inspect` ignore these errors if no type was specified. As a further optimization, the "swarm status" result is now stored in a variable, so that other swarm-specific API calls can be skipped. Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 66cf4cc7f7942b049e0c99c21b84ab07aa80c777) Signed-off-by: Victor Vieux --- cli/command/system/inspect.go | 92 ++++++++++++++++++++++++++++------- 1 file changed, 74 insertions(+), 18 deletions(-) diff --git a/cli/command/system/inspect.go b/cli/command/system/inspect.go index f7172ae3c6..c86e858a29 100644 --- a/cli/command/system/inspect.go +++ b/cli/command/system/inspect.go @@ -103,22 +103,58 @@ func inspectPlugin(ctx context.Context, dockerCli *command.DockerCli) inspect.Ge func inspectAll(ctx context.Context, dockerCli *command.DockerCli, getSize bool, typeConstraint string) inspect.GetRefFunc { var inspectAutodetect = []struct { - ObjectType string - IsSizeSupported bool - ObjectInspector func(string) (interface{}, []byte, error) + objectType string + isSizeSupported bool + isSwarmObject bool + objectInspector func(string) (interface{}, []byte, error) }{ - {"container", true, inspectContainers(ctx, dockerCli, getSize)}, - {"image", false, inspectImages(ctx, dockerCli)}, - {"network", false, inspectNetwork(ctx, dockerCli)}, - {"volume", false, inspectVolume(ctx, dockerCli)}, - {"service", false, inspectService(ctx, dockerCli)}, - {"task", false, inspectTasks(ctx, dockerCli)}, - {"node", false, inspectNode(ctx, dockerCli)}, - {"plugin", false, inspectPlugin(ctx, dockerCli)}, + { + objectType: "container", + isSizeSupported: true, + objectInspector: inspectContainers(ctx, dockerCli, getSize), + }, + { + objectType: "image", + objectInspector: inspectImages(ctx, dockerCli), + }, + { + objectType: "network", + objectInspector: inspectNetwork(ctx, dockerCli), + }, + { + objectType: "volume", + objectInspector: inspectVolume(ctx, dockerCli), + }, + { + objectType: "service", + isSwarmObject: true, + objectInspector: inspectService(ctx, dockerCli), + }, + { + objectType: "task", + isSwarmObject: true, + objectInspector: inspectTasks(ctx, dockerCli), + }, + { + objectType: "node", + isSwarmObject: true, + objectInspector: inspectNode(ctx, dockerCli), + }, + { + objectType: "plugin", + objectInspector: inspectPlugin(ctx, dockerCli), + }, } - isErrNotSwarmManager := func(err error) bool { - return strings.Contains(err.Error(), "This node is not a swarm manager") + // isSwarmManager does an Info API call to verify that the daemon is + // a swarm manager. + isSwarmManager := func() bool { + info, err := dockerCli.Client().Info(ctx) + if err != nil { + fmt.Fprintln(dockerCli.Err(), err) + return false + } + return info.Swarm.ControlAvailable } isErrNotSupported := func(err error) bool { @@ -126,19 +162,39 @@ func inspectAll(ctx context.Context, dockerCli *command.DockerCli, getSize bool, } return func(ref string) (interface{}, []byte, error) { + const ( + swarmSupportUnknown = iota + swarmSupported + swarmUnsupported + ) + + isSwarmSupported := swarmSupportUnknown + for _, inspectData := range inspectAutodetect { - if typeConstraint != "" && inspectData.ObjectType != typeConstraint { + if typeConstraint != "" && inspectData.objectType != typeConstraint { continue } - v, raw, err := inspectData.ObjectInspector(ref) + if typeConstraint == "" && inspectData.isSwarmObject { + if isSwarmSupported == swarmSupportUnknown { + if isSwarmManager() { + isSwarmSupported = swarmSupported + } else { + isSwarmSupported = swarmUnsupported + } + } + if isSwarmSupported == swarmUnsupported { + continue + } + } + v, raw, err := inspectData.objectInspector(ref) if err != nil { - if typeConstraint == "" && (apiclient.IsErrNotFound(err) || isErrNotSwarmManager(err) || isErrNotSupported(err)) { + if typeConstraint == "" && (apiclient.IsErrNotFound(err) || isErrNotSupported(err)) { continue } return v, raw, err } - if getSize && !inspectData.IsSizeSupported { - fmt.Fprintf(dockerCli.Err(), "WARNING: --size ignored for %s\n", inspectData.ObjectType) + if getSize && !inspectData.isSizeSupported { + fmt.Fprintf(dockerCli.Err(), "WARNING: --size ignored for %s\n", inspectData.objectType) } return v, raw, err } From 2dd2ac2c14f89a7990973332bebb73cef3597459 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= Date: Wed, 16 Nov 2016 00:07:13 +0200 Subject: [PATCH 20/36] do not require custom build of tini MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/krallin/tini/issues/55#issuecomment-260507562 https://github.com/krallin/tini/issues/55#issuecomment-260538243 https://github.com/docker/docker/pull/28037 Signed-off-by: Elan Ruusamäe (cherry picked from commit d7df7315971653e11bab124800a5938e7e5c6316) Signed-off-by: Victor Vieux --- daemon/oci_linux.go | 2 +- hack/dockerfile/install-binaries.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/daemon/oci_linux.go b/daemon/oci_linux.go index 1daefc587b..a72b0b873d 100644 --- a/daemon/oci_linux.go +++ b/daemon/oci_linux.go @@ -581,7 +581,7 @@ func (daemon *Daemon) populateCommonSpec(s *specs.Spec, c *container.Container) if c.HostConfig.PidMode.IsPrivate() { if (c.HostConfig.Init != nil && *c.HostConfig.Init) || (c.HostConfig.Init == nil && daemon.configStore.Init) { - s.Process.Args = append([]string{"/dev/init", c.Path}, c.Args...) + s.Process.Args = append([]string{"/dev/init", "--", c.Path}, c.Args...) var path string if daemon.configStore.InitPath == "" && c.HostConfig.InitPath == "" { path, err = exec.LookPath(DefaultInitBinary) diff --git a/hack/dockerfile/install-binaries.sh b/hack/dockerfile/install-binaries.sh index bd4c63c645..7c1984b0d2 100755 --- a/hack/dockerfile/install-binaries.sh +++ b/hack/dockerfile/install-binaries.sh @@ -77,7 +77,7 @@ do git clone https://github.com/krallin/tini.git "$GOPATH/tini" cd "$GOPATH/tini" git checkout -q "$TINI_COMMIT" - cmake -DMINIMAL=ON . + cmake . make tini-static cp tini-static /usr/local/bin/docker-init ;; From e9779fd7df2d84d90477a0e714e77a24b5f7acfa Mon Sep 17 00:00:00 2001 From: Anusha Ragunathan Date: Fri, 13 Jan 2017 14:03:51 -0800 Subject: [PATCH 21/36] Fix pluginv1 Windows volumes c54b717 caused a regression for pluginv1 on Windows, where extraneous backslashes were added to BasePath of the plugin. For pluginv1 on windows, BasePath() should return an empty string, since the plugin is fully aware of the mount path. Also, unlike Linux where all paths are relative to "/", Windows paths are dependent on system drives and mapped drives. Fixes #30148 Signed-off-by: Anusha Ragunathan (cherry picked from commit 0ef21eb0e30d2ea036730a7c5502f888c6b763d1) Signed-off-by: Victor Vieux --- pkg/plugins/plugins.go | 6 ------ pkg/plugins/plugins_linux.go | 7 +++++++ pkg/plugins/plugins_windows.go | 8 ++++++++ 3 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 pkg/plugins/plugins_linux.go create mode 100644 pkg/plugins/plugins_windows.go diff --git a/pkg/plugins/plugins.go b/pkg/plugins/plugins.go index 861daa3207..e60e0ee97b 100644 --- a/pkg/plugins/plugins.go +++ b/pkg/plugins/plugins.go @@ -78,12 +78,6 @@ type Plugin struct { handlersRun bool } -// BasePath returns the path to which all paths returned by the plugin are relative to. -// For v1 plugins, this always returns the host's root directory. -func (p *Plugin) BasePath() string { - return "/" -} - // Name returns the name of the plugin. func (p *Plugin) Name() string { return p.name diff --git a/pkg/plugins/plugins_linux.go b/pkg/plugins/plugins_linux.go new file mode 100644 index 0000000000..9c5a0b5632 --- /dev/null +++ b/pkg/plugins/plugins_linux.go @@ -0,0 +1,7 @@ +package plugins + +// BasePath returns the path to which all paths returned by the plugin are relative to. +// For v1 plugins, this always returns the host's root directory. +func (p *Plugin) BasePath() string { + return "/" +} diff --git a/pkg/plugins/plugins_windows.go b/pkg/plugins/plugins_windows.go new file mode 100644 index 0000000000..3c8d8feb83 --- /dev/null +++ b/pkg/plugins/plugins_windows.go @@ -0,0 +1,8 @@ +package plugins + +// BasePath returns the path to which all paths returned by the plugin are relative to. +// For Windows v1 plugins, this returns an empty string, since the plugin is already aware +// of the absolute path of the mount. +func (p *Plugin) BasePath() string { + return "" +} From b0970b629b9792af87abe992065a962f9dbfa735 Mon Sep 17 00:00:00 2001 From: Doug Davis Date: Tue, 29 Nov 2016 07:38:07 -0800 Subject: [PATCH 22/36] Only show global warnings once Upon each container create I'm seeing these warning **every** time in the daemon output: ``` WARN[0002] Your kernel does not support swap memory limit WARN[0002] Your kernel does not support cgroup rt period WARN[0002] Your kernel does not support cgroup rt runtime ``` Showing them for each container.create() fills up the logs and encourages people to ignore the output being generated - which means its less likely they'll see real issues when they happen. In short, I don't think we need to show these warnings more than once, so let's only show these warnings at daemon start-up time. Signed-off-by: Doug Davis (cherry picked from commit ff42a2eb41a86217a440a1c4b2afd3c4cd1d48ac) Signed-off-by: Victor Vieux --- daemon/daemon_unix.go | 2 +- pkg/sysinfo/sysinfo_linux.go | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/daemon/daemon_unix.go b/daemon/daemon_unix.go index 56e980df46..72ead4ca16 100644 --- a/daemon/daemon_unix.go +++ b/daemon/daemon_unix.go @@ -1198,7 +1198,7 @@ func (daemon *Daemon) initCgroupsPath(path string) error { } path = filepath.Join(root, path) - sysinfo := sysinfo.New(false) + sysinfo := sysinfo.New(true) if err := os.MkdirAll(path, 0755); err != nil && !os.IsExist(err) { return err } diff --git a/pkg/sysinfo/sysinfo_linux.go b/pkg/sysinfo/sysinfo_linux.go index 5823ff9e80..7ad84a8309 100644 --- a/pkg/sysinfo/sysinfo_linux.go +++ b/pkg/sysinfo/sysinfo_linux.go @@ -82,23 +82,23 @@ func checkCgroupMem(cgMounts map[string]string, quiet bool) cgroupMemInfo { swapLimit := cgroupEnabled(mountPoint, "memory.memsw.limit_in_bytes") if !quiet && !swapLimit { - logrus.Warn("Your kernel does not support swap memory limit.") + logrus.Warn("Your kernel does not support swap memory limit") } memoryReservation := cgroupEnabled(mountPoint, "memory.soft_limit_in_bytes") if !quiet && !memoryReservation { - logrus.Warn("Your kernel does not support memory reservation.") + logrus.Warn("Your kernel does not support memory reservation") } oomKillDisable := cgroupEnabled(mountPoint, "memory.oom_control") if !quiet && !oomKillDisable { - logrus.Warn("Your kernel does not support oom control.") + logrus.Warn("Your kernel does not support oom control") } memorySwappiness := cgroupEnabled(mountPoint, "memory.swappiness") if !quiet && !memorySwappiness { - logrus.Warn("Your kernel does not support memory swappiness.") + logrus.Warn("Your kernel does not support memory swappiness") } kernelMemory := cgroupEnabled(mountPoint, "memory.kmem.limit_in_bytes") if !quiet && !kernelMemory { - logrus.Warn("Your kernel does not support kernel memory limit.") + logrus.Warn("Your kernel does not support kernel memory limit") } return cgroupMemInfo{ From b875349fefdcc5a126ab2b7716a088924624888e Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 3 Jan 2017 14:54:30 +0100 Subject: [PATCH 23/36] do not create init-dir if not needed commit 56f77d5ade945b3b8816a6c8acb328b7c6dce9a7 added support for cpu-rt-period and cpu-rt-runtime, but always initialized the cgroup path, even if not used. As a result, containers failed to start on a read-only filesystem. This patch only creates the cgroup path if one of these options is set. Signed-off-by: Sebastiaan van Stijn (cherry picked from commit f285d5b3e8eeea7d85e143d845e85a4d4e4c936a) Signed-off-by: Victor Vieux --- daemon/daemon_unix.go | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/daemon/daemon_unix.go b/daemon/daemon_unix.go index 72ead4ca16..5b3ffeb72d 100644 --- a/daemon/daemon_unix.go +++ b/daemon/daemon_unix.go @@ -1190,6 +1190,12 @@ func (daemon *Daemon) initCgroupsPath(path string) error { return nil } + if daemon.configStore.CPURealtimePeriod == 0 && daemon.configStore.CPURealtimeRuntime == 0 { + return nil + } + + // Recursively create cgroup to ensure that the system and all parent cgroups have values set + // for the period and runtime as this limits what the children can be set to. daemon.initCgroupsPath(filepath.Dir(path)) _, root, err := cgroups.FindCgroupMountpointAndRoot("cpu") @@ -1199,15 +1205,18 @@ func (daemon *Daemon) initCgroupsPath(path string) error { path = filepath.Join(root, path) sysinfo := sysinfo.New(true) - if err := os.MkdirAll(path, 0755); err != nil && !os.IsExist(err) { - return err - } if sysinfo.CPURealtimePeriod && daemon.configStore.CPURealtimePeriod != 0 { + if err := os.MkdirAll(path, 0755); err != nil && !os.IsExist(err) { + return err + } if err := ioutil.WriteFile(filepath.Join(path, "cpu.rt_period_us"), []byte(strconv.FormatInt(daemon.configStore.CPURealtimePeriod, 10)), 0700); err != nil { return err } } if sysinfo.CPURealtimeRuntime && daemon.configStore.CPURealtimeRuntime != 0 { + if err := os.MkdirAll(path, 0755); err != nil && !os.IsExist(err) { + return err + } if err := ioutil.WriteFile(filepath.Join(path, "cpu.rt_runtime_us"), []byte(strconv.FormatInt(daemon.configStore.CPURealtimeRuntime, 10)), 0700); err != nil { return err } From e9751047e94419d833af4c4f72e25f5d1c040489 Mon Sep 17 00:00:00 2001 From: Brian Goff Date: Tue, 24 Jan 2017 11:08:13 -0500 Subject: [PATCH 24/36] Fix deadlock on v1 plugin with activate error When a plugin has an activation error, it was not being checked in the `waitActive` loop. This means it will just wait forever for a manifest to be populated even though it may never come. Signed-off-by: Brian Goff (cherry picked from commit f2d384fca6fa08da13fdc01c7991e8e35b081198) Signed-off-by: Victor Vieux --- pkg/plugins/plugin_test.go | 7 +++++++ pkg/plugins/plugins.go | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pkg/plugins/plugin_test.go b/pkg/plugins/plugin_test.go index ac810565f7..b19c0d52f1 100644 --- a/pkg/plugins/plugin_test.go +++ b/pkg/plugins/plugin_test.go @@ -1,6 +1,7 @@ package plugins import ( + "errors" "path/filepath" "runtime" "sync" @@ -20,6 +21,12 @@ func TestPluginAddHandler(t *testing.T) { testActive(t, p) } +func TestPluginWaitBadPlugin(t *testing.T) { + p := &Plugin{activateWait: sync.NewCond(&sync.Mutex{})} + p.activateErr = errors.New("some junk happened") + testActive(t, p) +} + func testActive(t *testing.T, p *Plugin) { done := make(chan struct{}) go func() { diff --git a/pkg/plugins/plugins.go b/pkg/plugins/plugins.go index e60e0ee97b..c0059cba75 100644 --- a/pkg/plugins/plugins.go +++ b/pkg/plugins/plugins.go @@ -169,7 +169,7 @@ func (p *Plugin) activateWithLock() error { func (p *Plugin) waitActive() error { p.activateWait.L.Lock() - for !p.activated() { + for !p.activated() && p.activateErr == nil { p.activateWait.Wait() } p.activateWait.L.Unlock() From b194252d80344d245e1912bbb478b4c542805a21 Mon Sep 17 00:00:00 2001 From: Yong Tang Date: Thu, 19 Jan 2017 10:17:56 -0800 Subject: [PATCH 25/36] Fix failure in `docker ps --format` when `.Label` has args This fix tries to fix the issue in 30279 where `docker ps --format` fails if `.Label` has args. For example: ``` docker ps --format '{{.ID}}\t{{.Names}}\t{{.Label "some.label"}}' ``` The reason for the failure is that during the preprocessing phase to detect the existance of `.Size`, the `listOptionsProcessor` does not has a method of `Label(name string) string`. This results in the failure of ``` template: :1:24: executing "" at <.Label>: Label is not a method but has arguments ``` This fix fixes the issue by adding needed method of `Label(name string) string`. This fix fixes 30279. Signed-off-by: Yong Tang (cherry picked from commit 2cd4ba1e56222a938b2edaa7ad7981c9a2bc248f) Signed-off-by: Victor Vieux --- cli/command/container/list.go | 6 ++++++ integration-cli/docker_cli_ps_test.go | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/cli/command/container/list.go b/cli/command/container/list.go index 60c2462986..5bbf41966d 100644 --- a/cli/command/container/list.go +++ b/cli/command/container/list.go @@ -74,6 +74,12 @@ func (o listOptionsProcessor) Size() bool { return true } +// Label is needed here as it allows the correct pre-processing +// because Label() is a method with arguments +func (o listOptionsProcessor) Label(name string) string { + return "" +} + func buildContainerListOptions(opts *psOptions) (*types.ContainerListOptions, error) { options := &types.ContainerListOptions{ All: opts.all, diff --git a/integration-cli/docker_cli_ps_test.go b/integration-cli/docker_cli_ps_test.go index f3bdb39d00..19ede90d5a 100644 --- a/integration-cli/docker_cli_ps_test.go +++ b/integration-cli/docker_cli_ps_test.go @@ -943,3 +943,10 @@ func (s *DockerSuite) TestPsFilterMissingArgErrorCode(c *check.C) { _, errCode, _ := dockerCmdWithError("ps", "--filter") c.Assert(errCode, checker.Equals, 125) } + +// Test case for 30291 +func (s *DockerSuite) TestPsFormatTemplateWithArg(c *check.C) { + runSleepingContainer(c, "-d", "--name", "top", "--label", "some.label=label.foo-bar") + out, _ := dockerCmd(c, "ps", "--format", `{{.Names}} {{.Label "some.label"}}`) + c.Assert(strings.TrimSpace(out), checker.Equals, "top label.foo-bar") +} From 06dae4eae58a3356812243bf62db9fd39c0dbccd Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Mon, 23 Jan 2017 19:35:55 +0100 Subject: [PATCH 26/36] Fix bash completion for completing nodes Signed-off-by: Harald Albers (cherry picked from commit 550947e437fab42a0b661bad5cb2645f61861aa1) Signed-off-by: Victor Vieux --- contrib/completion/bash/docker | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker index 8f9871745d..b746030bf6 100644 --- a/contrib/completion/bash/docker +++ b/contrib/completion/bash/docker @@ -361,18 +361,33 @@ __docker_complete_stacks() { # An optional first option `--id|--name` may be used to limit the # output to the IDs or names of matching items. This setting takes # precedence over the environment setting. +# Completions may be added with `--add`, e.g. `--add self`. __docker_nodes() { + local add=() local fields='$2' # default: node name only [ "${DOCKER_COMPLETION_SHOW_NODE_IDS}" = yes ] && fields='$1,$2' # ID and name - if [ "$1" = "--id" ] ; then - fields='$1' # IDs only - shift - elif [ "$1" = "--name" ] ; then - fields='$2' # names only - shift - fi - __docker_q node ls "$@" | tr -d '*' | awk "NR>1 {print $fields}" + while true ; do + case "$1" in + --id) + fields='$1' # IDs only + shift + ;; + --name) + fields='$2' # names only + shift + ;; + --add) + add+=("$2") + shift 2 + ;; + *) + break + ;; + esac + done + + echo $(__docker_q node ls "$@" | tr -d '*' | awk "NR>1 {print $fields}") "${add[@]}" } # __docker_complete_nodes applies completion of nodes based on the current @@ -388,8 +403,7 @@ __docker_complete_nodes() { } __docker_complete_nodes_plus_self() { - __docker_complete_nodes "$@" - COMPREPLY+=( self ) + __docker_complete_nodes --add self "$@" } # __docker_services returns a list of all services. Additional options to From cbe678150149d95ee8880fc0be4145c8da158974 Mon Sep 17 00:00:00 2001 From: Tibor Vass Date: Thu, 19 Jan 2017 12:25:16 -0800 Subject: [PATCH 27/36] plugins: add example docs for a rexray plugin Signed-off-by: Tibor Vass (cherry picked from commit 5f713cecc5f65ea61db5b5362f26f96de9427eb0) Signed-off-by: Victor Vieux --- docs/extend/EBS_volume.md | 164 ++++++++++++++++++++++++++++++++++++++ docs/extend/index.md | 4 +- 2 files changed, 166 insertions(+), 2 deletions(-) create mode 100644 docs/extend/EBS_volume.md diff --git a/docs/extend/EBS_volume.md b/docs/extend/EBS_volume.md new file mode 100644 index 0000000000..8c64efa164 --- /dev/null +++ b/docs/extend/EBS_volume.md @@ -0,0 +1,164 @@ +--- +description: Volume plugin for Amazon EBS +keywords: "API, Usage, plugins, documentation, developer, amazon, ebs, rexray, volume" +title: Volume plugin for Amazon EBS +--- + + + +# A proof-of-concept Rexray plugin + +In this example, a simple Rexray plugin will be created for the purposes of using +it on an Amazon EC2 instance with EBS. It is not meant to be a complete Rexray plugin. + +The example source is available at [https://github.com/tiborvass/rexray-plugin](https://github.com/tiborvass/rexray-plugin). + +To learn more about Rexray: [https://github.com/codedellemc/rexray](https://github.com/codedellemc/rexray) + +## 1. Make a Docker image + +The following is the Dockerfile used to containerize rexray. + +```Dockerfile +FROM debian:jessie +RUN apt-get update && apt-get install -y --no-install-recommends wget ca-certificates +RUN wget https://dl.bintray.com/emccode/rexray/stable/0.6.4/rexray-Linux-x86_64-0.6.4.tar.gz -O rexray.tar.gz && tar -xvzf rexray.tar.gz -C /usr/bin && rm rexray.tar.gz +RUN mkdir -p /run/docker/plugins /var/lib/libstorage/volumes +ENTRYPOINT ["rexray"] +CMD ["--help"] +``` + +To build it you can run `image=$(cat Dockerfile | docker build -q -)` and `$image` +will reference the containerized rexray image. + +## 2. Extract rootfs + +```sh +$ TMPDIR=/tmp/rexray # for the purpose of this example +$ # create container without running it, to extract the rootfs from image +$ docker create --name rexray "$image" +$ # save the rootfs to a tar archive +$ docker export -o $TMPDIR/rexray.tar rexray +$ # extract rootfs from tar archive to a rootfs folder +$ ( mkdir -p $TMPDIR/rootfs; cd $TMPDIR/rootfs; tar xf ../rexray.tar ) +``` + +## 3. Add plugin configuration + +We have to put the following JSON to `$TMPDIR/config.json`: + +```json +{ + "Args": { + "Description": "", + "Name": "", + "Settable": null, + "Value": null + }, + "Description": "A proof-of-concept EBS plugin (using rexray) for Docker", + "Documentation": "https://github.com/tiborvass/rexray-plugin", + "Entrypoint": [ + "/usr/bin/rexray", "service", "start", "-f" + ], + "Env": [ + { + "Description": "", + "Name": "REXRAY_SERVICE", + "Settable": [ + "value" + ], + "Value": "ebs" + }, + { + "Description": "", + "Name": "EBS_ACCESSKEY", + "Settable": [ + "value" + ], + "Value": "" + }, + { + "Description": "", + "Name": "EBS_SECRETKEY", + "Settable": [ + "value" + ], + "Value": "" + } + ], + "Interface": { + "Socket": "rexray.sock", + "Types": [ + "docker.volumedriver/1.0" + ] + }, + "Linux": { + "AllowAllDevices": true, + "Capabilities": ["CAP_SYS_ADMIN"], + "Devices": null + }, + "Mounts": [ + { + "Source": "/dev", + "Destination": "/dev", + "Type": "bind", + "Options": ["rbind"] + } + ], + "Network": { + "Type": "host" + }, + "PropagatedMount": "/var/lib/libstorage/volumes", + "User": {}, + "WorkDir": "" +} +``` + +Please note a couple of points: +- `PropagatedMount` is needed so that the docker daemon can see mounts done by the +rexray plugin from within the container, otherwise the docker daemon is not able +to mount a docker volume. +- The rexray plugin needs dynamic access to host devices. For that reason, we +have to give it access to all devices under `/dev` and set `AllowAllDevices` to +true for proper access. +- The user of this simple plugin can change only 3 settings: `REXRAY_SERVICE`, +`EBS_ACCESSKEY` and `EBS_SECRETKEY`. This is because of the reduced scope of this +plugin. Ideally other rexray parameters could also be set. + +## 4. Create plugin + +`docker plugin create tiborvass/rexray-plugin "$TMPDIR"` will create the plugin. + +```sh +$ docker plugin ls +ID NAME DESCRIPTION ENABLED +2475a4bd0ca5 tiborvass/rexray-plugin:latest A rexray volume plugin for Docker false +``` + +## 5. Test plugin + +```sh +$ docker plugin set tiborvass/rexray-plugin EBS_ACCESSKEY=$AWS_ACCESSKEY EBS_SECRETKEY=$AWS_SECRETKEY` +$ docker plugin enable tiborvass/rexray-plugin +$ docker volume create -d tiborvass/rexray-plugin my-ebs-volume +$ docker volume ls +DRIVER VOLUME NAME +tiborvass/rexray-plugin:latest my-ebs-volume +$ docker run --rm -v my-ebs-volume:/volume busybox sh -c 'echo bye > /volume/hi' +$ docker run --rm -v my-ebs-volume:/volume busybox cat /volume/hi +bye +``` + +## 6. Push plugin + +First, ensure you are logged in with `docker login`. Then you can run: +`docker plugin push tiborvass/rexray-plugin` to push it like a regular docker +image to a registry, to make it available for others to install via +`docker plugin install tiborvass/rexray-plugin EBS_ACCESSKEY=$AWS_ACCESSKEY EBS_SECRETKEY=$AWS_SECRETKEY`. diff --git a/docs/extend/index.md b/docs/extend/index.md index e7a62ba758..2687fd4311 100644 --- a/docs/extend/index.md +++ b/docs/extend/index.md @@ -154,7 +154,7 @@ This plugin is a volume driver. It requires a `host` network and the entrypoint and uses the `/run/docker/plugins/sshfs.sock` socket to communicate with Docker Engine. This plugin has no runtime parameters. -### Creating the plugin +#### Creating the plugin A new plugin can be created by running `docker plugin create ./path/to/plugin/data` where the plugin @@ -163,4 +163,4 @@ in subdirectory `rootfs`. After that the plugin `` will show up in `docker plugin ls`. Plugins can be pushed to remote registries with -`docker plugin push `. \ No newline at end of file +`docker plugin push `. From 6b4a835431e33be89fa2855eb0e3eeecc01f50ac Mon Sep 17 00:00:00 2001 From: Christopher Jones Date: Mon, 5 Dec 2016 11:57:59 -0500 Subject: [PATCH 28/36] [project] bump go to go 1.7.4 Signed-off-by: Christopher Jones (cherry picked from commit 20e243780ef3b6a7d1debca6279e06b003895121) Signed-off-by: Victor Vieux --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- Dockerfile.ppc64le | 2 +- Dockerfile.s390x | 2 +- Dockerfile.simple | 2 +- Dockerfile.windows | 2 +- contrib/builder/deb/aarch64/ubuntu-trusty/Dockerfile | 2 +- contrib/builder/deb/aarch64/ubuntu-xenial/Dockerfile | 2 +- contrib/builder/deb/amd64/debian-jessie/Dockerfile | 2 +- contrib/builder/deb/amd64/debian-stretch/Dockerfile | 2 +- contrib/builder/deb/amd64/debian-wheezy/Dockerfile | 2 +- contrib/builder/deb/amd64/ubuntu-precise/Dockerfile | 2 +- contrib/builder/deb/amd64/ubuntu-trusty/Dockerfile | 2 +- contrib/builder/deb/amd64/ubuntu-xenial/Dockerfile | 2 +- contrib/builder/deb/amd64/ubuntu-yakkety/Dockerfile | 2 +- contrib/builder/deb/armhf/debian-jessie/Dockerfile | 2 +- contrib/builder/deb/armhf/raspbian-jessie/Dockerfile | 2 +- contrib/builder/deb/armhf/ubuntu-trusty/Dockerfile | 2 +- contrib/builder/deb/armhf/ubuntu-xenial/Dockerfile | 2 +- contrib/builder/deb/armhf/ubuntu-yakkety/Dockerfile | 2 +- contrib/builder/deb/ppc64le/ubuntu-trusty/Dockerfile | 2 +- contrib/builder/deb/ppc64le/ubuntu-xenial/Dockerfile | 2 +- contrib/builder/deb/ppc64le/ubuntu-yakkety/Dockerfile | 2 +- contrib/builder/deb/s390x/ubuntu-xenial/Dockerfile | 2 +- contrib/builder/rpm/amd64/centos-7/Dockerfile | 2 +- contrib/builder/rpm/amd64/fedora-24/Dockerfile | 2 +- contrib/builder/rpm/amd64/fedora-25/Dockerfile | 2 +- contrib/builder/rpm/amd64/opensuse-13.2/Dockerfile | 2 +- contrib/builder/rpm/amd64/oraclelinux-6/Dockerfile | 2 +- contrib/builder/rpm/amd64/oraclelinux-7/Dockerfile | 2 +- contrib/builder/rpm/amd64/photon-1.0/Dockerfile | 2 +- 32 files changed, 32 insertions(+), 32 deletions(-) diff --git a/Dockerfile b/Dockerfile index fdd819771e..9077449a25 100644 --- a/Dockerfile +++ b/Dockerfile @@ -126,7 +126,7 @@ RUN set -x \ # IMPORTANT: If the version of Go is updated, the Windows to Linux CI machines # will need updating, to avoid errors. Ping #docker-maintainers on IRC # with a heads-up. -ENV GO_VERSION 1.7.3 +ENV GO_VERSION 1.7.4 RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" \ | tar -xzC /usr/local diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index ce03d8db4a..a4e137f069 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -97,7 +97,7 @@ RUN set -x \ # so we use gccgo as bootstrap to build Go from source code. # We don't use the official ARMv6 released binaries as a GOROOT_BOOTSTRAP, because # not all ARM64 platforms support 32-bit mode. 32-bit mode is optional for ARMv8. -ENV GO_VERSION 1.7.3 +ENV GO_VERSION 1.7.4 RUN mkdir /usr/src/go && curl -fsSL https://golang.org/dl/go${GO_VERSION}.src.tar.gz | tar -v -C /usr/src/go -xz --strip-components=1 \ && cd /usr/src/go/src \ && GOOS=linux GOARCH=arm64 GOROOT_BOOTSTRAP="$(go env GOROOT)" ./make.bash diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 8b3a9cc68e..de35b7effa 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -72,7 +72,7 @@ RUN cd /usr/local/lvm2 \ # See https://git.fedorahosted.org/cgit/lvm2.git/tree/INSTALL # Install Go -ENV GO_VERSION 1.7.3 +ENV GO_VERSION 1.7.4 RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" \ | tar -xzC /usr/local ENV PATH /go/bin:/usr/local/go/bin:$PATH diff --git a/Dockerfile.ppc64le b/Dockerfile.ppc64le index bf1e539d1a..dd73ed2ec8 100644 --- a/Dockerfile.ppc64le +++ b/Dockerfile.ppc64le @@ -98,7 +98,7 @@ RUN set -x \ # ppc64le doesn't have official go binaries, so use the version of go installed from the image # to build go from source. # NOTE: ppc64le has compatibility issues with older versions of go, so make sure the version >= 1.6 -ENV GO_VERSION 1.7.3 +ENV GO_VERSION 1.7.4 ENV GO_DOWNLOAD_URL https://golang.org/dl/go${GO_VERSION}.src.tar.gz RUN set -x \ diff --git a/Dockerfile.s390x b/Dockerfile.s390x index 6baa3a160a..bc49db7d79 100644 --- a/Dockerfile.s390x +++ b/Dockerfile.s390x @@ -97,7 +97,7 @@ RUN cd /usr/local/lvm2 \ && make install_device-mapper # See https://git.fedorahosted.org/cgit/lvm2.git/tree/INSTALL -ENV GO_VERSION 1.7.3 +ENV GO_VERSION 1.7.4 RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-s390x.tar.gz" \ | tar -xzC /usr/local diff --git a/Dockerfile.simple b/Dockerfile.simple index 289d2f596b..226c1125d4 100644 --- a/Dockerfile.simple +++ b/Dockerfile.simple @@ -55,7 +55,7 @@ RUN set -x \ # IMPORTANT: If the version of Go is updated, the Windows to Linux CI machines # will need updating, to avoid errors. Ping #docker-maintainers on IRC # with a heads-up. -ENV GO_VERSION 1.7.3 +ENV GO_VERSION 1.7.4 RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" \ | tar -xzC /usr/local ENV PATH /go/bin:/usr/local/go/bin:$PATH diff --git a/Dockerfile.windows b/Dockerfile.windows index 3e6fd83418..c20448de29 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -165,7 +165,7 @@ SHELL ["powershell", "-command"] # Environment variable notes: # - GO_VERSION must be consistent with 'Dockerfile' used by Linux. # - FROM_DOCKERFILE is used for detection of building within a container. -ENV GO_VERSION=1.7.3 ` +ENV GO_VERSION=1.7.4 ` GIT_VERSION=2.10.2 ` GOPATH=C:\go ` FROM_DOCKERFILE=1 diff --git a/contrib/builder/deb/aarch64/ubuntu-trusty/Dockerfile b/contrib/builder/deb/aarch64/ubuntu-trusty/Dockerfile index ad591b7883..89ab41b0dd 100644 --- a/contrib/builder/deb/aarch64/ubuntu-trusty/Dockerfile +++ b/contrib/builder/deb/aarch64/ubuntu-trusty/Dockerfile @@ -11,7 +11,7 @@ RUN update-alternatives --install /usr/bin/go go /usr/lib/go-1.6/bin/go 100 # Install Go # aarch64 doesn't have official go binaries, so use the version of go installed from # the image to build go from source. -ENV GO_VERSION 1.7.3 +ENV GO_VERSION 1.7.4 RUN mkdir /usr/src/go && curl -fsSL https://golang.org/dl/go${GO_VERSION}.src.tar.gz | tar -v -C /usr/src/go -xz --strip-components=1 \ && cd /usr/src/go/src \ && GOOS=linux GOARCH=arm64 GOROOT_BOOTSTRAP="$(go env GOROOT)" ./make.bash diff --git a/contrib/builder/deb/aarch64/ubuntu-xenial/Dockerfile b/contrib/builder/deb/aarch64/ubuntu-xenial/Dockerfile index d4ad0e1f46..67d1214bd3 100644 --- a/contrib/builder/deb/aarch64/ubuntu-xenial/Dockerfile +++ b/contrib/builder/deb/aarch64/ubuntu-xenial/Dockerfile @@ -9,7 +9,7 @@ RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools bu # Install Go # aarch64 doesn't have official go binaries, so use the version of go installed from # the image to build go from source. -ENV GO_VERSION 1.7.3 +ENV GO_VERSION 1.7.4 RUN mkdir /usr/src/go && curl -fsSL https://golang.org/dl/go${GO_VERSION}.src.tar.gz | tar -v -C /usr/src/go -xz --strip-components=1 \ && cd /usr/src/go/src \ && GOOS=linux GOARCH=arm64 GOROOT_BOOTSTRAP="$(go env GOROOT)" ./make.bash diff --git a/contrib/builder/deb/amd64/debian-jessie/Dockerfile b/contrib/builder/deb/amd64/debian-jessie/Dockerfile index ce34b6f24c..e3cd89eb84 100644 --- a/contrib/builder/deb/amd64/debian-jessie/Dockerfile +++ b/contrib/builder/deb/amd64/debian-jessie/Dockerfile @@ -10,7 +10,7 @@ RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libsqlite3-dev pkg-config vim-common libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.7.3 +ENV GO_VERSION 1.7.4 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local ENV PATH $PATH:/usr/local/go/bin diff --git a/contrib/builder/deb/amd64/debian-stretch/Dockerfile b/contrib/builder/deb/amd64/debian-stretch/Dockerfile index 8dbe05cb3e..938548a197 100644 --- a/contrib/builder/deb/amd64/debian-stretch/Dockerfile +++ b/contrib/builder/deb/amd64/debian-stretch/Dockerfile @@ -10,7 +10,7 @@ RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev libsqlite3-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.7.3 +ENV GO_VERSION 1.7.4 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local ENV PATH $PATH:/usr/local/go/bin diff --git a/contrib/builder/deb/amd64/debian-wheezy/Dockerfile b/contrib/builder/deb/amd64/debian-wheezy/Dockerfile index 24645d216a..75369c25b2 100644 --- a/contrib/builder/deb/amd64/debian-wheezy/Dockerfile +++ b/contrib/builder/deb/amd64/debian-wheezy/Dockerfile @@ -12,7 +12,7 @@ RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list.d RUN apt-get update && apt-get install -y -t wheezy-backports btrfs-tools --no-install-recommends && rm -rf /var/lib/apt/lists/* RUN apt-get update && apt-get install -y apparmor bash-completion build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libsqlite3-dev pkg-config vim-common --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.7.3 +ENV GO_VERSION 1.7.4 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local ENV PATH $PATH:/usr/local/go/bin diff --git a/contrib/builder/deb/amd64/ubuntu-precise/Dockerfile b/contrib/builder/deb/amd64/ubuntu-precise/Dockerfile index 3a2f5709f6..f89d769f6b 100644 --- a/contrib/builder/deb/amd64/ubuntu-precise/Dockerfile +++ b/contrib/builder/deb/amd64/ubuntu-precise/Dockerfile @@ -6,7 +6,7 @@ FROM ubuntu:precise RUN apt-get update && apt-get install -y apparmor bash-completion build-essential cmake curl ca-certificates debhelper dh-apparmor git libapparmor-dev libltdl-dev libsqlite3-dev pkg-config vim-common --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.7.3 +ENV GO_VERSION 1.7.4 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local ENV PATH $PATH:/usr/local/go/bin diff --git a/contrib/builder/deb/amd64/ubuntu-trusty/Dockerfile b/contrib/builder/deb/amd64/ubuntu-trusty/Dockerfile index af890329be..79e4930de9 100644 --- a/contrib/builder/deb/amd64/ubuntu-trusty/Dockerfile +++ b/contrib/builder/deb/amd64/ubuntu-trusty/Dockerfile @@ -6,7 +6,7 @@ FROM ubuntu:trusty RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libsqlite3-dev pkg-config vim-common libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.7.3 +ENV GO_VERSION 1.7.4 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local ENV PATH $PATH:/usr/local/go/bin diff --git a/contrib/builder/deb/amd64/ubuntu-xenial/Dockerfile b/contrib/builder/deb/amd64/ubuntu-xenial/Dockerfile index 9b287a08cf..1b8d41048b 100644 --- a/contrib/builder/deb/amd64/ubuntu-xenial/Dockerfile +++ b/contrib/builder/deb/amd64/ubuntu-xenial/Dockerfile @@ -6,7 +6,7 @@ FROM ubuntu:xenial RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev libsqlite3-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.7.3 +ENV GO_VERSION 1.7.4 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local ENV PATH $PATH:/usr/local/go/bin diff --git a/contrib/builder/deb/amd64/ubuntu-yakkety/Dockerfile b/contrib/builder/deb/amd64/ubuntu-yakkety/Dockerfile index dce3c9e85c..168204e53f 100644 --- a/contrib/builder/deb/amd64/ubuntu-yakkety/Dockerfile +++ b/contrib/builder/deb/amd64/ubuntu-yakkety/Dockerfile @@ -6,7 +6,7 @@ FROM ubuntu:yakkety RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev libsqlite3-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.7.3 +ENV GO_VERSION 1.7.4 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local ENV PATH $PATH:/usr/local/go/bin diff --git a/contrib/builder/deb/armhf/debian-jessie/Dockerfile b/contrib/builder/deb/armhf/debian-jessie/Dockerfile index 68b91294b2..6baa652586 100644 --- a/contrib/builder/deb/armhf/debian-jessie/Dockerfile +++ b/contrib/builder/deb/armhf/debian-jessie/Dockerfile @@ -10,7 +10,7 @@ RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libsqlite3-dev pkg-config vim-common libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.7.3 +ENV GO_VERSION 1.7.4 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local ENV PATH $PATH:/usr/local/go/bin diff --git a/contrib/builder/deb/armhf/raspbian-jessie/Dockerfile b/contrib/builder/deb/armhf/raspbian-jessie/Dockerfile index d6c5f56d8a..fb6a21a6b0 100644 --- a/contrib/builder/deb/armhf/raspbian-jessie/Dockerfile +++ b/contrib/builder/deb/armhf/raspbian-jessie/Dockerfile @@ -10,7 +10,7 @@ RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libsqlite3-dev pkg-config vim-common libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.7.3 +ENV GO_VERSION 1.7.4 # GOARM is the ARM architecture version which is unrelated to the above Golang version ENV GOARM 6 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local diff --git a/contrib/builder/deb/armhf/ubuntu-trusty/Dockerfile b/contrib/builder/deb/armhf/ubuntu-trusty/Dockerfile index 021b7a9a79..44d3af76eb 100644 --- a/contrib/builder/deb/armhf/ubuntu-trusty/Dockerfile +++ b/contrib/builder/deb/armhf/ubuntu-trusty/Dockerfile @@ -6,7 +6,7 @@ FROM armhf/ubuntu:trusty RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libsqlite3-dev pkg-config vim-common libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.7.3 +ENV GO_VERSION 1.7.4 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local ENV PATH $PATH:/usr/local/go/bin diff --git a/contrib/builder/deb/armhf/ubuntu-xenial/Dockerfile b/contrib/builder/deb/armhf/ubuntu-xenial/Dockerfile index 429de46eb4..c4889bbadb 100644 --- a/contrib/builder/deb/armhf/ubuntu-xenial/Dockerfile +++ b/contrib/builder/deb/armhf/ubuntu-xenial/Dockerfile @@ -6,7 +6,7 @@ FROM armhf/ubuntu:xenial RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev libsqlite3-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.7.3 +ENV GO_VERSION 1.7.4 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local ENV PATH $PATH:/usr/local/go/bin diff --git a/contrib/builder/deb/armhf/ubuntu-yakkety/Dockerfile b/contrib/builder/deb/armhf/ubuntu-yakkety/Dockerfile index 5f2c2640c8..20b406d2c3 100644 --- a/contrib/builder/deb/armhf/ubuntu-yakkety/Dockerfile +++ b/contrib/builder/deb/armhf/ubuntu-yakkety/Dockerfile @@ -6,7 +6,7 @@ FROM armhf/ubuntu:yakkety RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev libsqlite3-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.7.3 +ENV GO_VERSION 1.7.4 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local ENV PATH $PATH:/usr/local/go/bin diff --git a/contrib/builder/deb/ppc64le/ubuntu-trusty/Dockerfile b/contrib/builder/deb/ppc64le/ubuntu-trusty/Dockerfile index d5d9618663..790464acf1 100644 --- a/contrib/builder/deb/ppc64le/ubuntu-trusty/Dockerfile +++ b/contrib/builder/deb/ppc64le/ubuntu-trusty/Dockerfile @@ -10,7 +10,7 @@ RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools bu # ppc64le doesn't have official go binaries, so use a distro packaged version of go # to build go from source. # NOTE: ppc64le has compatibility issues with older versions of go, so make sure the version >= 1.6 -ENV GO_VERSION 1.7.3 +ENV GO_VERSION 1.7.4 ENV GO_DOWNLOAD_URL https://golang.org/dl/go${GO_VERSION}.src.tar.gz ENV GOROOT_BOOTSTRAP /usr/lib/go-1.6 diff --git a/contrib/builder/deb/ppc64le/ubuntu-xenial/Dockerfile b/contrib/builder/deb/ppc64le/ubuntu-xenial/Dockerfile index 65d49f00de..a9307c1a7b 100644 --- a/contrib/builder/deb/ppc64le/ubuntu-xenial/Dockerfile +++ b/contrib/builder/deb/ppc64le/ubuntu-xenial/Dockerfile @@ -10,7 +10,7 @@ RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools bu # ppc64le doesn't have official go binaries, so use a distro packaged version of go # to build go from source. # NOTE: ppc64le has compatibility issues with older versions of go, so make sure the version >= 1.6 -ENV GO_VERSION 1.7.3 +ENV GO_VERSION 1.7.4 ENV GO_DOWNLOAD_URL https://golang.org/dl/go${GO_VERSION}.src.tar.gz ENV GOROOT_BOOTSTRAP /usr/lib/go-1.6 diff --git a/contrib/builder/deb/ppc64le/ubuntu-yakkety/Dockerfile b/contrib/builder/deb/ppc64le/ubuntu-yakkety/Dockerfile index da27b0876a..b6aa034752 100644 --- a/contrib/builder/deb/ppc64le/ubuntu-yakkety/Dockerfile +++ b/contrib/builder/deb/ppc64le/ubuntu-yakkety/Dockerfile @@ -10,7 +10,7 @@ RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools bu # ppc64le doesn't have official go binaries, so use a distro packaged version of go # to build go from source. # NOTE: ppc64le has compatibility issues with older versions of go, so make sure the version >= 1.6 -ENV GO_VERSION 1.7.3 +ENV GO_VERSION 1.7.4 ENV GO_DOWNLOAD_URL https://golang.org/dl/go${GO_VERSION}.src.tar.gz ENV GOROOT_BOOTSTRAP /usr/lib/go-1.6 diff --git a/contrib/builder/deb/s390x/ubuntu-xenial/Dockerfile b/contrib/builder/deb/s390x/ubuntu-xenial/Dockerfile index 7b774159b8..11e1fe2f0f 100644 --- a/contrib/builder/deb/s390x/ubuntu-xenial/Dockerfile +++ b/contrib/builder/deb/s390x/ubuntu-xenial/Dockerfile @@ -6,7 +6,7 @@ FROM s390x/ubuntu:xenial RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev libsqlite3-dev pkg-config libsystemd-dev vim-common --no-install-recommends && rm -rf /var/lib/apt/lists/* -ENV GO_VERSION 1.7.3 +ENV GO_VERSION 1.7.4 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-s390x.tar.gz" | tar xzC /usr/local ENV PATH $PATH:/usr/local/go/bin diff --git a/contrib/builder/rpm/amd64/centos-7/Dockerfile b/contrib/builder/rpm/amd64/centos-7/Dockerfile index a1e462c0f8..1e1b6d5e19 100644 --- a/contrib/builder/rpm/amd64/centos-7/Dockerfile +++ b/contrib/builder/rpm/amd64/centos-7/Dockerfile @@ -8,7 +8,7 @@ RUN yum groupinstall -y "Development Tools" RUN yum -y swap -- remove systemd-container systemd-container-libs -- install systemd systemd-libs RUN yum install -y btrfs-progs-devel device-mapper-devel glibc-static libseccomp-devel libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel sqlite-devel systemd-devel tar git cmake vim-common -ENV GO_VERSION 1.7.3 +ENV GO_VERSION 1.7.4 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local ENV PATH $PATH:/usr/local/go/bin diff --git a/contrib/builder/rpm/amd64/fedora-24/Dockerfile b/contrib/builder/rpm/amd64/fedora-24/Dockerfile index 07e3733252..76383be528 100644 --- a/contrib/builder/rpm/amd64/fedora-24/Dockerfile +++ b/contrib/builder/rpm/amd64/fedora-24/Dockerfile @@ -8,7 +8,7 @@ RUN dnf -y upgrade RUN dnf install -y @development-tools fedora-packager RUN dnf install -y btrfs-progs-devel device-mapper-devel glibc-static libseccomp-devel libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel sqlite-devel systemd-devel tar git cmake vim-common -ENV GO_VERSION 1.7.3 +ENV GO_VERSION 1.7.4 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local ENV PATH $PATH:/usr/local/go/bin diff --git a/contrib/builder/rpm/amd64/fedora-25/Dockerfile b/contrib/builder/rpm/amd64/fedora-25/Dockerfile index 2663832603..aed568aea0 100644 --- a/contrib/builder/rpm/amd64/fedora-25/Dockerfile +++ b/contrib/builder/rpm/amd64/fedora-25/Dockerfile @@ -8,7 +8,7 @@ RUN dnf -y upgrade RUN dnf install -y @development-tools fedora-packager RUN dnf install -y btrfs-progs-devel device-mapper-devel glibc-static libseccomp-devel libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel sqlite-devel systemd-devel tar git cmake vim-common -ENV GO_VERSION 1.7.3 +ENV GO_VERSION 1.7.4 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local ENV PATH $PATH:/usr/local/go/bin diff --git a/contrib/builder/rpm/amd64/opensuse-13.2/Dockerfile b/contrib/builder/rpm/amd64/opensuse-13.2/Dockerfile index 6fdcb05ce6..d0e8f59ea8 100644 --- a/contrib/builder/rpm/amd64/opensuse-13.2/Dockerfile +++ b/contrib/builder/rpm/amd64/opensuse-13.2/Dockerfile @@ -7,7 +7,7 @@ FROM opensuse:13.2 RUN zypper --non-interactive install ca-certificates* curl gzip rpm-build RUN zypper --non-interactive install libbtrfs-devel device-mapper-devel glibc-static libselinux-devel libtool-ltdl-devel pkg-config selinux-policy selinux-policy-devel sqlite-devel systemd-devel tar git cmake vim systemd-rpm-macros -ENV GO_VERSION 1.7.3 +ENV GO_VERSION 1.7.4 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local ENV PATH $PATH:/usr/local/go/bin diff --git a/contrib/builder/rpm/amd64/oraclelinux-6/Dockerfile b/contrib/builder/rpm/amd64/oraclelinux-6/Dockerfile index 8bc2143812..4523a5aa83 100644 --- a/contrib/builder/rpm/amd64/oraclelinux-6/Dockerfile +++ b/contrib/builder/rpm/amd64/oraclelinux-6/Dockerfile @@ -10,7 +10,7 @@ RUN yum install -y kernel-uek-devel-4.1.12-32.el6uek RUN yum groupinstall -y "Development Tools" RUN yum install -y btrfs-progs-devel device-mapper-devel glibc-static libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel sqlite-devel tar git cmake vim-common -ENV GO_VERSION 1.7.3 +ENV GO_VERSION 1.7.4 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local ENV PATH $PATH:/usr/local/go/bin diff --git a/contrib/builder/rpm/amd64/oraclelinux-7/Dockerfile b/contrib/builder/rpm/amd64/oraclelinux-7/Dockerfile index a1b3ccddab..97e72ce324 100644 --- a/contrib/builder/rpm/amd64/oraclelinux-7/Dockerfile +++ b/contrib/builder/rpm/amd64/oraclelinux-7/Dockerfile @@ -7,7 +7,7 @@ FROM oraclelinux:7 RUN yum groupinstall -y "Development Tools" RUN yum install -y --enablerepo=ol7_optional_latest btrfs-progs-devel device-mapper-devel glibc-static libseccomp-devel libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel sqlite-devel systemd-devel tar git cmake vim-common -ENV GO_VERSION 1.7.3 +ENV GO_VERSION 1.7.4 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local ENV PATH $PATH:/usr/local/go/bin diff --git a/contrib/builder/rpm/amd64/photon-1.0/Dockerfile b/contrib/builder/rpm/amd64/photon-1.0/Dockerfile index 6104233675..06255925bd 100644 --- a/contrib/builder/rpm/amd64/photon-1.0/Dockerfile +++ b/contrib/builder/rpm/amd64/photon-1.0/Dockerfile @@ -7,7 +7,7 @@ FROM photon:1.0 RUN tdnf install -y wget curl ca-certificates gzip make rpm-build sed gcc linux-api-headers glibc-devel binutils libseccomp libltdl-devel elfutils RUN tdnf install -y btrfs-progs-devel device-mapper-devel glibc-static libseccomp-devel libselinux-devel libtool-ltdl-devel pkg-config selinux-policy selinux-policy-devel sqlite-devel systemd-devel tar git cmake vim-common -ENV GO_VERSION 1.7.3 +ENV GO_VERSION 1.7.4 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local ENV PATH $PATH:/usr/local/go/bin From 53576a5bf94a1ba4364d1c2ec50e5ffdae814edf Mon Sep 17 00:00:00 2001 From: Christopher Jones Date: Wed, 7 Dec 2016 16:49:46 -0500 Subject: [PATCH 29/36] [ppc64le] use official go 1.7.4 binaries go 1.7.4 introduced official go ppc64le binaries, so use those instead of using older versions of go and building from src. Signed-off-by: Christopher Jones (cherry picked from commit 62ab6809bd0a654dde9c076f5a197253c66877e8) Signed-off-by: Victor Vieux --- Dockerfile.ppc64le | 24 ++++----------- contrib/builder/deb/ppc64le/generate.sh | 29 +------------------ .../deb/ppc64le/ubuntu-trusty/Dockerfile | 16 ++-------- .../deb/ppc64le/ubuntu-xenial/Dockerfile | 16 ++-------- .../deb/ppc64le/ubuntu-yakkety/Dockerfile | 16 ++-------- 5 files changed, 12 insertions(+), 89 deletions(-) diff --git a/Dockerfile.ppc64le b/Dockerfile.ppc64le index dd73ed2ec8..dcfc18ed6c 100644 --- a/Dockerfile.ppc64le +++ b/Dockerfile.ppc64le @@ -15,8 +15,7 @@ # the case. Therefore, you don't have to disable it anymore. # -# ppc64le/golang is a debian:jessie based image with golang installed -FROM ppc64le/golang:1.6.3 +FROM ppc64le/debian:jessie # allow replacing httpredir or deb mirror ARG APT_MIRROR=deb.debian.org @@ -95,25 +94,12 @@ RUN set -x \ # Install Go -# ppc64le doesn't have official go binaries, so use the version of go installed from the image -# to build go from source. -# NOTE: ppc64le has compatibility issues with older versions of go, so make sure the version >= 1.6 +# NOTE: official ppc64le go binaries weren't available until go 1.6.4 and 1.7.4 ENV GO_VERSION 1.7.4 -ENV GO_DOWNLOAD_URL https://golang.org/dl/go${GO_VERSION}.src.tar.gz +RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-ppc64le.tar.gz" \ + | tar -xzC /usr/local -RUN set -x \ - && TEMPDIR="$(mktemp -d)" \ - && mv /usr/local/go $TEMPDIR \ - && GOROOT_BOOTSTRAP=$TEMPDIR/go \ - && cd /usr/local \ - && curl -fsSL "$GO_DOWNLOAD_URL" -o golang.tar.gz \ - && tar -C /usr/local -xzf golang.tar.gz \ - && rm golang.tar.gz \ - && cd go/src && ./make.bash 2>&1 \ - && rm -rf $TEMPDIR - -ENV GOROOT_BOOTSTRAP /usr/local/go -ENV PATH /usr/local/go/bin/:$PATH +ENV PATH /go/bin:/usr/local/go/bin:$PATH ENV GOPATH /go # Dependency for golint diff --git a/contrib/builder/deb/ppc64le/generate.sh b/contrib/builder/deb/ppc64le/generate.sh index 571a67cab7..0e20b9c4b5 100755 --- a/contrib/builder/deb/ppc64le/generate.sh +++ b/contrib/builder/deb/ppc64le/generate.sh @@ -59,22 +59,12 @@ for version in "${versions[@]}"; do vim-common # tini dep ) - # trusty uses a different go package name then xenial and newer, so track that for later - goPackage= case "$suite" in trusty) - # ppc64le doesn't have go binaries, so install go to bootstrap go - # trusty doesn't have a ppc64le golang-go package - packages+=( golang-1.6 ) - goPackage='golang-1.6' - packages+=( libsystemd-journal-dev ) ;; *) # libseccomp isn't available until ubuntu xenial and is required for "seccomp.h" & "libseccomp.so" - packages+=( golang-go ) - goPackage='golang-go' - packages+=( libseccomp-dev ) packages+=( libsystemd-dev ) ;; @@ -98,25 +88,8 @@ for version in "${versions[@]}"; do echo "RUN apt-get update && apt-get install -y ${packages[*]} --no-install-recommends && rm -rf /var/lib/apt/lists/*" >> "$version/Dockerfile" echo >> "$version/Dockerfile" - # ppc64le doesn't have an official downloadable binary as of go 1.6.2. so use the - # older packaged go(v1.6.1) to bootstrap latest go, then remove the packaged go - echo "# Install Go" >> "$version/Dockerfile" - echo "# ppc64le doesn't have official go binaries, so use a distro packaged version of go" >> "$version/Dockerfile" - echo "# to build go from source." >> "$version/Dockerfile" - echo "# NOTE: ppc64le has compatibility issues with older versions of go, so make sure the version >= 1.6" >> "$version/Dockerfile" - awk '$1 == "ENV" && $2 == "GO_VERSION" { print; exit }' ../../../../Dockerfile.ppc64le >> "$version/Dockerfile" - echo 'ENV GO_DOWNLOAD_URL https://golang.org/dl/go${GO_VERSION}.src.tar.gz' >> "$version/Dockerfile" - echo 'ENV GOROOT_BOOTSTRAP /usr/lib/go-1.6' >> "$version/Dockerfile" - echo >> "$version/Dockerfile" - - echo 'RUN curl -fsSL "$GO_DOWNLOAD_URL" -o golang.tar.gz \' >> "$version/Dockerfile" - echo ' && tar -C /usr/local -xzf golang.tar.gz \' >> "$version/Dockerfile" - echo ' && rm golang.tar.gz \' >> "$version/Dockerfile" - echo ' && cd /usr/local/go/src && ./make.bash 2>&1 \' >> "$version/Dockerfile" - echo " && apt-get purge -y $goPackage && apt-get autoremove -y" >> "$version/Dockerfile" - echo >> "$version/Dockerfile" - + echo 'RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-ppc64le.tar.gz" | tar xzC /usr/local' >> "$version/Dockerfile" echo 'ENV PATH $PATH:/usr/local/go/bin' >> "$version/Dockerfile" echo >> "$version/Dockerfile" diff --git a/contrib/builder/deb/ppc64le/ubuntu-trusty/Dockerfile b/contrib/builder/deb/ppc64le/ubuntu-trusty/Dockerfile index 790464acf1..27e1adad53 100644 --- a/contrib/builder/deb/ppc64le/ubuntu-trusty/Dockerfile +++ b/contrib/builder/deb/ppc64le/ubuntu-trusty/Dockerfile @@ -4,22 +4,10 @@ FROM ppc64le/ubuntu:trusty -RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libsqlite3-dev pkg-config vim-common golang-1.6 libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libsqlite3-dev pkg-config vim-common libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* -# Install Go -# ppc64le doesn't have official go binaries, so use a distro packaged version of go -# to build go from source. -# NOTE: ppc64le has compatibility issues with older versions of go, so make sure the version >= 1.6 ENV GO_VERSION 1.7.4 -ENV GO_DOWNLOAD_URL https://golang.org/dl/go${GO_VERSION}.src.tar.gz -ENV GOROOT_BOOTSTRAP /usr/lib/go-1.6 - -RUN curl -fsSL "$GO_DOWNLOAD_URL" -o golang.tar.gz \ - && tar -C /usr/local -xzf golang.tar.gz \ - && rm golang.tar.gz \ - && cd /usr/local/go/src && ./make.bash 2>&1 \ - && apt-get purge -y golang-1.6 && apt-get autoremove -y - +RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-ppc64le.tar.gz" | tar xzC /usr/local ENV PATH $PATH:/usr/local/go/bin ENV AUTO_GOPATH 1 diff --git a/contrib/builder/deb/ppc64le/ubuntu-xenial/Dockerfile b/contrib/builder/deb/ppc64le/ubuntu-xenial/Dockerfile index a9307c1a7b..1057d32a6d 100644 --- a/contrib/builder/deb/ppc64le/ubuntu-xenial/Dockerfile +++ b/contrib/builder/deb/ppc64le/ubuntu-xenial/Dockerfile @@ -4,22 +4,10 @@ FROM ppc64le/ubuntu:xenial -RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libsqlite3-dev pkg-config vim-common golang-go libseccomp-dev libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libsqlite3-dev pkg-config vim-common libseccomp-dev libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* -# Install Go -# ppc64le doesn't have official go binaries, so use a distro packaged version of go -# to build go from source. -# NOTE: ppc64le has compatibility issues with older versions of go, so make sure the version >= 1.6 ENV GO_VERSION 1.7.4 -ENV GO_DOWNLOAD_URL https://golang.org/dl/go${GO_VERSION}.src.tar.gz -ENV GOROOT_BOOTSTRAP /usr/lib/go-1.6 - -RUN curl -fsSL "$GO_DOWNLOAD_URL" -o golang.tar.gz \ - && tar -C /usr/local -xzf golang.tar.gz \ - && rm golang.tar.gz \ - && cd /usr/local/go/src && ./make.bash 2>&1 \ - && apt-get purge -y golang-go && apt-get autoremove -y - +RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-ppc64le.tar.gz" | tar xzC /usr/local ENV PATH $PATH:/usr/local/go/bin ENV AUTO_GOPATH 1 diff --git a/contrib/builder/deb/ppc64le/ubuntu-yakkety/Dockerfile b/contrib/builder/deb/ppc64le/ubuntu-yakkety/Dockerfile index b6aa034752..0d7c2b2782 100644 --- a/contrib/builder/deb/ppc64le/ubuntu-yakkety/Dockerfile +++ b/contrib/builder/deb/ppc64le/ubuntu-yakkety/Dockerfile @@ -4,22 +4,10 @@ FROM ppc64le/ubuntu:yakkety -RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libsqlite3-dev pkg-config vim-common golang-go libseccomp-dev libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libsqlite3-dev pkg-config vim-common libseccomp-dev libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* -# Install Go -# ppc64le doesn't have official go binaries, so use a distro packaged version of go -# to build go from source. -# NOTE: ppc64le has compatibility issues with older versions of go, so make sure the version >= 1.6 ENV GO_VERSION 1.7.4 -ENV GO_DOWNLOAD_URL https://golang.org/dl/go${GO_VERSION}.src.tar.gz -ENV GOROOT_BOOTSTRAP /usr/lib/go-1.6 - -RUN curl -fsSL "$GO_DOWNLOAD_URL" -o golang.tar.gz \ - && tar -C /usr/local -xzf golang.tar.gz \ - && rm golang.tar.gz \ - && cd /usr/local/go/src && ./make.bash 2>&1 \ - && apt-get purge -y golang-go && apt-get autoremove -y - +RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-ppc64le.tar.gz" | tar xzC /usr/local ENV PATH $PATH:/usr/local/go/bin ENV AUTO_GOPATH 1 From 6a9670b044576d31c4e3d50401251c8ad54c3d3b Mon Sep 17 00:00:00 2001 From: John Howard Date: Mon, 5 Dec 2016 18:40:31 -0800 Subject: [PATCH 30/36] Windows: Bump to latest version of git Signed-off-by: John Howard (cherry picked from commit 8a45eea2ddac40c907feb38859eb056a4d0024cc) Signed-off-by: Victor Vieux --- Dockerfile.windows | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.windows b/Dockerfile.windows index c20448de29..26e62792bd 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -166,7 +166,7 @@ SHELL ["powershell", "-command"] # - GO_VERSION must be consistent with 'Dockerfile' used by Linux. # - FROM_DOCKERFILE is used for detection of building within a container. ENV GO_VERSION=1.7.4 ` - GIT_VERSION=2.10.2 ` + GIT_VERSION=2.11.0 ` GOPATH=C:\go ` FROM_DOCKERFILE=1 From 328775ea4f8446394d45a333652d011f5006a360 Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Wed, 25 Jan 2017 20:35:42 -0800 Subject: [PATCH 31/36] removing trailing backslash in zsh completion Signed-off-by: Victor Vieux --- contrib/completion/zsh/_docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/zsh/_docker b/contrib/completion/zsh/_docker index 9c83e2b920..ecae826a4a 100644 --- a/contrib/completion/zsh/_docker +++ b/contrib/completion/zsh/_docker @@ -561,7 +561,7 @@ __docker_container_subcommand() { "($help)*--group=[Set one or more supplementary user groups for the container]:group:_groups" "($help -h --hostname)"{-h=,--hostname=}"[Container host name]:hostname:_hosts" "($help -i --interactive)"{-i,--interactive}"[Keep stdin open even if not attached]" - "($help)--init[Run an init inside the container that forwards signals and reaps processes]" \ + "($help)--init[Run an init inside the container that forwards signals and reaps processes]" "($help)--ip=[Container IPv4 address]:IPv4: " "($help)--ip6=[Container IPv6 address]:IPv6: " "($help)--ipc=[IPC namespace to use]:IPC namespace: " From e7077f7d26f898fa143d9d3919d5da1ced1c27fe Mon Sep 17 00:00:00 2001 From: Darren Stahl Date: Thu, 12 Jan 2017 14:00:56 -0800 Subject: [PATCH 32/36] Windows: Add service dependency ConDrv Signed-off-by: Darren Stahl (cherry picked from commit b2a7f6abb379e96eb611c27a5bec10c3be854a75) Signed-off-by: Victor Vieux --- cmd/dockerd/service_windows.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/cmd/dockerd/service_windows.go b/cmd/dockerd/service_windows.go index 7ad7e389d8..dd37abcf3c 100644 --- a/cmd/dockerd/service_windows.go +++ b/cmd/dockerd/service_windows.go @@ -13,6 +13,7 @@ import ( "unsafe" "github.com/Sirupsen/logrus" + "github.com/docker/docker/pkg/system" "github.com/spf13/pflag" "golang.org/x/sys/windows" "golang.org/x/sys/windows/svc" @@ -165,10 +166,20 @@ func registerService() error { return err } defer m.Disconnect() + + depends := []string{} + + // This dependency is required on build 14393 (RS1) + // it is added to the platform in newer builds + if system.GetOSVersion().Build == 14393 { + depends = append(depends, "ConDrv") + } + c := mgr.Config{ ServiceType: windows.SERVICE_WIN32_OWN_PROCESS, StartType: mgr.StartAutomatic, ErrorControl: mgr.ErrorNormal, + Dependencies: depends, DisplayName: "Docker Engine", } From a64c9357ca4500af96bf3f02a1d2cd8ade5761f2 Mon Sep 17 00:00:00 2001 From: Yong Tang Date: Wed, 18 Jan 2017 07:48:09 -0800 Subject: [PATCH 33/36] Fix incorrect `Scope` in `network ls/inspect` with duplicate network names This fix tries to address the issue raised in 30242 where the `Scope` field always changed to `swarm` in the ouput of `docker network ls/inspect` when duplicate networks name exist. The reason for the issue was that `buildNetworkResource()` use network name (which may not be unique) to check for the scope. This fix fixes the issue by always use network ID in `buildNetworkResource()`. A test has been added. The test fails before the fix and passes after the fix. This fix fixes 30242. Signed-off-by: Yong Tang (cherry picked from commit 05a831a775be5e8d752deaef620e629deb15cb89) Signed-off-by: Victor Vieux --- api/server/router/network/network_routes.go | 2 +- integration-cli/docker_api_swarm_test.go | 55 +++++++++++++++++++++ 2 files changed, 56 insertions(+), 1 deletion(-) diff --git a/api/server/router/network/network_routes.go b/api/server/router/network/network_routes.go index 81b4d7da86..7bfc499552 100644 --- a/api/server/router/network/network_routes.go +++ b/api/server/router/network/network_routes.go @@ -163,7 +163,7 @@ func (n *networkRouter) buildNetworkResource(nw libnetwork.Network) *types.Netwo r.Created = info.Created() r.Scope = info.Scope() if n.clusterProvider.IsManager() { - if _, err := n.clusterProvider.GetNetwork(nw.Name()); err == nil { + if _, err := n.clusterProvider.GetNetwork(nw.ID()); err == nil { r.Scope = "swarm" } } else if info.Dynamic() { diff --git a/integration-cli/docker_api_swarm_test.go b/integration-cli/docker_api_swarm_test.go index 39bf721211..1f8eaec6de 100644 --- a/integration-cli/docker_api_swarm_test.go +++ b/integration-cli/docker_api_swarm_test.go @@ -3,6 +3,7 @@ package main import ( + "encoding/json" "fmt" "net/http" "os" @@ -13,6 +14,7 @@ import ( "syscall" "time" + "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/pkg/integration/checker" "github.com/go-check/check" @@ -1310,3 +1312,56 @@ func (s *DockerSwarmSuite) TestAPISwarmSecretsDelete(c *check.C) { c.Assert(err, checker.IsNil) c.Assert(status, checker.Equals, http.StatusNotFound, check.Commentf("secret delete: %s", string(out))) } + +// Test case for 30242, where duplicate networks, with different drivers `bridge` and `overlay`, +// caused both scopes to be `swarm` for `docker network inspect` and `docker network ls`. +// This test makes sure the fixes correctly output scopes instead. +func (s *DockerSwarmSuite) TestAPIDuplicateNetworks(c *check.C) { + d := s.AddDaemon(c, true, true) + + name := "foo" + networkCreateRequest := types.NetworkCreateRequest{ + Name: name, + NetworkCreate: types.NetworkCreate{ + CheckDuplicate: false, + }, + } + + var n1 types.NetworkCreateResponse + networkCreateRequest.NetworkCreate.Driver = "bridge" + + status, out, err := d.SockRequest("POST", "/networks/create", networkCreateRequest) + c.Assert(err, checker.IsNil, check.Commentf(string(out))) + c.Assert(status, checker.Equals, http.StatusCreated, check.Commentf(string(out))) + + c.Assert(json.Unmarshal(out, &n1), checker.IsNil) + + var n2 types.NetworkCreateResponse + networkCreateRequest.NetworkCreate.Driver = "overlay" + + status, out, err = d.SockRequest("POST", "/networks/create", networkCreateRequest) + c.Assert(err, checker.IsNil, check.Commentf(string(out))) + c.Assert(status, checker.Equals, http.StatusCreated, check.Commentf(string(out))) + + c.Assert(json.Unmarshal(out, &n2), checker.IsNil) + + var r1 types.NetworkResource + + status, out, err = d.SockRequest("GET", "/networks/"+n1.ID, nil) + c.Assert(err, checker.IsNil, check.Commentf(string(out))) + c.Assert(status, checker.Equals, http.StatusOK, check.Commentf(string(out))) + + c.Assert(json.Unmarshal(out, &r1), checker.IsNil) + + c.Assert(r1.Scope, checker.Equals, "local") + + var r2 types.NetworkResource + + status, out, err = d.SockRequest("GET", "/networks/"+n2.ID, nil) + c.Assert(err, checker.IsNil, check.Commentf(string(out))) + c.Assert(status, checker.Equals, http.StatusOK, check.Commentf(string(out))) + + c.Assert(json.Unmarshal(out, &r2), checker.IsNil) + + c.Assert(r2.Scope, checker.Equals, "swarm") +} From 214f42d5413b41ac3b7695a7ffaa7ed489e152b0 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 24 Jan 2017 15:41:45 +0100 Subject: [PATCH 34/36] Add "src" alias for `--secret` This patch adds a "src" alias for `--secret` to be consistent with `--mount`. Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 950658bbb63480de254a166bdeaef1fc8b8fe644) Signed-off-by: Victor Vieux --- opts/secret.go | 2 +- opts/secret_test.go | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/opts/secret.go b/opts/secret.go index b77a33f685..1fefcf8434 100644 --- a/opts/secret.go +++ b/opts/secret.go @@ -50,7 +50,7 @@ func (o *SecretOpt) Set(value string) error { value := parts[1] switch key { - case "source": + case "source", "src": options.Source = value case "target": tDir, _ := filepath.Split(value) diff --git a/opts/secret_test.go b/opts/secret_test.go index ce4418a0bc..d978c86e22 100644 --- a/opts/secret_test.go +++ b/opts/secret_test.go @@ -35,6 +35,18 @@ func TestSecretOptionsSourceTarget(t *testing.T) { assert.Equal(t, req.Target, "testing") } +func TestSecretOptionsShorthand(t *testing.T) { + var opt SecretOpt + + testCase := "src=foo,target=testing" + assert.NilError(t, opt.Set(testCase)) + + reqs := opt.Value() + assert.Equal(t, len(reqs), 1) + req := reqs[0] + assert.Equal(t, req.Source, "foo") +} + func TestSecretOptionsCustomUidGid(t *testing.T) { var opt SecretOpt From 017381aea498f76513bc03f18ce9a1dcab0b84bc Mon Sep 17 00:00:00 2001 From: Michael Irwin Date: Mon, 23 Jan 2017 12:06:53 -0500 Subject: [PATCH 35/36] Fixed secret creation usage during service create in docs Using source, the following error is made: invalid field in secret request: src Signed-off-by: Michael Irwin (cherry picked from commit 9250117d58443a9db052b69457a135b88f97c322) Signed-off-by: Victor Vieux --- docs/reference/commandline/service_create.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/reference/commandline/service_create.md b/docs/reference/commandline/service_create.md index 5cc8f90da9..d1e852dda9 100644 --- a/docs/reference/commandline/service_create.md +++ b/docs/reference/commandline/service_create.md @@ -137,7 +137,7 @@ Create a service specifying the secret, target, user/group ID and mode: ```bash $ docker service create --name redis \ --secret source=ssh-key,target=ssh \ - --secret src=app-key,target=app,uid=1000,gid=1001,mode=0400 \ + --secret source=app-key,target=app,uid=1000,gid=1001,mode=0400 \ redis:3.0.6 4cdgfyky7ozwh3htjfw0d12qv ``` From 819bcf81821e22496c638b3676eedf7e8007d0ee Mon Sep 17 00:00:00 2001 From: Alessandro Boch Date: Fri, 13 Jan 2017 20:14:03 -0800 Subject: [PATCH 36/36] Remove attachable network on swarm leave - When the node leaves the cluster, if any user run container(s) is connected to the swarm network, then daemon needs to detach the container(s) and remove the network. Signed-off-by: Alessandro Boch (cherry picked from commit 3cedca5d532958ffc007d9b62cc871d3d113f054) Signed-off-by: Victor Vieux --- daemon/cluster/cluster.go | 5 +++-- daemon/cluster/executor/backend.go | 3 ++- daemon/daemon.go | 18 +++++++++++++-- daemon/network.go | 28 ++++++++++++++++++++++++ integration-cli/docker_cli_swarm_test.go | 27 +++++++++++++++++++++++ 5 files changed, 76 insertions(+), 5 deletions(-) diff --git a/daemon/cluster/cluster.go b/daemon/cluster/cluster.go index b5a626596d..476e0097bb 100644 --- a/daemon/cluster/cluster.go +++ b/daemon/cluster/cluster.go @@ -351,7 +351,7 @@ func (c *Cluster) startNewNode(conf nodeStartConfig) (*node, error) { c.actualLocalAddr = actualLocalAddr // not saved c.saveState(conf) - c.config.Backend.SetClusterProvider(c) + c.config.Backend.DaemonJoinsCluster(c) go func() { err := detectLockedError(n.Err(ctx)) if err != nil { @@ -724,6 +724,7 @@ func (c *Cluster) Leave(force bool) error { if err := c.clearState(); err != nil { return err } + return nil } @@ -751,7 +752,7 @@ func (c *Cluster) clearState() error { if err := os.MkdirAll(c.root, 0700); err != nil { return err } - c.config.Backend.SetClusterProvider(nil) + c.config.Backend.DaemonLeavesCluster() return nil } diff --git a/daemon/cluster/executor/backend.go b/daemon/cluster/executor/backend.go index 17ede3341a..8d536fb358 100644 --- a/daemon/cluster/executor/backend.go +++ b/daemon/cluster/executor/backend.go @@ -47,7 +47,8 @@ type Backend interface { VolumeCreate(name, driverName string, opts, labels map[string]string) (*types.Volume, error) Containers(config *types.ContainerListOptions) ([]*types.Container, error) SetNetworkBootstrapKeys([]*networktypes.EncryptionKey) error - SetClusterProvider(provider cluster.Provider) + DaemonJoinsCluster(provider cluster.Provider) + DaemonLeavesCluster() IsSwarmCompatible() error SubscribeToEvents(since, until time.Time, filter filters.Args) ([]events.Message, chan interface{}) UnsubscribeFromEvents(listener chan interface{}) diff --git a/daemon/daemon.go b/daemon/daemon.go index f0a1760fda..91f55f9d30 100644 --- a/daemon/daemon.go +++ b/daemon/daemon.go @@ -446,8 +446,22 @@ func (daemon *Daemon) registerLink(parent, child *container.Container, alias str return nil } -// SetClusterProvider sets a component for querying the current cluster state. -func (daemon *Daemon) SetClusterProvider(clusterProvider cluster.Provider) { +// DaemonJoinsCluster informs the daemon has joined the cluster and provides +// the handler to query the cluster component +func (daemon *Daemon) DaemonJoinsCluster(clusterProvider cluster.Provider) { + daemon.setClusterProvider(clusterProvider) +} + +// DaemonLeavesCluster informs the daemon has left the cluster +func (daemon *Daemon) DaemonLeavesCluster() { + // Daemon is in charge of removing the attachable networks with + // connected containers when the node leaves the swarm + daemon.clearAttachableNetworks() + daemon.setClusterProvider(nil) +} + +// setClusterProvider sets a component for querying the current cluster state. +func (daemon *Daemon) setClusterProvider(clusterProvider cluster.Provider) { daemon.clusterProvider = clusterProvider daemon.netController.SetClusterProvider(clusterProvider) } diff --git a/daemon/network.go b/daemon/network.go index daa1f3718c..ab8fd88da8 100644 --- a/daemon/network.go +++ b/daemon/network.go @@ -468,3 +468,31 @@ func (daemon *Daemon) deleteNetwork(networkID string, dynamic bool) error { func (daemon *Daemon) GetNetworks() []libnetwork.Network { return daemon.getAllNetworks() } + +// clearAttachableNetworks removes the attachable networks +// after disconnecting any connected container +func (daemon *Daemon) clearAttachableNetworks() { + for _, n := range daemon.GetNetworks() { + if !n.Info().Attachable() { + continue + } + for _, ep := range n.Endpoints() { + epInfo := ep.Info() + if epInfo == nil { + continue + } + sb := epInfo.Sandbox() + if sb == nil { + continue + } + containerID := sb.ContainerID() + if err := daemon.DisconnectContainerFromNetwork(containerID, n.ID(), true); err != nil { + logrus.Warnf("Failed to disconnect container %s from swarm network %s on cluster leave: %v", + containerID, n.Name(), err) + } + } + if err := daemon.DeleteManagedNetwork(n.ID()); err != nil { + logrus.Warnf("Failed to remove swarm network %s on cluster leave: %v", n.Name(), err) + } + } +} diff --git a/integration-cli/docker_cli_swarm_test.go b/integration-cli/docker_cli_swarm_test.go index 1ecfd07433..7e774af853 100644 --- a/integration-cli/docker_cli_swarm_test.go +++ b/integration-cli/docker_cli_swarm_test.go @@ -393,6 +393,33 @@ func (s *DockerSwarmSuite) TestOverlayAttachable(c *check.C) { c.Assert(strings.TrimSpace(out), checker.Equals, "true") } +func (s *DockerSwarmSuite) TestOverlayAttachableOnSwarmLeave(c *check.C) { + d := s.AddDaemon(c, true, true) + + // Create an attachable swarm network + nwName := "attovl" + out, err := d.Cmd("network", "create", "-d", "overlay", "--attachable", nwName) + c.Assert(err, checker.IsNil, check.Commentf(out)) + + // Connect a container to the network + out, err = d.Cmd("run", "-d", "--network", nwName, "--name", "c1", "busybox", "top") + c.Assert(err, checker.IsNil, check.Commentf(out)) + + // Leave the swarm + err = d.Leave(true) + c.Assert(err, checker.IsNil) + + // Check the container is disconnected + out, err = d.Cmd("inspect", "c1", "--format", "{{.NetworkSettings.Networks."+nwName+"}}") + c.Assert(err, checker.IsNil) + c.Assert(strings.TrimSpace(out), checker.Equals, "") + + // Check the network is gone + out, err = d.Cmd("network", "ls", "--format", "{{.Name}}") + c.Assert(err, checker.IsNil) + c.Assert(out, checker.Not(checker.Contains), nwName) +} + func (s *DockerSwarmSuite) TestSwarmRemoveInternalNetwork(c *check.C) { d := s.AddDaemon(c, true, true)