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
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
00b803b2d8
Add a build unit test for symlinked context
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2018-03-07 13:04:33 -05:00
0cf2e6353a
Fixes some unit tests to be able to run them on windows
...
Some of them are skipped for now (because the feature is not supported
or needs more work), some of them are fixed.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2018-03-07 18:18:13 +01:00
e15b208e96
Convert assert.Check(t, is.Error()) to assert.Error
...
git grep -l -P '^\s+assert\.Check\(t, is\.Error\(' | \
xargs perl -pi -e 's/^(\s+assert\.)Check\(t, is\.Error\((.*)\)$/\1Error(t, \2/'
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2018-03-06 16:00:28 -05:00
f21276575f
manual clean of asserts
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2018-03-06 15:49:00 -05:00
078cbc9c4b
Convert assert.Check with
...
git grep -l -P '^\s+assert\.Check\(t, ' | \
xargs perl -pi -e 's/^(\s+assert)\.Check(\(t, (?!is).*(\.Execute\(|\.Set\(|\.Write\(|\.Close\(|\.Untar\(|\.WriteFile\(|Validate\().*\)$)/\1.NilError\2/'
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2018-03-06 15:43:53 -05:00
baf65a5502
Convert to assert.NilError
...
Using:
git grep -l '^\s\+assert\.Check(t, err)$' | \
xargs sed -i -e 's/^\(\s\+assert\)\.Check(t, err)$/\1.NilError(t, err)/'
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2018-03-06 15:27:34 -05:00
0f11a310fd
dont prompt for github creds in unit test
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2018-03-06 15:27:09 -05:00
681c921528
Remove testutil
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2018-03-06 14:38:35 -05:00
7c8b5708eb
Don't set a default filename for ConfigFile
...
With a default filename tests will leave a file in the working directory
that is never cleaned up.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2018-03-06 13:32:50 -05:00
a0b19f0ec2
Merge pull request #879 from dnephin/update-assertions
...
Replace testify assertions with gotestyourself/assert
2018-03-06 17:19:51 +01:00
5155cda716
Post migration fixes
...
Fix tests that failed when using cmp.Compare()
internal/test/testutil/assert
InDelta
Fix DeepEqual with kube metav1.Time
Convert some ErrorContains to assert
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2018-03-05 19:41:17 -05:00
39c2ca57c1
Automated migration
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2018-03-05 19:41:17 -05:00
93615dd967
Update some assertions.
...
and fix some tests
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2018-03-05 17:15:24 -05:00
cff874122c
Use new APIClient interface
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2018-03-05 16:34:22 -05:00
07cb69e9bc
Add more container cp tests
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2018-02-27 16:38:02 -05:00
2cc6ff131d
Merge pull request #139 from shhsu/v3_credhelper
...
Silent login: use credentials from cred store to login
2018-02-27 19:08:53 +01:00
a9c6c52dc0
Merge pull request #904 from vdemeester/fix-run-label-flag-behavior
...
Fix `--label` behavior on run
2018-02-27 19:07:24 +01:00
31dc5c0a9a
Fix --label behavior on run
...
Commit 2b17f4c8a8 fixed the way empty labels
are taken into account (i.e. not interpolated from environment variable),
but it created a regression.
`ValidateLabel` functions doesn't allow empty label value, but it has
always been possible to pass an empty label via the cli (`docker run --label foo`).
This fixes that by not validating the label flag.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2018-02-27 12:14:07 +01:00
854aad8927
Print Stack API version in version command
...
* Resolve Stack API using Kubernetes discovering API
* Refactor Kubernetes flags parsing
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
2018-02-26 01:16:49 +01:00
8883cd636a
Silent login: if user did not provide -u and -p flag for login command but both username and password are retrieved in cred store, docker will automatically use the credentials found in the cred store to log in
...
Signed-off-by: shhsu@microsoft.com <shhsu@microsoft.com >
Signed-off-by: Peter Hsu <shhsu@microsoft.com >
Signed-off-by: shhsu <shhsu@microsoft.com >
Signed-off-by: Peter Hsu <shhsu@microsoft.com >
2018-02-22 09:14:51 -08:00
d11b5ccdfa
Add --template-driver option for secrets/configs
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2018-02-21 23:22:32 +01:00
a160ad89c9
Merge pull request #894 from thaJeztah/update-moby
...
Bump moby to 0ede01237c9ab871f1b8db0364427407f3e46541
2018-02-21 13:15:58 -05:00
60930d309c
Bump moby to 0ede01237c9ab871f1b8db0364427407f3e46541
...
Includes:
- [client] Remove duplicate NewClient functions
- Add API support for templated secrets and configs
- Adjust minimum API version for templated configs/secrets
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2018-02-21 18:48:42 +01:00
cf86a4d922
Simplify the marshaling of compose types.Config
...
- Add `Version` to `types.Config`
- Add a new `Services` types (that is just `[]ServiceConfig`) and add
`MarshalYAML` method on it.
- Clean other top-level custom marshaling as `Services` is the only one
required.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2018-02-21 18:47:10 +01:00
939938b976
Merge pull request #891 from vdemeester/k8s-loader-make-sure-version
...
Make sure we marshall version too…
2018-02-21 11:45:14 -05:00
9f9f1c8515
Make sure we marshall version too…
...
… otherwise the k8s controller might fail to parse the file as it will
think it's version 1.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2018-02-21 15:36:51 +01:00
995006c164
Support SCTP port mapping
...
Signed-off-by: Wataru Ishida <ishida.wataru@lab.ntt.co.jp >
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
2018-02-21 12:19:38 +09:00