79e8ae0e9d
docker load: Typofix in examples
...
Remove the double "docker docker" from example
Signed-off-by: Henry Ne <henrynmail-github@yahoo.de >
(cherry picked from commit 79c489d812github@gone.nl >
2018-04-18 10:17:55 -07:00
39f7e7efd0
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 >
(cherry picked from commit 82c23208eegithub@gone.nl >
2018-04-18 10:17:50 -07:00
766c24e554
Update examples to reflect docker-runc's runtime root for plugins.
...
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com >
(cherry picked from commit 5fd9eab3d0github@gone.nl >
2018-04-18 10:17:44 -07:00
4e72a2fd51
Fix --format example for docker history
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit 2f7bf40e73github@gone.nl >
2018-04-18 10:17:39 -07:00
24306165c5
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 >
(cherry picked from commit 5238f3e93egithub@gone.nl >
2018-04-18 10:17:33 -07:00
27540de1ad
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 >
(cherry picked from commit ad44e2d45egithub@gone.nl >
2018-04-18 10:17:26 -07:00
1df656a2f0
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 >
(cherry picked from commit 8ca237054fgithub@gone.nl >
2018-04-18 10:17:18 -07:00
bb68afd0fc
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 >
(cherry picked from commit e9ce688d6egithub@gone.nl >
2018-04-18 10:17:11 -07:00
d602967356
Merge pull request #495 from thaJeztah/18.03-backport-972-fix-merge-network
...
[18.03] backport Fix error with merge composefile with networks…
2018-04-16 19:04:36 -07:00
aff214cf5c
Merge pull request #497 from thaJeztah/18.03-backport-fix-manifest-docs-typo
...
[18.03] [docs] Fix typo in manifest command docs: updated `MANFEST` to `MANIFEST`
2018-04-11 21:32:33 -07:00
92f0dce1d1
Fix docker stack deploy reference flag
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
(cherry picked from commit 2ee9635b1egithub@gone.nl >
2018-04-11 14:40:52 -07:00
aba0bb77e1
Refactor content_trust cli/flags handling
...
Remove the global variable used. Allows easier unit testing.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
(cherry picked from commit 6e21829af4github@gone.nl >
2018-04-10 15:07:03 -07:00
64fe575962
[docs] Fix typo in manifest command docs: updated MANFEST to MANIFEST.
...
Signed-off-by: Bogdan Anton <contact@bogdananton.ro >
(cherry picked from commit 9fa6bd4174github@gone.nl >
2018-04-09 13:31:04 -07:00
7d9137fefc
Merge pull request #461 from vdemeester/trust-updates
...
[18.03] move trust out of experimental
2018-03-14 10:23:54 -07:00
518a7181ad
update doc
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
(cherry picked from commit 09ec6d4ad9
2018-03-14 09:14:58 +01:00
9dbc108a14
Merge pull request #441 from thaJeztah/18.03-backport-templated-configs-secrets
...
[18.03] Add --template-driver option for secrets/configs
2018-03-05 22:25:55 -08:00
767a8f6227
Update run.md --restart to include unless-stopped
...
Update --restart option to include unless-stopped to be consistent with https://docs.docker.com/config/containers/start-containers-automatically/#use-a-restart-policy
Signed-off-by: Lydell Manganti <lydell.manganti@gmail.com >
(cherry picked from commit d281b72a98github@gone.nl >
2018-02-28 18:10:39 +01:00
de4362e128
docs: mention sctp
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
(cherry picked from commit b85d87b8abgithub@gone.nl >
2018-02-26 11:40:06 +01:00
eda1e25f5c
Add --template-driver option for secrets/configs
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit d11b5ccdfagithub@gone.nl >
2018-02-26 11:34:23 +01:00
acea77d537
Merge pull request #843 from sepich/docs-for-pr33130
...
Document long form of --network and --network-add
Upstream-commit: 84c7dd6057
2018-02-21 23:26:39 +01:00
81f2f8b4a0
Merge pull request #885 from thaJeztah/node-engine-version
...
Add Engine version to docker node ls
Upstream-commit: 1e8530bc34
2018-02-20 18:45:36 +01:00
bf0c1bd1d9
Update docker kill reference docs
...
- explain the either "name" or "id" can be used to reference a container
- explain that signals can be sent by name or number
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 0c085c2a77
2018-02-20 14:58:55 +01:00
3657332c34
Add Engine version to docker node ls
...
This adds the Engine version to `docker node ls`, and `.EngineVersion` as a
template option.
With this patch applied:
docker node ls
ID HOSTNAME STATUS AVAILABILITY MANAGER STATUS ENGINE VERSION
wp9231itoqsh4rqceojqo01vp * linuxkit-025000000001 Ready Active Leader 18.01.0-ce
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: e888dd711f
2018-02-17 02:58:05 +01:00
dd73a093e4
Merge pull request #564 from thaJeztah/fix-yaml-examples
...
Fix leading characters being stripped from example sections in YAML
Upstream-commit: 847cc4bdc0
2018-02-16 11:22:24 -05:00
d9b7b3fed0
Document service --network long form
...
Signed-off-by: Alexander Ryabov <i@sepa.spb.ru >
Upstream-commit: 94ecd2ba73
2018-02-16 09:34:42 +03:00
c38f2d0ac2
Merge pull request #869 from mistyhacks/3343-swarm-network-plugins
...
Clarify network plugins and swarm mode
Upstream-commit: 9a264be221
2018-02-13 21:05:44 -05:00
ffb77fa93a
Update reference docs for docker stack deploy
...
`docker stack deploy` now support multiple composefil. This updates the
reference doc to take that fact into account.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 4c50007496
2018-02-09 14:22:45 +01:00
4415397c48
Clarify network plugins and swarm mode
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 16d29b3cd6
2018-02-08 14:08:31 -08:00
770eb4a40c
Clarify description of volume prune command
...
volume prune command removes only local volumes
not used by at least one container.
Signed-off-by: Sungwon Han <sungwon.han@navercorp.com >
Upstream-commit: 34504d0a1e
2018-02-08 15:33:07 +09:00
5007511cdb
Merge pull request #863 from WTFKr0/tls-env-var
...
Add DOCKER_TLS environment variable for --tls option
Upstream-commit: b5df4f69db
2018-02-06 10:24:38 -08:00
3bb4e932f7
Add DOCKER_TLS environment variable
...
Signed-off-by: WTFKr0 <thomas.kovatchitch@gmail.com >
Upstream-commit: 42fa3ef7d8
2018-02-06 09:27:05 +01:00
8e79d4b5b1
Merge pull request #860 from mistyhacks/explain-netio-blockio
...
Explain the columns shown in docker stats
Upstream-commit: e12f71a9b8
2018-02-05 18:47:24 -08:00
70566138f9
Merge pull request #858 from mistyhacks/add-registry-auth-example
...
Add an example for --with-registry-auth
Upstream-commit: ce985d04ce
2018-02-05 18:45:50 -08:00
be8b7a4dfb
Merge pull request #851 from mistyhacks/overlay-network-limits
...
Doc guidance to only use 256 IPs per overlay
Upstream-commit: 19e4389a72
2018-02-01 11:11:27 -08:00
20111ede63
Explain the columns shown in docker stats
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 0219338781
2018-01-31 17:05:54 -08:00
2daf468e57
Add quotes around format template
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 0b6aeae007
2018-01-31 16:51:43 -08:00
dc47308ffd
Add an example for --with-registry-auth
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 821452629c
2018-01-31 13:38:49 -08:00
0a7bda1a7c
Fix doubled word in note
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: a2bb62683d
2018-01-31 13:05:58 -08:00
198448e674
Doc guidance to only use 256 IPs per overlay
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 6085b5d3aa
2018-01-30 15:41:53 -08:00
7de8b77c33
Merge pull request #848 from mistyhacks/fix-publish-table
...
Fix the network option table
Upstream-commit: bb9e5ab767
2018-01-30 14:32:32 -08:00
d0e1c8724c
Fix the network option table
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 773ccdec7b
2018-01-30 14:00:48 -08:00
b0db1afb21
Add examples of prune by label
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: bc28bf13f7
2018-01-30 11:29:45 -08:00
8f3ae07b6b
Merge pull request #717 from albers/completion-images-2
...
Improve and fix bash completion for images
Upstream-commit: 4586609f71
2018-01-27 17:48:49 -08:00
e94c45a5c9
Merge pull request #138 from clnperez/manifest-cmd
...
Add manifest command
Upstream-commit: 11dfa23a5d
2018-01-18 22:15:49 +01:00
dc08aa82a2
add manifest cmd cli doc
...
Signed-off-by: Christy Norman Perez <christy@linux.vnet.ibm.com >
Upstream-commit: 6c6ce22447
2018-01-18 10:53:09 -06:00
33df5a9f66
Update buidler ENV docs
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 01b521c002
2018-01-17 16:55:07 -05:00
42cf4bc867
Fix stray quote in builder.md
...
Signed-off-by: Taylor Brown <taylorb@microsoft.com >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 90cfa01889
2018-01-16 22:51:57 +01:00
4db79d6583
golint: remove redundant ifs
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: d845b4d36a
2018-01-13 13:16:34 +01:00
3e7d4bee2e
Fix docs YAML generation setting "kubernetes" for "swarm"
...
Due to a copy/paste error, commands annotated with "swarm"
were incorrectly setting the "kubernetes" property.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 6be06a3db2
2018-01-11 18:30:50 +01:00
143be37b02
Fix repeated "for" in docs/reference/builder.md
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 7e465d1b09
2018-01-08 12:33:06 +01:00
