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
066fd62e37
Merge pull request #978 from bogdananton/fix-manifest-docs-typo
...
[docs] Fix typo in manifest command docs: updated `MANFEST` to `MANIFEST`.
2018-04-09 13:25:37 -07:00
0122730faf
Fix error with merge composefile with networks…
...
… and other cases too. Updating mergo fixes the bugs (but introduced a
slight behaviour change that had to be fixed too)
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2018-04-05 10:37:35 +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
66fdd085a5
Use HasAvailableFlags instead of HasFlags for Options in help
...
> HasAvailableFlags checks if the command contains any flags (local
> plus persistent from the entire structure) which are not hidden or
> deprecated.
This fix the `--help` display when the `Options` is empty (but
showing), like on `docker trust key`
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2018-03-22 15:24:31 +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
789acb526c
Cleanup config load error handling
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2018-03-06 13:44:06 -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
0e2fdc92ce
Fix grammar typo in comment
...
Overriding is the incorrect part of speech for this sentence. It is more common to state that the values are overridden instead.
Other options would include:
```golang
// ldflags is overriding these values
```
```golang
// These values will be overridden by ldflags
```
etc.
Signed-off-by: Kevin Kirsche <kevin.kirsche@verizon.com >
2018-02-28 11:29:40 -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