Commit Graph

1458 Commits

Author SHA1 Message Date
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
Frank Lemanschik
f314f2cd51 Update compose-file-v2.md
Updated Documentation section ARGS added a note about the fact that ARG defined befor FROM is not there after FROM without explicit adding it again after FROM
2019-02-14 08:33:45 +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
Maria Bermudez
5b0d915c2a Minor edits 2019-02-08 18:08:48 -08:00
Maria Bermudez
bb89dc1465 Rework autocompletion page 2019-02-08 18:05:13 -08: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
paigehargrave
1ac18238e2 Merge pull request #6385 from KevM/patch-1
Fix `-OutFile` argument to be the correct path
2019-02-06 17:06:18 -05:00
Wi1dcard
f6deeeafd1 Remove non-sense angle brackets. 2019-02-06 00:24:12 +08:00
Daniel Compton
8994637b41 Note extending individual services only works up to version 2.1
Adds a note that the `extends` field only works up to version 2.1 
at the header of the page.
2019-01-31 13:24:42 +13:00
Daniel Compton
59eec9832b Remove leading whitespace in code blocks from Django docs 2019-01-30 15:20:43 +13:00
Marijn Jansen
c69a3fad5d Added docker-compose for oh-my-zsh autocomplete 2019-01-29 14:09:21 +01:00
T.D. Gonzales
98e825dd39 Adding wordpress environment variable.
Wordpress needs to know what db to it's user has access to. Without this mysql throws access denied errors.
2019-01-28 21:12:09 -07:00
Adzim Zul Fahmi
cd7f8e5246 fixing typo 2019-01-18 22:55:50 +07:00
paigehargrave
776e10040d Merge pull request #7404 from sasidhar/patch-1
Added setup instructions for oh-my-zsh
2019-01-17 11:21:02 -05:00
Maria Bermudez
565537843b Merge pull request #6725 from 2tunnels/patch-1
update compose django example
2019-01-15 16:57:40 -08:00
paigehargrave
0dab4ade68 Merge branch 'master' into name-change-for-Docker-Desktop 2019-01-14 11:14:48 -05:00