5f335fa91f
Merge pull request #965 from thaJeztah/fix-version-output
...
Fix docker version output alignment
Upstream-commit: eb4a4fe9b9
2018-03-28 09:53:34 +02:00
a2853ba98e
Merge pull request #975 from tonistiigi/vendor-moby
...
vendor: update moby to ed7b6428
Upstream-commit: 442f56faf6
2018-03-27 14:54:42 -07:00
0ff4beab6e
vendor: update moby to ed7b6428
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: a1cbaa827b
2018-03-27 14:11:29 -07:00
e578155b97
Merge pull request #968 from dnephin/remove-myself-as-code-owner
...
Remove myself from CODEOWNERS
Upstream-commit: 26b834a698
2018-03-27 16:46:54 -04:00
610793fe1f
Merge pull request #561 from tych0/deprecate-unencrypted-storage
...
Deprecate unencrypted storage
Upstream-commit: e6e47d95b5
2018-03-27 14:52:03 +02:00
e985ce6103
Merge pull request #941 from dnephin/fix-compose-network-name
...
Fix compose network name
Upstream-commit: 236a84759a
2018-03-26 23:41:44 +02:00
5d37083ce3
Refactor build tests to re-use more code and not require root
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 0f1bb35342
2018-03-26 14:27:52 -04:00
953c988bf8
Remove myself from CODEOWNERS
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 3a633aa271
2018-03-26 13:39:03 -04:00
35825c3260
Fix docker version output alignment
...
Use tabwriter to print the version output
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 48eb7a082d
2018-03-26 17:59:20 +02:00
72976c8bb6
print a big warning about cleartext passwords
...
Signed-off-by: Tycho Andersen <tycho@docker.com >
Upstream-commit: 4290df3958
2018-03-26 16:18:32 +02:00
6b1c8c09b1
Merge pull request #962 from davidjb/run-docs
...
Clarify behaviour of restart policy in run ref doc
Upstream-commit: db11cffe37
2018-03-26 13:14:44 +01:00
e222bd5a48
Merge pull request #943 from silvin-lubecki/fix-kubernetes-published-service
...
Fix docker stack services command Port output
Upstream-commit: 27f66e39f4
2018-03-26 12:50:07 +01:00
40d437f5bc
Clarify behaviour of restart policy in run ref doc
...
This clarifies that the behaviour of `unless-stopped` will restart the container on daemon start. This was implied before, but now the restart-on-daemon-start behaviour is mentioned directly.
Signed-off-by: David Beitey <david@davidjb.com >
Upstream-commit: 8ca237054f
2018-03-26 00:21:40 +10:00
86110646cc
Fix Kubernetes duplication in version command when the server already exposes one Kubernetes component
...
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
Upstream-commit: 54bb5ffeca
2018-03-23 15:52:25 +01:00
9b231b4ae9
Merge pull request #959 from vdemeester/help-use-available-flags
...
Use HasAvailableFlags instead of HasFlags for Options in help
Upstream-commit: a6d235430a
2018-03-22 19:13:26 +01:00
4758c92085
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 >
Upstream-commit: 66fdd085a5
2018-03-22 15:24:31 +01:00
e2458dab76
Docs touch-ups for "autoremove" and broken anchor
...
`--rm` moved to the daemon, so is now also supported
when combined with `-d`.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: e9ce688d6e
2018-03-21 19:00:11 +01:00
3d78b27c6b
Remove filewatcher
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: c0588a9c8f
2018-03-20 20:13:27 -04:00
da9476e6ad
Merge pull request #924 from vdemeester/trust-suite-tests
...
Add some content trust tests
Upstream-commit: c0ffb9491c
2018-03-19 11:24:00 +01:00
0aa2494ead
Add more content trust tests
...
Importing from moby's DockerTrustSuite tests.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 8b00c5cfd8
2018-03-19 10:02:40 +01:00
7d839876b1
Merge pull request #945 from vdemeester/trust-follow-up
...
Small content trust enhancement
Upstream-commit: a5bd2973b1
2018-03-16 11:09:00 +01:00
30deffedde
Bump moby to ae7016427f8cba4e4d8fcb979d6ba313ee2c0702
...
Bring in:
- moby 36517 ensure hijackedConn implements CloseWrite function
- moby 36489 (fixes `errdefs.ErrSystem` interface)
- moby 36506 pkg/mount: use sort.Slice
- moby 36451 Windows: Report Version and UBR
Also update moby dependencies to keep them in sync
- golang.org/x/sync (no code changes)
- Bump runc to 4fc53a81fb7c994640722ac585fa9ca548971871
- Bump swarmkit to 49a9d7f6ba3c1925262641e694c18eb43575f74b
no local code changes
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: b17215c456
2018-03-15 01:51:31 +01:00
fb08bdcb4b
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 >
Upstream-commit: 63ebcae382
2018-03-14 17:55:19 +01:00
4be327090a
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 >
Upstream-commit: b816bde6cc
2018-03-14 11:33:42 +01:00
065614040d
Bash: update trust completions
...
The `docker trust` commands were moved out of experimental,
and the `docker trust view` command was changed to
`docker trust inspect --pretty`.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 2a6808db87
2018-03-14 01:21:33 +01:00
0607bea593
Merge pull request #935 from n4ss/trust-out-of-experimental2
...
Move Docker Trust out of experimental
Upstream-commit: 176aa4865c
2018-03-13 16:59:50 -07:00
b97b29bfcb
update doc
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: 09ec6d4ad9
2018-03-13 16:50:56 -07:00
f1846c5ab0
Add e2e test for stack deploy
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: fcffd67028
2018-03-12 16:24:30 -04:00
940ab0afd2
Fix named network in compose file
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: b4c108a385
2018-03-12 15:15:27 -04:00
de500b1b76
update vendor, add cmpopts
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: ca88e5e9df
2018-03-12 15:15:23 -04:00
3d40163b5c
Move Docker Trust out of experimental
...
Signed-off-by: Nassim 'Nass' Eddequiouaq <eddequiouaq.nassim@gmail.com >
Upstream-commit: ac35e851e8
2018-03-09 13:29:14 -08:00
56c837b651
Fix comment and misc code issues
...
Signed-off-by: Nassim 'Nass' Eddequiouaq <eddequiouaq.nassim@gmail.com >
Upstream-commit: 8c3d0b93d6
2018-03-09 20:46:37 +01:00
bb8f7ed84c
Refactor trust view command into a --pretty flag on trust inspect
...
Signed-off-by: Nassim 'Nass' Eddequiouaq <eddequiouaq.nassim@gmail.com >
Upstream-commit: c5554f811b
2018-03-09 19:12:11 +01:00
a895fe3327
Only read trust setting from options
...
Rename IsTrusted to ContentTrustEnabled
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: feae0e9756
2018-03-08 16:46:30 -05:00
5e391186a8
Refactor content_trust cli/flags handling
...
Remove the global variable used. Allows easier unit testing.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 6e21829af4
2018-03-08 15:00:43 -05:00
925dbcac37
Merge pull request #925 from dnephin/add-build-test-symlink
...
Add a build unit test for symlinked context
Upstream-commit: 82f325ed81
2018-03-08 18:52:43 +01:00
5b9b83cf96
Add a build unit test for symlinked context
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 00b803b2d8
2018-03-07 13:04:33 -05:00
3d323d03af
Remove unused powershell function
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 10baa756b2
2018-03-07 18:18:14 +01:00
39e1627a66
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 >
Upstream-commit: 0cf2e6353a
2018-03-07 18:18:13 +01:00
22b79a8c67
Add appveyor setup to build and unit test
...
Adds a `make.ps1` powershell script to make it easy to compile and test.
```
.\scripts\make.ps1 -Binary
INFO: make.ps1 starting at 03/01/2018 14:37:28
INFO: Building...
________ ____ __.
\_____ \ | |/ _|
/ | \| <
/ | \ | \
\_______ /____|__ \
\/ \/
INFO: make.ps1 ended at 03/01/2018 14:37:30
.\scripts\make.ps1 -TestUnit
```
The next step is to run e2e tests on windows too.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: facb22573d
2018-03-07 18:14:10 +01:00
bd1a3c6e68
Merge pull request #921 from dnephin/use-canonical-imports
...
testing: Use canonical asserts
Upstream-commit: 0e3677ead5
2018-03-07 12:00:34 -05:00
17282c064a
Merge pull request #920 from dnephin/fix-image-build-github
...
Don't prompt for github creds in unit test
Upstream-commit: 485a01fb53
2018-03-07 14:22:52 +01:00
ac93c97ba9
Merge pull request #914 from justincormack/notaryup
...
Update Notary vendor to 0.6.0 release
Upstream-commit: f351f00f9e
2018-03-07 10:38:53 +01:00
ef941c7ad3
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 >
Upstream-commit: e15b208e96
2018-03-06 16:00:28 -05:00
0d96772294
manual clean of asserts
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: f21276575f
2018-03-06 15:49:00 -05:00
b52b42c8db
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 >
Upstream-commit: 078cbc9c4b
2018-03-06 15:43:53 -05:00
dd7eb35a89
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 >
Upstream-commit: baf65a5502
2018-03-06 15:27:34 -05:00
dcb7fd9dc1
dont prompt for github creds in unit test
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 0f11a310fd
2018-03-06 15:27:09 -05:00
6dbf483853
Remove testutil
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 681c921528
2018-03-06 14:38:35 -05:00
2625498b94
Cleanup config load error handling
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 789acb526c
2018-03-06 13:44:06 -05:00
