cb04b581ce
Merge pull request #983 from vdemeester/972-fix-merge-network
...
Fix error with merge composefile with networks…
Upstream-commit: 3eb215c128
2018-04-05 09:31:26 -07:00
96e7de35a2
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 >
Upstream-commit: 0122730faf
2018-04-05 10:37:35 +02:00
6a9a060b45
Merge pull request #979 from joaofnfernandes/docs-secrets-6294
...
Use printf, not echo when creating secrets
Upstream-commit: 17aaad6f06
2018-04-03 09:45:11 +02:00
d94b697fa2
Merge pull request #980 from thaJeztah/fix-history-format-placeholder
...
Fix --format example for docker history
Upstream-commit: 4faf9a1736
2018-04-02 20:14:51 -07:00
74a9225ea5
Fix --format example for docker history
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 2f7bf40e73
2018-04-02 16:07:40 -07:00
15ef970018
Use printf, not echo when creating secrets
...
Update the docs so that users don't use `echo` when creating
secrets from STDIN. `echo` adds a trailing new line, so users
will probably be confused when their passwords don't work.
Signed-off-by: Joao Fernandes <joao.fernandes@docker.com >
Upstream-commit: 5238f3e93e
2018-04-02 15:15:19 -07:00
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
ee50259e4c
Merge pull request #931 from dnephin/refactor-build-unit-tests
...
Refactor build tests to re-use more code and not require root
Upstream-commit: d3efe30878
2018-03-26 14:44:13 -04: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
e1bf73660b
Merge pull request #953 from silvin-lubecki/fix-docker-version-kubernetes
...
Fix Kubernetes duplication in version command
Upstream-commit: c3991d0673
2018-03-23 15:59:37 +01: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
14f21513ed
Merge pull request #957 from thaJeztah/docs-touch-ups
...
Docs touch-ups for "autoremove" and broken anchor
Upstream-commit: ad4fe148d6
2018-03-22 18:26:45 +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
48f3c4dac0
Merge pull request #955 from dnephin/remove-filewatcher
...
Remove filewatcher
Upstream-commit: c1b58a9096
2018-03-21 14:31:26 +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
ce28c959c9
Merge pull request #946 from thaJeztah/bump-moby
...
Bump moby to ae7016427f8cba4e4d8fcb979d6ba313ee2c0702
Upstream-commit: 37eebe5cb6
2018-03-15 09:49:25 -04: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
9c4b5f4db9
Merge pull request #944 from thaJeztah/update-completion-scripts
...
Bash: update trust completions
Upstream-commit: 6d7c23a6b4
2018-03-14 08:42:40 +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
84628fc361
Merge pull request #934 from n4ss/refactor-trust-inspect
...
Refactor trust view command into a --pretty flag on trust inspect
Upstream-commit: 2731c71c99
2018-03-09 13:25:01 -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
cb331ab272
Merge pull request #929 from vdemeester/trust-no-global-var
...
Refactor content_trust cli/flags handling
Upstream-commit: 240c03a7f8
2018-03-09 11:04:09 +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
