romang
d0675597be
Fix: duplicate paragraph `depends_on` ( #8539 )
...
* Fix: duplicate paragraph `depends_on`
Amend duplicate paragraph `depends_on` in Compose file reference doc.
* Fix: add missing blank line
2019-05-03 12:57:56 -07:00
Sebastiaan van Stijn
de338473e1
compose-file: remove reference to custom init path ( #8628 )
...
* compose-file: remove reference to custom init path
This option was never functional, and was not intended
to be added to the "container create" API, so let's
remove it, because it has been removed in Docker 17.05,
and was broken in versions before that; see
- docker/docker-py#2309 Remove init_path from create
- moby/moby#32355 --init-path does not seem to work
- moby/moby#32470 remove --init-path from client
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* Update index.md
2019-04-12 19:04:12 +02:00
Sebastiaan van Stijn
e295a6e6cb
Use site parameter to use latest compose file versions in examples ( #8630 )
...
* Use site parameter to use latest compose file versions in examples
Make sure that examples use the latest version of the compose file
format, to encourage using the latest version, and to prevent
users from running into "not supported by this version" problems
when copy/pasting, and combining examples that use different
versions.
Also add a note about `version: x` not being equivalent to
`version: x.latest`.
Note that there are still some examples using fixed versions
in the UCP sections; we need to evaluate those to make sure
the right (and supported) versions are used for UCP (which may
be different than "latest").
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* Address some v3/v2 issues, and YAML syntax error
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* Minor edit
* Final updates
- Added note around v2 and v3 versioning
- Updated note for v3 to match the v2 update
2019-04-12 15:25:47 +02:00
Shubh
68bf0b3dcd
Update index.md : #### host or none - network ( #8425 )
...
* Update index.md : #### host or none - network
Choosing specific network for a build instead of the [network_mode]. network_mode doesn't work when providing a network for a particular build rather it skips the block and move to next service thus using network.
* Minor syntax updates
* Update index.md
those changes were a result of conflict that i tried to resolve.
2019-04-01 13:28:59 -04:00
Maria Bermudez
ec0bcc6870
Merge pull request #8399 from eMPee584/patch-1
...
stop_signal supported with docker stack deploy
2019-03-19 14:18:08 -07:00
Sebastiaan van Stijn
38423908d4
Add highlighting to compose-file reference
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-03-19 12:14:44 +01:00
Maria Bermudez
755ac92c05
Merge pull request #8246 from frank-dspeed/patch-1
...
Update index.md
2019-03-18 12:02:08 -07:00
Maria Bermudez
4d463d7c97
Link to FROM and ARG interaction section
2019-03-18 12:01:28 -07:00
paigehargrave
a15783c694
Minor syntax updates
2019-03-17 12:47:00 -04:00
Frank Lemanschik
0934b5baa7
Update index.md
2019-03-16 03:43:51 +01:00
Maria Bermudez
ccbb5e2630
Revert "Revert "Merge branch 'master' of github.com:docker/docker.github.io""
...
This reverts commit 4b5fbbdbc9
.
2019-03-08 10:53:00 -08:00
Marcel Partap
580312e771
stop_signal supported with docker stack deploy
...
support was added nearly two years ago,
c.f. https://github.com/docker/cli/issues/370
2019-03-04 17:29:31 +01:00
Paige Hargrave
4b5fbbdbc9
Revert "Merge branch 'master' of github.com:docker/docker.github.io"
...
This reverts commit 813f45bdd7
, reversing
changes made to 2349c62566
.
2019-02-28 13:11:13 -05:00
Maria Bermudez
46b8b5a1bc
Merge pull request #8174 from docker/compose-legacy-option
...
Thank you, @seemethere !
2019-02-26 18:21:29 +00:00
L-Hudson
30807046cd
Merge pull request #7416 from artdgn/master
...
Clarifying some confusing explanations for limiting cpus resource.
2019-02-26 07:53:36 -05:00
Frank Lemanschik
3a553b9e3f
Update index.md
...
corrected typo buld => build
2019-02-14 08:50:24 +01:00
Frank Lemanschik
ba09fac0b9
Update index.md
...
Updated ARGS section to point out that args defined befor FROM in Dockerfiles do not get regonized after FROM without explicit redeclartion
2019-02-14 08:30:48 +01:00
L-Hudson
8292e0dc29
Merge pull request #8198 from thaJeztah/note_picking
...
Use consistent formatting for notes
2019-02-12 11:59:49 -05:00
Sergey Bon
5d944298d9
Fix typo: docker_compose.yml -> docker-compose.yml
2019-02-09 15:11:15 +02:00
Sebastiaan van Stijn
03d5b3396d
Use consistent formatting for notes
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-02-09 00:49:57 +01:00
Maria Bermudez
e9272d0977
Specify that mac_address is a legacy option
2019-02-06 18:07:30 -08:00
Wi1dcard
f6deeeafd1
Remove non-sense angle brackets.
2019-02-06 00:24:12 +08:00
paigehargrave
0dab4ade68
Merge branch 'master' into name-change-for-Docker-Desktop
2019-01-14 11:14:48 -05:00
paigehargrave
b47ac9ae3b
Update index.md
2019-01-11 16:10:52 -05:00
L-Hudson
387d1a14f7
Update index.md
...
Editorial crx
2019-01-10 11:45:35 -05:00
Maria Bermudez
dba97175ff
Merge branch 'master' into patch-1
2019-01-10 06:48:27 -08:00
Maria Bermudez
e6edbdd945
Merge pull request #7178 from adamancini/patch-8
...
Merging based on previous conversation
2019-01-02 13:42:00 -08:00
paigehargrave
2788a53481
Merge pull request #7728 from siyu6974/patch-1
...
Update example for deprecated name
2018-12-28 13:09:11 -05:00
Anne Henmi
30c6242a3e
Merge pull request #7624 from shin-/c4601-exclusive-external
...
Update docs for volume and networks about the changed behavior of the external key
2018-12-26 10:01:30 -07:00
Maria Bermudez
c01ab3cbda
Clarify versions of secrets config samples
2018-12-19 17:19:42 -08:00
Maria Bermudez
500c265a09
Merge branch 'master' into patch-1
2018-12-18 13:27:43 -08:00
Siyu
aac5701eae
Update index.md
2018-12-18 10:44:53 +01:00
Siyu
c52e3c834e
Add back old example but mark as deprecated
2018-12-18 10:44:10 +01:00
Dima Tisnek
6dd9fa00e9
Document consistency flag in mounts
2018-12-11 12:46:25 +09:00
Siyu
915f740182
Update example for deprecated name
...
secret.external.name is deprecated in favor of secret.name
2018-11-20 12:43:08 +01:00
Henré Botha
5c0fe6c663
Fix ordering of service config reference
2018-11-12 14:57:27 +02:00
Joffrey F
2efd2456d7
Update docs for volume and networks about the changed behavior of the external key
...
in newer versions of the format
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-11-06 16:02:54 -08:00
arthur_x1
7753a6cd5a
Clarifying confusing explanations for limiting cpus resource in docker-compose file to prevent misunderstanding as "percent of total CPU available".
2018-09-25 10:55:18 +10:00
Oscar Caballero
269c80d2d9
Spelling revision
2018-09-23 21:43:11 +02:00
ada
5e8f7a25ab
NFS example for driver_opts
...
People ask me how to do this all the time, and I can't find a good example documented anyhwere else. I figure this is a better example of the actual usage of the driver_opts parameter with a real-world use case.
2018-08-06 13:42:15 -04:00
Cameron Steffen
35cefb2f73
fix init example version
2018-07-31 04:11:26 -05:00
Tammy Fox
9a0cb8c058
Merge pull request #6975 from sascha-egerer/patch-4
...
Fix copy and paste error
2018-07-26 00:35:28 -04:00
Joffrey F
caad3ebe13
1.22.0 release notes and documentation
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-07-05 13:32:51 -07:00
Sascha Egerer
1165708794
Fix copy and paste error
...
"networks" must be "volumes" at that place
2018-06-30 22:04:59 +02:00
Ben Creasy
14ef9244e3
Cannot find reference to --net
...
Is network intended? It looks like this is talking about https://docs.docker.com/engine/reference/run/#network-settings
2018-06-15 14:59:56 -07:00
Xander Marjoram
87c84916f3
Documentation typo fixes
2018-05-18 10:06:05 -07:00
Trapier Marshall
2a62bcf235
fix version in compose placement pref example ( #6569 )
2018-04-27 09:22:24 -07:00
Teoh Han Hui
37f9546e32
Quote port numbers when using short syntax
...
Comply with our own advice.
2018-04-23 10:39:45 -07:00
James Gentes
a8b93a59ea
Added note to 'ports' section: Port mapping is incompatible with `network_mode: host`
...
Took a while to figure this one out. Source: https://github.com/docker/compose/issues/4799#issuecomment-299605031
2018-04-16 13:57:53 -07:00
rdxmb
246e8e2e3a
DO-NOT-MERGE update the docs for using host-network ( #6124 )
2018-04-11 13:09:49 -07:00