3ef5a0bd8a
Merge pull request #1038 from kolyshkin/context
...
Switch from x/net/context to context
Upstream-commit: fd060d2f33
2018-05-11 22:13:52 -04:00
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
2018-05-11 16:50:04 -07:00
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
2018-05-11 16:49:43 -07:00
790e355196
Merge pull request #1039 from mat007/fix-filepath-usage
...
Use filepath.Base instead of path.Base
Upstream-commit: a6b10c2e85
2018-05-11 18:06:23 +02:00
5727dc3154
Merge pull request #1047 from eightlimbed/eightlimbed-patch-1
...
fixed typo
Upstream-commit: ab1d49a313
2018-05-10 10:32:07 +02:00
ec34094dc5
Fix stack ls behaviour with Kubernetes and variout --namespace flag values
...
Signed-off-by: Mathieu Champlon <mathieu.champlon@docker.com >
Upstream-commit: 2af66bed41
2018-05-09 17:40:25 +02:00
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
2018-05-09 17:33:16 +02:00
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
2018-05-09 17:33:16 +02:00
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
2018-05-09 17:30:37 +02:00
ceea6abb71
Clean useless named imports
...
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
Upstream-commit: c23c1482c7
2018-05-09 17:30:36 +02:00
fd51a4f0df
Fix using the namespace specified in the kubeconfig file.
...
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
Upstream-commit: f0aa126b03
2018-05-09 17:30:36 +02:00
4785c706cc
fixed typo -- Signed-off-by: Lee Gaines <eightlimbed@gmail.com>
...
Upstream-commit: 9570911807
2018-05-08 14:46:42 -07:00
7f36f33bdc
Merge pull request #818 from selansen/master
...
Allow user to specify default address pools for docker networks
Upstream-commit: c31b61bff4
2018-05-08 14:17:00 +02:00
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
2018-05-07 17:25:23 +02:00
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
2018-05-05 19:46:28 -04:00
ec16580804
Merge pull request #922 from kolyshkin/man-fixes
...
Man page fixes
Upstream-commit: 0ff5f52051
2018-05-03 07:34:06 -10:00
0246710e59
Merge pull request #1005 from eiais/fishupdate
...
Update Attach, Build, Commit, Cp, Create subcommand fish completions
Upstream-commit: e956159572
2018-05-03 10:28:53 +02:00
3d4a877b7f
Merge pull request #1006 from essamhassan/908_show_secrets_configs_srv_inspect
...
908 - Adding configs/secrets to service inspect pretty
Upstream-commit: e9731e9d0f
2018-05-03 10:12:51 +02:00
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
2018-05-02 12:11:23 +02:00
8fa7a28767
Merge pull request #1026 from dhiltgen/expose_pull
...
Export pull as a public function
Upstream-commit: 784430737b
2018-05-02 12:07:49 +02:00
09778021e4
Merge pull request #1024 from clnperez/manifest-token-perms
...
manifest list: request specific permissions
Upstream-commit: f42c66bd24
2018-04-30 20:22:11 +02:00
4502df9e25
Merge pull request #1028 from nstapelbroek/feature/exec-die-event
...
Add exec_die to the list of known container events
Upstream-commit: 8103326311
2018-04-30 12:26:28 +02:00
2ff7c2ca43
Add an orchestrator column in the docker stack ls command
...
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
Upstream-commit: 13d0c9c695
2018-04-30 12:04:02 +02:00
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
2018-04-30 11:56:14 +02:00
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
2018-04-30 11:27:22 +02:00
340f40eb39
Add exec_die to the list of known container events
...
Signed-off-by: Nico Stapelbroek <nstapelbroek@gmail.com >
Upstream-commit: 4d91812b88
2018-04-29 14:52:08 +02:00
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
2018-04-27 12:21:19 -07:00
c783effbb0
Merge pull request #1017 from thaJeztah/warn-when-using-host-ip
...
Warn when using host-ip for published ports
Upstream-commit: 99bd7ed693
2018-04-25 17:09:42 -04:00
08243ac4d3
testing config/secrets are showing in pretty print
...
Signed-off-by: Essam A. Hassan <es.hassan187@gmail.com >
Upstream-commit: 8238644796
2018-04-25 17:22:18 +02:00
9193280536
add config and secret to service in inspect test
...
Signed-off-by: Essam A. Hassan <es.hassan187@gmail.com >
Upstream-commit: 2b1f27ea5e
2018-04-25 17:22:18 +02:00
8531403103
adding configs/secrets to service inspect pretty
...
Signed-off-by: Essam A. Hassan <es.hassan187@gmail.com >
Upstream-commit: 3ae2d4b24c
2018-04-25 17:21:31 +02:00
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
2018-04-24 17:01:57 -05:00
e92b784d10
Cleaning some manifest documentation typos
...
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
Upstream-commit: 55c5e7aa88
2018-04-24 15:00:39 +02:00
ecd0192857
Merge pull request #1020 from vdemeester/todo-tada
...
Handle some TODOs in tests
Upstream-commit: c889ea1bca
2018-04-23 09:33:41 -04:00
637cb9eba9
Remove more TODOs
...
- Some of them don't make sense anymore
- Some are deprecated and removed from the engine since a few versions
already.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 740d260cd2
2018-04-23 14:57:29 +02:00
4485bdeb14
Remote FIXME(s) in vendor.conf
...
It's coming from dependencies, doesn't make sense here
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 58173b3c69
2018-04-23 14:14:45 +02:00
afba3f7a60
Handle some TODOs in tests
...
Use more gotestyourself for `env.Patch`, and `icmd.RunCommand`
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: ae03dd7f46
2018-04-23 14:13:52 +02:00
32854cab39
Merge pull request #1011 from vdemeester/mark-test-helpers
...
Make testing helpers as such…
Upstream-commit: c790f387e1
2018-04-23 11:20:12 +02:00
13669fec1f
Warn when using host-ip for published ports
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 363335ec9b
2018-04-21 12:49:47 -07:00
a597dea9bf
update docker Create subcommand fish completions
...
Signed-off-by: Kyle Spiers <kyle@spiers.me >
Upstream-commit: b491ad1589
2018-04-20 12:09:44 -07:00
5a48ec120d
update docker Cp subcommand fish completions
...
Signed-off-by: Kyle Spiers <kyle@spiers.me >
Upstream-commit: 49d8604875
2018-04-20 11:58:05 -07:00
59dbeaea44
update docker Commit subcommand fish completions
...
Signed-off-by: Kyle Spiers <kyle@spiers.me >
Upstream-commit: 67a80e3c89
2018-04-20 11:57:33 -07:00
2e3a28762a
update docker Build subcommand fish completions
...
Signed-off-by: Kyle Spiers <kyle@spiers.me >
Upstream-commit: 44168f52b3
2018-04-20 11:56:09 -07:00
4d27bf9201
update docker Attach subcommand fish completions
...
Signed-off-by: Kyle Spiers <kyle@spiers.me >
Upstream-commit: ee5aad8646
2018-04-20 11:48:57 -07:00
4e1a92ff17
Merge pull request #1013 from thaJeztah/update-authors
...
Update AUTHORS and mailmap
Upstream-commit: 6c9232a568
2018-04-18 13:46:30 -07:00
05bd043eba
Update AUTHORS and mailmap
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: a761eff8c5
2018-04-18 13:31:07 -07:00
a013bf96ca
Add Silvin as maintainer
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 60b371506c
2018-04-18 13:21:33 -07:00
de82b21350
Merge pull request #1004 from albers/completion--template-driver
...
Add bash completion for `secret|config create --template-driver`
Upstream-commit: 0685bb29db
2018-04-18 19:04:29 +02:00
9bd536589d
Make testing helpers as such…
...
That way, those lines won't be reported in the failure.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: b29844f8ca
2018-04-18 17:02:21 +02:00
10b6953e20
Merge pull request #1008 from n4ss/revert-unencrypted-prompt
...
Revert unencryted storage warning prompt
Upstream-commit: 8618838bdb
2018-04-18 00:01:13 -07:00
