Commit Graph
5260 Commits
Author SHA1 Message Date
Mathieu Champlon 46fae6da7e 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>
Upstream-commit: 4d947de292
Component: cli
2018-05-15 15:38:41 +02:00
Mathieu Champlon c4cff872f5 Fix typo in golden file name
Signed-off-by: Mathieu Champlon <mathieu.champlon@docker.com>
Upstream-commit: 0d7bb8adaa
Component: cli
2018-05-15 10:09:47 +02:00
Vincent Demeester 96a20527d5 Merge pull request #1048 from thaJeztah/bump-golang-1.10.2
Bump Golang to 1.10.2
Upstream-commit: 5aa9d6a35f
Component: cli
2018-05-14 16:20:46 +02:00
Sebastiaan van Stijn c0eb53edfc 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>
Upstream-commit: ee7aa76cff
Component: cli
2018-05-14 16:04:13 +02:00
Vincent Demeester 09aea6c1ab Merge pull request #1055 from mat007/fix-invalid-orchestrator-silently-ignored
Make an error for an invalid orchestrator
Upstream-commit: 161bc1ed3c
Component: cli
2018-05-14 15:34:01 +02:00
Sebastiaan van Stijn be4eb540c9 Merge pull request #1045 from ieugen/ieugen/patch-1
Added description about pids count.
Upstream-commit: fdf94de537
Component: cli
2018-05-14 13:32:47 +02:00
Vincent Demeester 40ccb62e61 Merge pull request #1052 from thaJeztah/fix-rollback-config
Fix service rollback options being cross-wired
Upstream-commit: 74d86d4b2e
Component: cli
2018-05-14 11:01:56 +02:00
Vincent Demeester fda16ddde1 Merge pull request #1037 from essamhassan/1036_fix_mounts_typo_in_srv_inspect_pretty
use : instead of = in mounts service pretty inspect
Upstream-commit: d4ffd9bc71
Component: cli
2018-05-14 10:55:41 +02:00
Brian Goff 3ef5a0bd8a Merge pull request #1038 from kolyshkin/context
Switch from x/net/context to context
Upstream-commit: fd060d2f33
Component: cli
2018-05-11 22:13:52 -04:00
Kir Kolyshkin 7e8c2b86b6 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>
Upstream-commit: 395957155f
Component: cli
2018-05-11 16:50:04 -07:00
Kir Kolyshkin 32a5db4523 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>
Upstream-commit: 6f8070deb2
Component: cli
2018-05-11 16:49:43 -07:00
Essam A. Hassan 67fe72ed3d use : instead of = in mounts service pretty inspect
Signed-off-by: Essam A. Hassan <es.hassan187@gmail.com>
Upstream-commit: 7285241681
Component: cli
2018-05-12 00:02:18 +02:00
Sebastiaan van Stijn 790e355196 Merge pull request #1039 from mat007/fix-filepath-usage
Use filepath.Base instead of path.Base
Upstream-commit: a6b10c2e85
Component: cli
2018-05-11 18:06:23 +02:00
Mathieu Champlon 068dc5f571 Make an error for an invalid orchestrator
Signed-off-by: Mathieu Champlon <mathieu.champlon@docker.com>
Upstream-commit: 50330e7089
Component: cli
2018-05-11 17:19:55 +02:00
Sebastiaan van Stijn e815956d17 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>
Upstream-commit: f367aa9330
Component: cli
2018-05-11 11:47:05 +02:00
Sebastiaan van Stijn 5727dc3154 Merge pull request #1047 from eightlimbed/eightlimbed-patch-1
fixed typo
Upstream-commit: ab1d49a313
Component: cli
2018-05-10 10:32:07 +02:00
Sebastiaan van Stijn 0777f5be26 Merge pull request #991 from silvin-lubecki/kubernetes-namespace
Better namespace experience with Kubernetes
Upstream-commit: 552ee502f7
Component: cli
2018-05-09 21:18:50 +02:00
Mathieu Champlon ec34094dc5 Fix stack ls behaviour with Kubernetes and variout --namespace flag values
Signed-off-by: Mathieu Champlon <mathieu.champlon@docker.com>
Upstream-commit: 2af66bed41
Component: cli
2018-05-09 17:40:25 +02:00
Silvin Lubecki 818645f8cd 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>
Upstream-commit: f097831eb3
Component: cli
2018-05-09 17:33:16 +02:00
Silvin Lubecki f151bd57f8 Add namespace column for docker stack ls command while targeting Kubernetes orchestrator
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
Upstream-commit: 65526a201f
Component: cli
2018-05-09 17:33:16 +02:00
Silvin Lubecki 3d9a405e51 Move stack client creation from KubeCli to client factory, where it belongs
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
Upstream-commit: 31dccfffb5
Component: cli
2018-05-09 17:30:37 +02:00
Silvin Lubecki ceea6abb71 Clean useless named imports
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
Upstream-commit: c23c1482c7
Component: cli
2018-05-09 17:30:36 +02:00
Silvin Lubecki fd51a4f0df Fix using the namespace specified in the kubeconfig file.
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
Upstream-commit: f0aa126b03
Component: cli
2018-05-09 17:30:36 +02:00
Lee Gaines 4785c706cc fixed typo -- Signed-off-by: Lee Gaines <eightlimbed@gmail.com>
Upstream-commit: 9570911807
Component: cli
2018-05-08 14:46:42 -07:00
Ioan Eugen Stan daa5cc4d8f Added description about pids count.
Documentation in response to issue docker/for-linux#192

Signed-off-by: Ioan Eugen Stan <eu@ieugen.ro>
Upstream-commit: 966de2a5f9
Component: cli
2018-05-08 22:16:15 +03:00
Sebastiaan van Stijn 7f36f33bdc Merge pull request #818 from selansen/master
Allow user to specify default address pools for docker networks
Upstream-commit: c31b61bff4
Component: cli
2018-05-08 14:17:00 +02:00
Mathieu Champlon 572d6e715f 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>
Upstream-commit: 698ea75c66
Component: cli
2018-05-07 17:25:23 +02:00
selansen 8f43102f04 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>
Upstream-commit: 75c7b95e7a
Component: cli
2018-05-05 19:46:28 -04:00
Tibor Vass ec16580804 Merge pull request #922 from kolyshkin/man-fixes
Man page fixes
Upstream-commit: 0ff5f52051
Component: cli
2018-05-03 07:34:06 -10:00
Vincent Demeester 0246710e59 Merge pull request #1005 from eiais/fishupdate
Update Attach, Build, Commit, Cp, Create subcommand fish completions 
Upstream-commit: e956159572
Component: cli
2018-05-03 10:28:53 +02:00
Vincent Demeester 3d4a877b7f Merge pull request #1006 from essamhassan/908_show_secrets_configs_srv_inspect
908 - Adding configs/secrets to service inspect pretty
Upstream-commit: e9731e9d0f
Component: cli
2018-05-03 10:12:51 +02:00
Victor Vieux 21855605a8 Merge pull request #1030 from thaJeztah/bump-version-to-v18.06-dev
Bump version to 18.06.0-dev
Upstream-commit: 222b0245f7
Component: cli
2018-05-02 11:39:52 -07:00
Sebastiaan van Stijn ec3e6ec6a5 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>
Upstream-commit: deb8bd740b
Component: cli
2018-05-02 12:11:23 +02:00
Sebastiaan van Stijn 8fa7a28767 Merge pull request #1026 from dhiltgen/expose_pull
Export pull as a public function
Upstream-commit: 784430737b
Component: cli
2018-05-02 12:07:49 +02:00
Sebastiaan van Stijn 09778021e4 Merge pull request #1024 from clnperez/manifest-token-perms
manifest list: request specific permissions
Upstream-commit: f42c66bd24
Component: cli
2018-04-30 20:22:11 +02:00
Sebastiaan van Stijn 4502df9e25 Merge pull request #1028 from nstapelbroek/feature/exec-die-event
Add exec_die to the list of known container events
Upstream-commit: 8103326311
Component: cli
2018-04-30 12:26:28 +02:00
Sebastiaan van Stijn 221837e1ba Merge pull request #973 from silvin-lubecki/orchestrator-column
Orchestrator column
Upstream-commit: 3a55cd709c
Component: cli
2018-04-30 12:16:41 +02:00
Silvin Lubecki 2ff7c2ca43 Add an orchestrator column in the docker stack ls command
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
Upstream-commit: 13d0c9c695
Component: cli
2018-04-30 12:04:02 +02:00
Sebastiaan van Stijn 28528acdcb Merge pull request #903 from silvin-lubecki/add-warnings-client-side
Add warnings client side before deployment on Kubernetes
Upstream-commit: 8963ab993e
Component: cli
2018-04-30 12:01:55 +02:00
Silvin Lubecki d432dda560 Print warnings on stderr for each unsupported features while parsing a compose file for deployment on Kubernetes.
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
Upstream-commit: 36591a2282
Component: cli
2018-04-30 11:56:14 +02:00
Sebastiaan van Stijn 1af050dad4 Merge pull request #899 from silvin-lubecki/handle-multiple-stack-api-versions
Handle multiple stack api versions
Upstream-commit: 7ad30360c8
Component: cli
2018-04-30 11:33:04 +02:00
Silvin Lubecki de5526bad9 Add a common interface between different Kubernetes Stack API versions and use it in kubernetes stack commands
* Add kubernetes Stack API v1beta2 client
* Upgrade v1beta1 client to remove generated code

Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
Upstream-commit: f958c66a6d
Component: cli
2018-04-30 11:27:22 +02:00
Nico Stapelbroek 340f40eb39 Add exec_die to the list of known container events
Signed-off-by: Nico Stapelbroek <nstapelbroek@gmail.com>
Upstream-commit: 4d91812b88
Component: cli
2018-04-29 14:52:08 +02:00
Daniel Hiltgen 240bba4fdb Export pull as a public function
It will be helpful to expose the pull implementation which supports
pulling private images for other CLI commands that rely on helper images.

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: 812f113685
Component: cli
2018-04-27 12:21:19 -07:00
Brian Goff c783effbb0 Merge pull request #1017 from thaJeztah/warn-when-using-host-ip
Warn when using host-ip for published ports
Upstream-commit: 99bd7ed693
Component: cli
2018-04-25 17:09:42 -04:00
Essam A. Hassan 08243ac4d3 testing config/secrets are showing in pretty print
Signed-off-by: Essam A. Hassan <es.hassan187@gmail.com>
Upstream-commit: 8238644796
Component: cli
2018-04-25 17:22:18 +02:00
Essam A. Hassan 9193280536 add config and secret to service in inspect test
Signed-off-by: Essam A. Hassan <es.hassan187@gmail.com>
Upstream-commit: 2b1f27ea5e
Component: cli
2018-04-25 17:22:18 +02:00
Essam A. Hassan 8531403103 adding configs/secrets to service inspect pretty
Signed-off-by: Essam A. Hassan <es.hassan187@gmail.com>
Upstream-commit: 3ae2d4b24c
Component: cli
2018-04-25 17:21:31 +02:00
Christy Norman 89facafb80 specify specific permissions
When creating manifest lists, don't use "*" as the permission when
creating the token handler. This causes problems with gitlab's repos.

Fixes https://github.com/docker/cli/issues/1010

Signed-off-by: Christy Norman <christy@linux.vnet.ibm.com>
Upstream-commit: c26e2264fb
Component: cli
2018-04-24 17:01:57 -05:00
Sebastiaan van Stijn b6d97e109a Merge pull request #1022 from silvin-lubecki/clean-manifest-documentation
Cleaning some manifest documentation typos
Upstream-commit: 4970824bea
Component: cli
2018-04-24 17:07:14 +02:00