Mathieu Champlon
5d54584f03
Bump moby to d37f5c6bdf788a6cb82c07fb707e31a240eff5f9
...
Also bringing:
. golang.org/x/net 5561cd9b4330353950f399814f427425c0a26fd2
. github.com/docker/distribution 83389a148052d74ac602f5f1d62f86ff2f3c4aa5
. github.com/docker/swarmkit bd69f6e8e301645afd344913fa1ede53a0a111fb
. github.com/docker/go-metrics d466d4f6fd960e01820085bd7e1a24426ee7ef18
. github.com/prometheus/client_golang 52437c81da6b127a9925d17eb3a382a2e5fd395e
. github.com/beorn7/perks 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9
. github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6
. github.com/prometheus/common ebdfc6da46522d58825777cf1f90490a5b1ef1d8
. github.com/prometheus/procfs abf152e5f3e97f2fafac028d2cc06c1feb87ffa5
. github.com/matttproud/golang_protobuf_extensions v1.0.0
Signed-off-by: Mathieu Champlon <mathieu.champlon@docker.com>
2018-05-18 11:44:14 +02:00
Sebastiaan van Stijn
6bab4a2a94
Merge pull request #1061 from eiais/fishupdate
...
Update Events, Exec, Export, History, Images, Import, Inspect, Load, and Login subcommand fish completions
2018-05-17 14:50:29 +02:00
Sebastiaan van Stijn
96dba79d99
Merge pull request #1040 from cyli/deprecated-engine-labels
...
Document reserved namespaces deprecation
2018-05-16 23:16:28 +02:00
Ying Li
7470d460f6
Document that reserved namespaces org.docker.*, io.docker.*, and
...
org.dockerproject.* in engine labels are now deprecated.
Signed-off-by: Ying Li <ying.li@docker.com>
2018-05-16 14:06:37 -07:00
Sebastiaan van Stijn
bac0d8f353
Merge pull request #974 from simonferquel/compose-kube-env-expansion
...
[K8s] Do env-variable expansion on the uninterpreted Config files
2018-05-16 20:18:41 +02:00
Vincent Demeester
5a5b880251
Merge pull request #1031 from mat007/kubernetes-orchestrator-all
...
Better stack list experience with Kubernetes and Swarm
2018-05-15 17:26:41 +02:00
Mathieu Champlon
84241cc393
Support multiple namespaces for docker stack ls
...
Signed-off-by: Mathieu Champlon <mathieu.champlon@docker.com>
2018-05-15 16:52:21 +02:00
Mathieu Champlon
4d947de292
Support 'all' in orchestrator flag for docker stack ls
...
All other docker stack commands report an error when passed this value.
Signed-off-by: Mathieu Champlon <mathieu.champlon@docker.com>
2018-05-15 15:38:41 +02:00
Mathieu Champlon
0d7bb8adaa
Fix typo in golden file name
...
Signed-off-by: Mathieu Champlon <mathieu.champlon@docker.com>
2018-05-15 10:09:47 +02:00
Vincent Demeester
5aa9d6a35f
Merge pull request #1048 from thaJeztah/bump-golang-1.10.2
...
Bump Golang to 1.10.2
2018-05-14 16:20:46 +02:00
Sebastiaan van Stijn
ee7aa76cff
Bump Golang to 1.10.2
...
Go 1.10 release notes: https://golang.org/doc/go1.10
Go 1.10: https://github.com/golang/go/issues?q=milestone%3AGo1.10
Go 1.10.1: https://github.com/golang/go/issues?q=milestone%3AGo1.10.1
Go 1.10.2: https://github.com/golang/go/issues?q=milestone%3AGo1.10.2
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-05-14 16:04:13 +02:00
Vincent Demeester
161bc1ed3c
Merge pull request #1055 from mat007/fix-invalid-orchestrator-silently-ignored
...
Make an error for an invalid orchestrator
2018-05-14 15:34:01 +02:00
Sebastiaan van Stijn
fdf94de537
Merge pull request #1045 from ieugen/ieugen/patch-1
...
Added description about pids count.
2018-05-14 13:32:47 +02:00
Vincent Demeester
74d86d4b2e
Merge pull request #1052 from thaJeztah/fix-rollback-config
...
Fix service rollback options being cross-wired
2018-05-14 11:01:56 +02:00
Vincent Demeester
d4ffd9bc71
Merge pull request #1037 from essamhassan/1036_fix_mounts_typo_in_srv_inspect_pretty
...
use : instead of = in mounts service pretty inspect
2018-05-14 10:55:41 +02:00
Brian Goff
fd060d2f33
Merge pull request #1038 from kolyshkin/context
...
Switch from x/net/context to context
2018-05-11 22:13:52 -04:00
Kir Kolyshkin
395957155f
cli/command/container: don't leak context
...
Switch from x/net/context to context made "go vet" see the previously
unseen errors:
> cli/command/container/start.go:57::error: the cancelFun function is
> not used on all paths (possible context leak) (vet)
> cli/command/container/start.go:63::error: this return statement may be
> reached without using the cancelFun var defined on line 57 (vet)
> cli/command/container/run.go:159::error: the cancelFun function is not
> used on all paths (possible context leak) (vet)
> cli/command/container/run.go:164::error: this return statement may be
> reached without using the cancelFun var defined on line 159 (vet)
Do call the cancel function.
Note we might end up calling it twice which is fine as long as I can see
from the Go 1.10 source code.
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2018-05-11 16:50:04 -07:00
Kir Kolyshkin
6f8070deb2
Switch from x/net/context to context
...
Since go 1.7, "context" is a standard package. Since go 1.9,
x/net/context merely provides some types aliased to those in
the standard context package.
The changes were performed by the following script:
for f in $(git ls-files \*.go | grep -v ^vendor/); do
sed -i 's|golang.org/x/net/context|context|' $f
goimports -w $f
for i in 1 2; do
awk '/^$/ {e=1; next;}
/\t"context"$/ {e=0;}
{if (e) {print ""; e=0}; print;}' < $f > $f.new && \
mv $f.new $f
goimports -w $f
done
done
[v2: do awk/goimports fixup twice]
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2018-05-11 16:49:43 -07:00
Essam A. Hassan
7285241681
use : instead of = in mounts service pretty inspect
...
Signed-off-by: Essam A. Hassan <es.hassan187@gmail.com>
2018-05-12 00:02:18 +02:00
Sebastiaan van Stijn
a6b10c2e85
Merge pull request #1039 from mat007/fix-filepath-usage
...
Use filepath.Base instead of path.Base
2018-05-11 18:06:23 +02:00
Mathieu Champlon
50330e7089
Make an error for an invalid orchestrator
...
Signed-off-by: Mathieu Champlon <mathieu.champlon@docker.com>
2018-05-11 17:19:55 +02:00
Sebastiaan van Stijn
f367aa9330
Fix service rollback options being cross-wired
...
The "update" and "rollback" configurations were cross-wired, as a result, setting
`--rollback-*` options would override the service's update-options.
Creating a service with both update, and rollback configuration:
docker service create \
--name=test \
--update-failure-action=pause \
--update-max-failure-ratio=0.6 \
--update-monitor=3s \
--update-order=stop-first \
--update-parallelism=3 \
--rollback-failure-action=continue \
--rollback-max-failure-ratio=0.5 \
--rollback-monitor=4s \
--rollback-order=start-first \
--rollback-parallelism=2 \
--tty \
busybox
Before this change:
docker service inspect --format '{{json .Spec.UpdateConfig}}' test \
&& docker service inspect --format '{{json .Spec.RollbackConfig}}' test
Produces:
{"Parallelism":3,"FailureAction":"pause","Monitor":3000000000,"MaxFailureRatio":0.6,"Order":"stop-first"}
{"Parallelism":3,"FailureAction":"pause","Monitor":3000000000,"MaxFailureRatio":0.6,"Order":"stop-first"}
After this change:
{"Parallelism":3,"FailureAction":"pause","Monitor":3000000000,"MaxFailureRatio":0.6,"Order":"stop-first"}
{"Parallelism":2,"FailureAction":"continue","Monitor":4000000000,"MaxFailureRatio":0.5,"Order":"start-first"}
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-05-11 11:47:05 +02:00
Sebastiaan van Stijn
ab1d49a313
Merge pull request #1047 from eightlimbed/eightlimbed-patch-1
...
fixed typo
2018-05-10 10:32:07 +02:00
Simon Ferquel
f766aff716
Make sure every composefiles sent to a v1beta1 endpoint are parsable
...
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com>
2018-05-09 13:17:25 -07:00
Sebastiaan van Stijn
552ee502f7
Merge pull request #991 from silvin-lubecki/kubernetes-namespace
...
Better namespace experience with Kubernetes
2018-05-09 21:18:50 +02:00
Mathieu Champlon
2af66bed41
Fix stack ls behaviour with Kubernetes and variout --namespace flag values
...
Signed-off-by: Mathieu Champlon <mathieu.champlon@docker.com>
2018-05-09 17:40:25 +02:00
Silvin Lubecki
f097831eb3
Add --all-namespaces to docker stack ls command on Kubernetes orchestrator, to list all stacks in all namespaces.
...
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
2018-05-09 17:33:16 +02:00
Silvin Lubecki
65526a201f
Add namespace column for docker stack ls command while targeting Kubernetes orchestrator
...
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
2018-05-09 17:33:16 +02:00
Silvin Lubecki
31dccfffb5
Move stack client creation from KubeCli to client factory, where it belongs
...
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
2018-05-09 17:30:37 +02:00
Silvin Lubecki
c23c1482c7
Clean useless named imports
...
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
2018-05-09 17:30:36 +02:00
Silvin Lubecki
f0aa126b03
Fix using the namespace specified in the kubeconfig file.
...
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
2018-05-09 17:30:36 +02:00
Lee Gaines
9570911807
fixed typo -- Signed-off-by: Lee Gaines <eightlimbed@gmail.com>
2018-05-08 14:46:42 -07:00
Ioan Eugen Stan
966de2a5f9
Added description about pids count.
...
Documentation in response to issue docker/for-linux#192
Signed-off-by: Ioan Eugen Stan <eu@ieugen.ro>
2018-05-08 22:16:15 +03:00
Sebastiaan van Stijn
c31b61bff4
Merge pull request #818 from selansen/master
...
Allow user to specify default address pools for docker networks
2018-05-08 14:17:00 +02:00
Mathieu Champlon
698ea75c66
Use filepath.Base instead of path.Base
...
This ensures Windows paths are handled correctly as explained in the path package documentation.
Signed-off-by: Mathieu Champlon <mathieu.champlon@docker.com>
2018-05-07 17:25:23 +02:00
selansen
75c7b95e7a
Allow user to specify default address pools for docker networks
...
This is separate commit for CLI files to address PR 36054
Signed-off-by: selansen <elango.siva@docker.com>
2018-05-05 19:46:28 -04:00
Kyle Spiers
4d890fc686
update docker Login subcommand completions
...
Signed-off-by: Kyle Spiers <Kyle@Spiers.me>
2018-05-05 01:35:48 -07:00
Kyle Spiers
647d4c983f
update docker Load subcommand completions
...
Signed-off-by: Kyle Spiers <Kyle@Spiers.me>
2018-05-05 01:33:47 -07:00
Kyle Spiers
20f269a1ff
update docker Inspect subcommand completions
...
Signed-off-by: Kyle Spiers <Kyle@Spiers.me>
2018-05-05 01:27:43 -07:00
Kyle Spiers
202601b774
update docker Import subcommand completions
...
Signed-off-by: Kyle Spiers <Kyle@Spiers.me>
2018-05-05 01:22:45 -07:00
Kyle Spiers
82c5693cf9
update docker Images subcommand completions
...
Signed-off-by: Kyle Spiers <Kyle@Spiers.me>
2018-05-05 01:19:35 -07:00
Kyle Spiers
ba4e802b4f
update docker History subcommand completions
...
Signed-off-by: Kyle Spiers <Kyle@Spiers.me>
2018-05-05 01:17:44 -07:00
Kyle Spiers
fb16dc68be
update docker Export subcommand completions
...
Signed-off-by: Kyle Spiers <Kyle@Spiers.me>
2018-05-05 01:07:32 -07:00
Kyle Spiers
3eb6b2c9c0
update docker Exec subcommand completions
...
Signed-off-by: Kyle Spiers <Kyle@Spiers.me>
2018-05-03 12:48:25 -07:00
Kyle Spiers
21477d9576
update docker Events subcommand completions
...
Signed-off-by: Kyle Spiers <Kyle@Spiers.me>
2018-05-03 12:42:41 -07:00
Tibor Vass
0ff5f52051
Merge pull request #922 from kolyshkin/man-fixes
...
Man page fixes
2018-05-03 07:34:06 -10:00
Vincent Demeester
e956159572
Merge pull request #1005 from eiais/fishupdate
...
Update Attach, Build, Commit, Cp, Create subcommand fish completions
2018-05-03 10:28:53 +02:00
Vincent Demeester
e9731e9d0f
Merge pull request #1006 from essamhassan/908_show_secrets_configs_srv_inspect
...
908 - Adding configs/secrets to service inspect pretty
2018-05-03 10:12:51 +02:00
Victor Vieux
222b0245f7
Merge pull request #1030 from thaJeztah/bump-version-to-v18.06-dev
...
Bump version to 18.06.0-dev
2018-05-02 11:39:52 -07:00
Sebastiaan van Stijn
deb8bd740b
Bump version to 18.06.0-dev
...
Docker-CE 18.05.0-rc1 was cut off from these commits;
- docker-ce 18.05 branch created for code freeze: https://github.com/docker/docker-ce/tree/18.05
- engine: https://github.com/moby/moby/tree/1a57535
- cli: https://github.com/docker/cli/tree/4970824
- packaging: https://github.com/docker/docker-ce-packaging/tree/c216602
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-05-02 12:11:23 +02:00