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
4439f6446e
add fish completions for docker trust subcommand
...
Signed-off-by: Kyle Spiers <kyle@spiers.me>
2018-04-03 18:04:04 -07:00
2ee9635b1e
Fix `docker stack deploy` reference flag
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-04-03 10:11:52 +02:00
17aaad6f06
Merge pull request #979 from joaofnfernandes/docs-secrets-6294
...
Use printf, not echo when creating secrets
2018-04-03 09:45:11 +02:00
4faf9a1736
Merge pull request #980 from thaJeztah/fix-history-format-placeholder
...
Fix --format example for docker history
2018-04-02 20:14:51 -07:00
2f7bf40e73
Fix --format example for docker history
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-04-02 16:07:40 -07:00
5238f3e93e
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>
2018-04-02 15:15:19 -07: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
442f56faf6
Merge pull request #975 from tonistiigi/vendor-moby
...
vendor: update moby to ed7b6428
2018-03-27 14:54:42 -07:00
a1cbaa827b
vendor: update moby to ed7b6428
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-03-27 14:11:29 -07:00
26b834a698
Merge pull request #968 from dnephin/remove-myself-as-code-owner
...
Remove myself from CODEOWNERS
2018-03-27 16:46:54 -04: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
ad44e2d45e
Update build.md
...
Explicitly stated that you must add --build-arg for each build argument.
Added multiple arguments to example of `--build-arg` usage.
Fix for https://github.com/docker/docker.github.io/issues/6248
Signed-off-by: Preston Cowley <cowlinator@gmail.com>
2018-03-26 14:28:49 -07:00
d3efe30878
Merge pull request #931 from dnephin/refactor-build-unit-tests
...
Refactor build tests to re-use more code and not require root
2018-03-26 14:44:13 -04: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
3a633aa271
Remove myself from CODEOWNERS
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2018-03-26 13:39:03 -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
db11cffe37
Merge pull request #962 from davidjb/run-docs
...
Clarify behaviour of restart policy in run ref doc
2018-03-26 13:14:44 +01: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
8ca237054f
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>
2018-03-26 00:21:40 +10:00
c3991d0673
Merge pull request #953 from silvin-lubecki/fix-docker-version-kubernetes
...
Fix Kubernetes duplication in version command
2018-03-23 15:59:37 +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
a6d235430a
Merge pull request #959 from vdemeester/help-use-available-flags
...
Use HasAvailableFlags instead of HasFlags for Options in help
2018-03-22 19:13:26 +01:00
ad4fe148d6
Merge pull request #957 from thaJeztah/docs-touch-ups
...
Docs touch-ups for "autoremove" and broken anchor
2018-03-22 18:26:45 +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
e9ce688d6e
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>
2018-03-21 19:00:11 +01:00
c1b58a9096
Merge pull request #955 from dnephin/remove-filewatcher
...
Remove filewatcher
2018-03-21 14:31:26 +01:00
c0588a9c8f
Remove filewatcher
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2018-03-20 20:13:27 -04: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
a5bd2973b1
Merge pull request #945 from vdemeester/trust-follow-up
...
Small content trust enhancement
2018-03-16 11:09:00 +01:00
37eebe5cb6
Merge pull request #946 from thaJeztah/bump-moby
...
Bump moby to ae7016427f8cba4e4d8fcb979d6ba313ee2c0702
2018-03-15 09:49:25 -04:00
b17215c456
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>
2018-03-15 01:51:31 +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
6d7c23a6b4
Merge pull request #944 from thaJeztah/update-completion-scripts
...
Bash: update trust completions
2018-03-14 08:42:40 +01:00
2a6808db87
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>
2018-03-14 01:21:33 +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
09ec6d4ad9
update doc
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2018-03-13 16:50:56 -07:00
fcffd67028
Add e2e test for stack deploy
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2018-03-12 16:24:30 -04:00
b4c108a385
Fix named network in compose file
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2018-03-12 15:15:27 -04:00
ca88e5e9df
update vendor, add cmpopts
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2018-03-12 15:15:23 -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
2731c71c99
Merge pull request #934 from n4ss/refactor-trust-inspect
...
Refactor trust view command into a --pretty flag on trust inspect
2018-03-09 13:25:01 -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
Vincent Demeester
Kyle Spiers
Vincent Demeester
Sebastiaan van Stijn
Sebastiaan van Stijn
Joao Fernandes
Bogdan Anton
Victor Vieux
Tonis Tiigi
Daniel Nephin
Preston Cowley
Daniel Nephin
David Beitey
Silvin Lubecki
Brian Goff
Nassim 'Nass' Eddequiouaq