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
fd060d2f33
Merge pull request #1038 from kolyshkin/context
...
Switch from x/net/context to context
2018-05-11 22:13:52 -04:00
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
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
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
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
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
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
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
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
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
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
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
784430737b
Merge pull request #1026 from dhiltgen/expose_pull
...
Export pull as a public function
2018-05-02 12:07:49 +02:00
13d0c9c695
Add an orchestrator column in the docker stack ls command
...
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
2018-04-30 12:04:02 +02:00
36591a2282
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 >
2018-04-30 11:56:14 +02:00
f958c66a6d
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 >
2018-04-30 11:27:22 +02:00
812f113685
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 >
2018-04-27 12:21:19 -07:00
8238644796
testing config/secrets are showing in pretty print
...
Signed-off-by: Essam A. Hassan <es.hassan187@gmail.com >
2018-04-25 17:22:18 +02:00
2b1f27ea5e
add config and secret to service in inspect test
...
Signed-off-by: Essam A. Hassan <es.hassan187@gmail.com >
2018-04-25 17:22:18 +02:00
3ae2d4b24c
adding configs/secrets to service inspect pretty
...
Signed-off-by: Essam A. Hassan <es.hassan187@gmail.com >
2018-04-25 17:21:31 +02:00
55c5e7aa88
Cleaning some manifest documentation typos
...
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
2018-04-24 15:00:39 +02:00
740d260cd2
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 >
2018-04-23 14:57:29 +02:00
ae03dd7f46
Handle some TODOs in tests
...
Use more gotestyourself for `env.Patch`, and `icmd.RunCommand`
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2018-04-23 14:13:52 +02:00
3acf5d2e47
Revert unencryted storage warning prompt
...
Signed-off-by: Nassim 'Nass' Eddequiouaq <eddequiouaq.nassim@gmail.com >
2018-04-16 12:48:03 -07:00
6b31ea0f0d
Merge pull request #963 from thaJeztah/fix-stack-deploy-after-force
...
Fix stack deploy re-deploying service after --force
2018-04-13 13:06:40 -10:00
54f8ca6660
Fixed gometalinter errors on test files
...
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
2018-04-10 16:03:56 +02:00
9fa6bd4174
[docs] Fix typo in manifest command docs: updated MANFEST to MANIFEST.
...
Signed-off-by: Bogdan Anton <contact@bogdananton.ro >
2018-04-01 17:40:31 +03:00
eb4a4fe9b9
Merge pull request #965 from thaJeztah/fix-version-output
...
Fix docker version output alignment
2018-03-28 09:53:34 +02:00
a1cbaa827b
vendor: update moby to ed7b6428
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
2018-03-27 14:11:29 -07:00
e6e47d95b5
Merge pull request #561 from tych0/deprecate-unencrypted-storage
...
Deprecate unencrypted storage
2018-03-27 14:52:03 +02:00
236a84759a
Merge pull request #941 from dnephin/fix-compose-network-name
...
Fix compose network name
2018-03-26 23:41:44 +02:00
0f1bb35342
Refactor build tests to re-use more code and not require root
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2018-03-26 14:27:52 -04:00
48eb7a082d
Fix docker version output alignment
...
Use tabwriter to print the version output
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2018-03-26 17:59:20 +02:00
4290df3958
print a big warning about cleartext passwords
...
Signed-off-by: Tycho Andersen <tycho@docker.com >
2018-03-26 16:18:32 +02:00
76439457d2
Fix stack deploy re-deploying service after --force
...
When updating a service with the `--force` option, the `ForceUpdate`
property of the taskspec is incremented.
Stack deploy did not take this into account, and reset this
field to its default value (0), causing the service to be
re-deployed.
This patch copies the existing value before updating the service.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2018-03-26 15:24:28 +02:00
27f66e39f4
Merge pull request #943 from silvin-lubecki/fix-kubernetes-published-service
...
Fix docker stack services command Port output
2018-03-26 12:50:07 +01:00
54bb5ffeca
Fix Kubernetes duplication in version command when the server already exposes one Kubernetes component
...
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
2018-03-23 15:52:25 +01:00
c0ffb9491c
Merge pull request #924 from vdemeester/trust-suite-tests
...
Add some content trust tests
2018-03-19 11:24:00 +01:00
8b00c5cfd8
Add more content trust tests
...
Importing from moby's DockerTrustSuite tests.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2018-03-19 10:02:40 +01:00
63ebcae382
Small content trust enhancement
...
- `replaceDockerfileForContentTrust` is only used when content trust is
enabled, so remove the boolean.
- rename `isContentTrustEnabled` to `contentTrustEnabled`
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2018-03-14 17:55:19 +01:00
b816bde6cc
Fix docker stack services command on Port output when kubernetes service is a LoadBalancer or a NodePort
...
* added tests on Kubernetes service conversion to swarm service
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
2018-03-14 11:33:42 +01:00
176aa4865c
Merge pull request #935 from n4ss/trust-out-of-experimental2
...
Move Docker Trust out of experimental
2018-03-13 16:59:50 -07:00
b4c108a385
Fix named network in compose file
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2018-03-12 15:15:27 -04:00
ac35e851e8
Move Docker Trust out of experimental
...
Signed-off-by: Nassim 'Nass' Eddequiouaq <eddequiouaq.nassim@gmail.com >
2018-03-09 13:29:14 -08:00
8c3d0b93d6
Fix comment and misc code issues
...
Signed-off-by: Nassim 'Nass' Eddequiouaq <eddequiouaq.nassim@gmail.com >
2018-03-09 20:46:37 +01:00
c5554f811b
Refactor trust view command into a --pretty flag on trust inspect
...
Signed-off-by: Nassim 'Nass' Eddequiouaq <eddequiouaq.nassim@gmail.com >
2018-03-09 19:12:11 +01:00
feae0e9756
Only read trust setting from options
...
Rename IsTrusted to ContentTrustEnabled
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2018-03-08 16:46:30 -05:00
6e21829af4
Refactor content_trust cli/flags handling
...
Remove the global variable used. Allows easier unit testing.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2018-03-08 15:00:43 -05:00
82f325ed81
Merge pull request #925 from dnephin/add-build-test-symlink
...
Add a build unit test for symlinked context
2018-03-08 18:52:43 +01:00
