05bd043eba
Update AUTHORS and mailmap
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: a761eff8c5
2018-04-18 13:31:07 -07:00
de82b21350
Merge pull request #1004 from albers/completion--template-driver
...
Add bash completion for `secret|config create --template-driver`
Upstream-commit: 0685bb29db
2018-04-18 19:04:29 +02:00
10b6953e20
Merge pull request #1008 from n4ss/revert-unencrypted-prompt
...
Revert unencryted storage warning prompt
Upstream-commit: 8618838bdb
2018-04-18 00:01:13 -07:00
f1112e0539
Merge pull request #999 from perlun/patch-1
...
build.md: Document --build-arg without value
Upstream-commit: 771ccaf4ed
2018-04-17 10:39:20 -07:00
1805ce9e0e
Merge pull request #1007 from HenryNe/patch-1
...
docs: Typofix in example "docker image ls"
Upstream-commit: f3bf6928da
2018-04-17 10:10:19 +02:00
46a62eba1d
Revert unencryted storage warning prompt
...
Signed-off-by: Nassim 'Nass' Eddequiouaq <eddequiouaq.nassim@gmail.com >
Upstream-commit: 3acf5d2e47
2018-04-16 12:48:03 -07:00
8037d00abb
docker load: Typofix in examples
...
Remove the double "docker docker" from example
Signed-off-by: Henry Ne <henrynmail-github@yahoo.de >
Upstream-commit: 79c489d812
2018-04-16 16:39:54 +02:00
e4e0816835
build.md: Document --build-arg without value
...
This use case is currently _working correctly_, which is nice, but there is no documentation to be found about it. This PR fixes that.
Signed-off-by: Per Lundberg <perlun@gmail.com >
Upstream-commit: 82c23208ee
2018-04-16 07:52:13 +03:00
cf1baa9f3c
Add bash completion for secret|config create --template-driver
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 43024e2d57
2018-04-14 14:46:19 +02:00
a95dfe42a3
Merge pull request #970 from cowlinator/temp2
...
Clarify --build-arg documentation
Upstream-commit: e5980c541a
2018-04-13 18:54:16 -07:00
944c468f43
Merge pull request #963 from thaJeztah/fix-stack-deploy-after-force
...
Fix stack deploy re-deploying service after --force
Upstream-commit: 6b31ea0f0d
2018-04-13 13:06:40 -10:00
21bd6f1766
Merge pull request #997 from justincormack/notaryup
...
Update Notary vendor to 0.6.1
Upstream-commit: 2ce3dc13da
2018-04-12 10:54:50 +01:00
0166969766
Merge pull request #988 from anusha-ragunathan/plugin_doc
...
Update examples to reflect docker-runc's runtime root for plugins.
Upstream-commit: 3d0fc8d309
2018-04-11 21:32:02 -07:00
6ed9fc6e5c
Remove testify dependency as not used any more
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: 322adc8a54
2018-04-11 14:14:57 +01:00
ac4eb0950b
Update Notary vendor to 0.6.1
...
Minor update.
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: 8812c54a4d
2018-04-11 14:10:52 +01:00
6aec02bb4f
Merge pull request #994 from silvin-lubecki/fix-gometalinter
...
Fixed gometalinter errors on test files
Upstream-commit: 8e1cd515ba
2018-04-10 18:49:42 -07:00
37bdc4a0ae
Fixed gometalinter errors on test files
...
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
Upstream-commit: 54f8ca6660
2018-04-10 16:03:56 +02:00
4a24bb90a9
Merge pull request #992 from thaJeztah/bump-version-18.05
...
Bump version to 18.05.0-dev
Upstream-commit: 16eee1dcdc
2018-04-10 11:49:01 +02:00
87af25ac9e
Bump version to 18.05.0-dev
...
Docker 18.04.0 branch was cut from e6e47d95b5github@gone.nl >
Upstream-commit: 341486299a
2018-04-09 13:37:45 -07:00
fe0d099c16
Merge pull request #984 from eiais/trustfish
...
add fish completions for docker trust subcommand
Upstream-commit: ec412bdbb4
2018-04-09 22:29:09 +02:00
a5ee15c5ef
Merge pull request #978 from bogdananton/fix-manifest-docs-typo
...
[docs] Fix typo in manifest command docs: updated `MANFEST` to `MANIFEST`.
Upstream-commit: 066fd62e37
2018-04-09 13:25:37 -07:00
5d0f671bd1
Update examples to reflect docker-runc's runtime root for plugins.
...
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com >
Upstream-commit: 5fd9eab3d0
2018-04-05 12:14:59 -07:00
74bf31d3e3
Merge pull request #986 from thaJeztah/bump-golang-1.9.5
...
Bump Golang to 1.9.5
Upstream-commit: fe83feeb72
2018-04-05 19:10:23 +02:00
33403f2a86
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 >
Upstream-commit: d3b8ceb52c
2018-04-05 10:02:23 -07:00
89747f2a26
Merge pull request #981 from vdemeester/docs-fix-stack-deploy-reference
...
Fix `docker stack deploy` reference flag
Upstream-commit: 62104e2497
2018-04-05 09:32:41 -07:00
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
119115ef8d
add fish completions for docker trust subcommand
...
Signed-off-by: Kyle Spiers <kyle@spiers.me >
Upstream-commit: 4439f6446e
2018-04-03 18:04:04 -07:00
77bb3ea6e7
Fix docker stack deploy reference flag
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 2ee9635b1e
2018-04-03 10:11:52 +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
5392f72ea0
[docs] Fix typo in manifest command docs: updated MANFEST to MANIFEST.
...
Signed-off-by: Bogdan Anton <contact@bogdananton.ro >
Upstream-commit: 9fa6bd4174
2018-04-01 17:40:31 +03: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
6493e53acd
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 >
Upstream-commit: ad44e2d45e
2018-03-26 14:28:49 -07: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
9166a5d3e5
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 >
Upstream-commit: 76439457d2
2018-03-26 15:24:28 +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
