Commit Graph

5233 Commits

Author SHA1 Message Date
Justin Cormack 2ce3dc13da
Merge pull request #997 from justincormack/notaryup
Update Notary vendor to 0.6.1
2018-04-12 10:54:50 +01:00
Sebastiaan van Stijn 3d0fc8d309
Merge pull request #988 from anusha-ragunathan/plugin_doc
Update examples to reflect docker-runc's runtime root for plugins.
2018-04-11 21:32:02 -07:00
Justin Cormack 322adc8a54
Remove testify dependency as not used any more
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2018-04-11 14:14:57 +01:00
Justin Cormack 8812c54a4d
Update Notary vendor to 0.6.1
Minor update.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2018-04-11 14:10:52 +01:00
Sebastiaan van Stijn 8e1cd515ba
Merge pull request #994 from silvin-lubecki/fix-gometalinter
Fixed gometalinter errors on test files
2018-04-10 18:49:42 -07:00
Silvin Lubecki 54f8ca6660 Fixed gometalinter errors on test files
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
2018-04-10 16:03:56 +02:00
Vincent Demeester 16eee1dcdc
Merge pull request #992 from thaJeztah/bump-version-18.05
Bump version to 18.05.0-dev
2018-04-10 11:49:01 +02:00
Sebastiaan van Stijn 341486299a
Bump version to 18.05.0-dev
Docker 18.04.0 branch was cut from e6e47d95b5

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-04-09 13:37:45 -07:00
Vincent Demeester ec412bdbb4
Merge pull request #984 from eiais/trustfish
add fish completions for docker trust subcommand
2018-04-09 22:29:09 +02:00
Sebastiaan van Stijn 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
Anusha Ragunathan 5fd9eab3d0 Update examples to reflect docker-runc's runtime root for plugins.
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com>
2018-04-05 12:14:59 -07:00
Vincent Demeester fe83feeb72
Merge pull request #986 from thaJeztah/bump-golang-1.9.5
Bump Golang to 1.9.5
2018-04-05 19:10:23 +02:00
Sebastiaan van Stijn d3b8ceb52c
Bump Golang to 1.9.5
go1.9.5 (released 2018/03/28) includes fixes to the compiler, go command, and
net/http/pprof package. See the Go 1.9.5 milestone on the issue tracker for details:

https://github.com/golang/go/issues?q=milestone%3AGo1.9.5

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-04-05 10:02:23 -07:00
Sebastiaan van Stijn 62104e2497
Merge pull request #981 from vdemeester/docs-fix-stack-deploy-reference
Fix `docker stack deploy` reference flag
2018-04-05 09:32:41 -07:00
Sebastiaan van Stijn 3eb215c128
Merge pull request #983 from vdemeester/972-fix-merge-network
Fix error with merge composefile with networks…
2018-04-05 09:31:26 -07:00
Vincent Demeester 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
Kyle Spiers 4439f6446e add fish completions for docker trust subcommand
Signed-off-by: Kyle Spiers <kyle@spiers.me>
2018-04-03 18:04:04 -07:00
Vincent Demeester 2ee9635b1e
Fix `docker stack deploy` reference flag
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-04-03 10:11:52 +02:00
Vincent Demeester 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
Sebastiaan van Stijn 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
Sebastiaan van Stijn 2f7bf40e73
Fix --format example for docker history
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-04-02 16:07:40 -07:00
Joao Fernandes 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
Bogdan Anton 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
Vincent Demeester eb4a4fe9b9
Merge pull request #965 from thaJeztah/fix-version-output
Fix docker version output alignment
2018-03-28 09:53:34 +02:00
Victor Vieux 442f56faf6
Merge pull request #975 from tonistiigi/vendor-moby
vendor: update moby to ed7b6428
2018-03-27 14:54:42 -07:00
Tonis Tiigi a1cbaa827b vendor: update moby to ed7b6428
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-03-27 14:11:29 -07:00
Daniel Nephin 26b834a698
Merge pull request #968 from dnephin/remove-myself-as-code-owner
Remove myself from CODEOWNERS
2018-03-27 16:46:54 -04:00
Sebastiaan van Stijn e6e47d95b5
Merge pull request #561 from tych0/deprecate-unencrypted-storage
Deprecate unencrypted storage
2018-03-27 14:52:03 +02:00
Sebastiaan van Stijn 236a84759a
Merge pull request #941 from dnephin/fix-compose-network-name
Fix compose network name
2018-03-26 23:41:44 +02:00
Preston Cowley 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
Daniel Nephin 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
Daniel Nephin 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
Daniel Nephin 3a633aa271 Remove myself from CODEOWNERS
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2018-03-26 13:39:03 -04:00
Sebastiaan van Stijn 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
Vincent Demeester 4290df3958 print a big warning about cleartext passwords
Signed-off-by: Tycho Andersen <tycho@docker.com>
2018-03-26 16:18:32 +02:00
Sebastiaan van Stijn 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
Sebastiaan van Stijn 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
Sebastiaan van Stijn 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
David Beitey 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
Vincent Demeester 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
Silvin Lubecki 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
Vincent Demeester 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
Sebastiaan van Stijn 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
Vincent Demeester 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
Sebastiaan van Stijn 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
Vincent Demeester c1b58a9096
Merge pull request #955 from dnephin/remove-filewatcher
Remove filewatcher
2018-03-21 14:31:26 +01:00
Daniel Nephin c0588a9c8f Remove filewatcher
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2018-03-20 20:13:27 -04:00
Sebastiaan van Stijn c0ffb9491c
Merge pull request #924 from vdemeester/trust-suite-tests
Add some content trust tests
2018-03-19 11:24:00 +01:00
Vincent Demeester 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
Vincent Demeester a5bd2973b1
Merge pull request #945 from vdemeester/trust-follow-up
Small content trust enhancement
2018-03-16 11:09:00 +01:00