centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-04-12 06:19:22 +07:00
Code Issues Packages Projects Releases Wiki Activity
43,359 Commits 57 Branches 28 Tags
74523ae57d7f047210e601e63581f31b60a328cd
Commit Graph

905 Commits

Author SHA1 Message Date
Gaetan
2ea564166d fix type of keywords entry in frontmatter (in /compose/ dir) (#481) 
keywords should be a string, not an array containing one string

Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
 2016-11-07 13:18:56 -08:00
John Mulhausen
949a89e6ea Merge pull request #152 from mstanleyjones/redirect_from 
Change 'alias:' to 'redirect_from:' so aliases work again
 2016-11-04 17:34:27 -07:00
Misty Stanley-Jones
f4b0ec85ff Merge pull request #339 from dave-pollock/patch-1 
Update swarm.md
 2016-11-04 17:11:40 -07:00
Misty Stanley-Jones
eb5c8670bc Change instances of alias: to redirect_from: 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-11-04 17:07:02 -07:00
John Mulhausen
558314bf56 Converges titles to imperative-form, front-matter based, and sentence-case (#438) 
Multiple title fixes, consistency fixes, convergence into metadata-based titles.
 2016-11-04 15:38:40 -07:00
Misty Stanley-Jones
1a193d749b Revert "Merge pull request #437 from gdevillele/fix_keywords_format" 
This reverts commit 13ddc1350e, reversing
changes made to 7a11f05943.
 2016-11-04 13:33:29 -07:00
Misty Stanley-Jones
33d3d067d0 Revert "fix some frontmatter keywords values" 2016-11-04 13:30:04 -07:00
Misty Stanley-Jones
0827ba283c Revert "fix frontmatter keywords values in compose/reference/ files" 2016-11-04 13:28:43 -07:00
Misty Stanley-Jones
13ddc1350e Merge pull request #437 from gdevillele/fix_keywords_format 
fix some frontmatter keywords values
 2016-11-04 10:50:53 -07:00
Gaetan
8bb4d6226a fix more frontmatter keywords values (#439) 
* fix format of frontmatter keyword entry in some .md files

Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
 2016-11-04 10:48:38 -07:00
Gaetan de Villele
7a11f05943 fix some frontmatter keywords values 
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
 2016-11-03 10:22:12 -07:00
Gaetan de Villele
bb4f3be02e fix frontmatter keywords values in compose/reference/ files 
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
 2016-11-03 10:13:21 -07:00
Adrien Duermael
8fa5f3a5de absolute links to docs.docker.com are now relative links 
Signed-off-by: Adrien Duermael <adrien@duermael.com>
 2016-11-01 17:01:41 -07:00
michael-wise
870abe59b4 added a filename above the custom script 
Added a filename above the custom script to distinguish it from the wait-for-it.sh script.
 2016-10-26 21:24:36 -04:00
Victoria Bialas
9c5319211d Fixing note formatting 
Changing note format back to the way it was to match the rest of the notes in this section.
 2016-10-26 16:58:24 -07:00
Victoria Bialas
568cded2a5 finishing touches on Wordpress example in Compose docs per pr#129 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-10-26 13:46:53 -07:00
John Mulhausen
be3e860fa1 Merge pull request #328 from alexandair/patch-1 
Update index.md
 2016-10-25 14:25:52 -07:00
Victoria Bialas
7fd5e20337 Update ps.md 2016-10-25 11:38:33 -07:00
Victoria Bialas
e65a98ef9f Update install.md 2016-10-25 11:24:45 -07:00
Victoria Bialas
50d7898fe4 Update gettingstarted.md 2016-10-25 11:22:30 -07:00
Victoria Bialas
100a82043a Update gettingstarted.md 2016-10-25 11:18:39 -07:00
dave-pollock
1967bd2603 Update swarm.md 
Scheduling filters should be configured in the environment section of compose files - NOT labels.
 2016-10-25 14:57:00 +01:00
Markus Schulte
1de1d10073 At paragraph "links", fixed anchor-link to "depends-on" 2016-10-24 12:01:00 +02:00
Aleksandar Nikolić
18499881e5 Update index.md 
Fix typo.
 2016-10-23 20:12:47 +02:00
Joao Fernandes
bce5d70ce6 Updates compose install to 1.8.1 
Signed-off-by: Joao Fernandes <joao.fernandes@docker.com>
 2016-10-19 15:57:43 -07:00
DavidRabel-b1
673523ee9a Update django.md 
As of Django 1.10 the database backend django.db.backends.postgresql_psycopg2 is called django.db.backends.postgresql .

See https://docs.djangoproject.com/en/1.10/ref/settings/#engine
 2016-10-19 17:07:49 +02:00
John Mulhausen
5d9e15dcad Merge pull request #174 from IRus/patch-1 
This guide used legacy backticks.
 2016-10-18 16:35:17 -07:00
John Mulhausen
83ec5da00d Merge pull request #196 from ezeeetm/patch-1 
update 'environment' to 'labels'
 2016-10-18 16:13:16 -07:00
Ivan Perez
3c41a34fd6 Typo in cd command 
Fixes typo in command.

(If you named your directory `my_wordpress`, then you should cd into `my_wordpress`, not `my-wordpress`)
 2016-10-18 20:44:36 +02:00
LRubin
3129564e3d Merge pull request #251 from liubin/master 
remove redundant back slash
 2016-10-18 11:37:04 -07:00
Misty Stanley-Jones
01910ab6d9 Update branding for macOS 
Apple has changed their branding guidelines from 'OS X' to 'macOS'
so we should update ours to be within trademark / branding
guidelines. See http://www.apple.com/macos/sierra/

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-10-18 09:21:09 -07:00
Bin Liu
c8b449e7e0 remove redundant back slash 
I think this is a redundant back slash, should be removed.
 2016-10-18 22:31:25 +08:00
ezeeetm
91b9a38864 update 'environment' to 'labels' 
according to @aanandPrasad
constraining containers in swarm with compose is now done with 'labels' as of Swarm 0.3 and Compose 1.3

https://groups.google.com/forum/#!topic/docker-dev/Uzcies21qPo
 2016-10-13 14:40:17 -07:00
Ibragimov Ruslan
0778af3d17 This guide used legacy backticks. 
https://github.com/koalaman/shellcheck/wiki/SC2006
https://github.com/koalaman/shellcheck/wiki/SC2046
 2016-10-12 14:19:24 +03:00
BSCheshir
c98a6d8902 example pls 2016-10-08 23:35:37 +04:00
John Mulhausen
8ea375e1d7 Fix for list in compose-file, CSS fixes for blockquotes 2016-10-07 13:48:23 -07:00
BSCheshir
1b8729c5be remove prefix space 
strange space on ALL code block on https://docs.docker.com/compose/gettingstarted/

but github clear it on preview .md
 2016-10-07 23:18:45 +04:00
sixcorners
9a2be62bf8 Update compose-file.md 
Document that the journald logging driver allows docker-compose logs to work.
 2016-10-05 11:40:42 -05:00
John Mulhausen
0133cb646d Merge pull request #21 from pborreli/typos 
Fixed typos
 2016-09-30 11:51:42 -07:00
John Mulhausen
066b78bf86 Content rendering fixes 2016-09-30 01:51:56 -07:00
John Mulhausen
0ad083ff1f Delete Makefile 2016-09-29 23:40:58 -07:00
John Mulhausen
d8b7717467 Delete Dockerfile 2016-09-29 23:40:48 -07:00
John Mulhausen
99bab305bd Removing merge detritus 2016-09-29 23:38:12 -07:00
Pascal Borreli
6cd3fe8bd2 Fixed typos 2016-09-30 01:52:12 +01:00
Misty Stanley-Jones
d53c6798c9 Convert TOML to YAML, tweaks to work with Jekyll 2016-09-29 17:16:03 -07:00
Misty Stanley-Jones
9f31bb790d Put back inadvertently deleted compose directory 2016-09-29 12:13:47 -07:00
Misty Stanley-Jones
701f170a21 Move docker-hub docs to docker-hub subdirectory 2016-09-29 10:38:52 -07:00
Misty Stanley-Jones
7629f462d5 Moved compose docs to compose subdirectory 2016-09-28 14:52:24 -07:00
Joffrey F
f3628c7a5e Bump 1.8.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-07-27 11:57:23 -07:00
Aanand Prasad
e115eaf6fc Fix error message for unrecognised TLS version 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-27 11:57:23 -07:00