Commit Graph

1477 Commits

Author SHA1 Message Date
Adrian Plata f2f41723fb
fixing missing word 2019-06-20 10:54:27 -07:00
Adrian Plata 8c46d71655
Adding a note on possible version errors 2019-06-20 10:53:49 -07:00
Adrian Plata b0a9f6f3b6
Merge branch 'master' into patch-1 2019-06-20 10:48:48 -07:00
Maria Bermudez 6c1f2dfe26
Update URLs to Microsoft images
Minor edits
2019-06-19 08:34:06 -07:00
Usha Mandya ac099018c1
Merge pull request #8609 from davidism/patch-1
Update Python and Flask usage in Compose tutorial
2019-05-23 09:54:13 +01:00
Daniel Peukert f2093d4e2a Fixed env_file anchor in environment-variables.md (#8764) 2019-05-09 11:35:31 -07:00
K-Sato 07a089f27d Add an indentation in compose-gettingstarted.md (#8487)
* Add an indentation

* Fix messaging on service dependencies
2019-05-07 18:16:29 -07:00
K-Sato db4749c56a Fixed a sentence (#8728)
* Fixed a sentence

* Minor edit
2019-05-07 18:01:13 -07:00
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
David Lord f5da7af31f
add gcc so markupsafe compiles speedups 2019-04-11 09:57:44 -07:00
David Lord 34fe3db007
remove 0.0.0.0 url 2019-04-11 09:48:27 -07:00
David Lord 6f2e3d389d
remove unused `app.run()` call
This is not needed when using the recommended `flask run`
command to run the development server.
2019-04-07 02:12:35 -07:00
David Lord 86f716623f
update python and flask usage in dockerfile
* Uses the modern Python 3.7 image, as 3.4 is EOL.
* Separates copying and installing requirements from copying
  project, to make rebuilds more efficient.
* Uses the recommended `flask run` command. This is especially
  needed on Windows, where `app.py` incorrectly looks like an
  executable file when copying into Docker.
* Uses the `FLASK_ENV` env var to control development mode.
2019-04-07 02:02:29 -07:00
Ulysses Souza 9ff6e4f4f6 Add pip dependencies to compose doc for alpine (#8554)
* Add pip dependencies to compose doc for alpine

Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>

* Minor edit
2019-04-01 14:35:23 -04: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
Sebastiaan van Stijn 7bbff2a2ee
Update compose-version to 1.24.0
https://github.com/docker/compose/releases/tag/1.24.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-03-28 20:53:39 +01:00
Maria Bermudez cb25367101
Merge pull request #8516 from usha-mandya/8349-format-fixes
fix formatting issues in completion.md file
2019-03-22 13:00:15 -04:00
Maria Bermudez 4331e12c10
Merge pull request #8519 from ekitagawa/patch-20
Fixing download location
2019-03-22 12:58:17 -04:00
Maria Bermudez 9123031825
Added note 2019-03-22 12:53:09 -04:00
Maria Bermudez bc0e8ddc33
Merge pull request #8412 from thaJeztah/split_out_windows_server
Compose: put Windows Server in its own tab for installation
2019-03-22 12:43:51 -04:00
Eiichi Kitagawa 0540ee39dd
Fixing download location
Download command below points to a dir that doesn't exist
```
Invoke-WebRequest "https://github.com/docker/compose/releases/download/1.23.2/docker-compose-Windows-x86_64.exe" -UseBasicParsing -OutFile $Env:ProgramFiles\Docker\Docker\resources\bin\docker-compose.exe
```
On Windows Server 2019 (and probably on 2016), other exe files are under "$Env:ProgramFiles\Docker\" so that should be a good place to put the compose's executable.  This directory is also registered in "PATH" of the system, so users can call out `docker-compose --version` command on the next step without additional configuration.
2019-03-22 09:19:38 -07:00
usha-mandya ed87d31a00 fix formatting issues in completion.md file 2019-03-22 10:48:33 +00: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
Maria Bermudez 773ff41ddd
Link to ARG and FROM interaction section 2019-03-18 12:00:47 -07:00
paigehargrave a15783c694
Minor syntax updates 2019-03-17 12:47:00 -04:00
paigehargrave c191ecf594
Minor syntax fixes 2019-03-17 12:46:01 -04:00
paigehargrave e7fc879f08
Update compose-file-v2.md 2019-03-17 12:44:15 -04:00
Frank Lemanschik 0934b5baa7
Update index.md 2019-03-16 03:43:51 +01:00
Frank Lemanschik 918a65fb46
Update compose-file-v2.md 2019-03-16 03:43:19 +01:00
Usha Mandya 53b9498ab4
Revert "Compose: Update build docs, Add --quiet flag" 2019-03-13 17:49:32 +00:00
Usha Mandya 9ce6ea8d27
Merge pull request #8418 from akshitgrover/master
Compose: Update build docs, Add --quiet flag
2019-03-13 04:34:55 -07: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
Akshit Grover 816fff73ae
Compose: Update build docs, Add --quiet flag 2019-03-07 19:46:32 +05:30
L-Hudson 927d53239b
Update install.md
editorial crx
2019-03-06 17:01:25 -05:00
Maria Bermudez 1e513418ca
Capitalize product name 2019-03-06 10:10:38 -08:00
Sebastiaan van Stijn 25fffa2f18
Compose: put Windows Server in its own tab for installation
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-03-06 14:01:35 +01:00
Sebastiaan van Stijn f6ed1b7725
Clarify that compose installation is for stable release
This patch updates the compose installation instruction to
be more clear about the default instructions installing
the current stable release.

Inline nodes about installing different versions has been
reduced, and the "Master builds" section has been renamed
to "Install pre-release builds", to capture installing either
"master" builds, or pre-releases (release-candidates) from
GitHub.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-03-06 13:21:54 +01: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
Usha Mandya 51cac2184d content updates for #8092 2019-02-20 17:24:16 +00:00
Usha Mandya 66c4cdd5b4 Merge branch 'patch-1' of git://github.com/TheRijn/docker.github.io into TheRijn-patch-1 2019-02-20 17:19:08 +00:00
Frank Lemanschik 3a553b9e3f
Update index.md
corrected typo buld => build
2019-02-14 08:50:24 +01:00
Frank Lemanschik d913946246
Update compose-file-v2.md
corrected typo buld => build
2019-02-14 08:49:56 +01:00