Commit Graph

56 Commits

Author SHA1 Message Date
Misty Stanley-Jones 46e044ec59 Fixing double curly braces 2017-01-19 11:09:49 -08:00
Misty Stanley-Jones e3a3145cd9 Sync vnext-engine branch to docker/docker SHA 2f12d2808464dcfdf45e0920fd508ce0ff12bd29
This branch will contain forward-looking Engine-specific docs
and be the equivalent of docker/docker master for docs
2017-01-19 10:10:15 -08:00
Misty Stanley-Jones 6db55381ef Merge pull request #1032 from josephmosby/patch-1
Updating dockervolumes.md for Windows mounting
2017-01-18 15:54:59 -08:00
Misty Stanley-Jones ae500f986b Merge pull request #1039 from dougalrm/patch-1
Update to usingdocker.md
2017-01-18 15:50:38 -08:00
Misty Stanley-Jones e637373ac6 Merge pull request #1076 from saarwexler/patch-3
Update networkingcontainers.md
2017-01-18 15:49:31 -08:00
Misty Stanley-Jones 6d4d7d0a9b Update 'usingdocker' tutorial to name the container
Do some clean-up while I'm in there
2017-01-18 12:58:57 -08:00
Benjamin Toussaint f6c629dc13 Correct Python application port for local browsing 2017-01-17 14:53:04 +01:00
Josue Zarzosa a577949194 Remove reference to legacy container links (#1057) 2017-01-12 18:11:04 -08:00
Saar Wexler 8decaf2efc Update networkingcontainers.md 2017-01-10 18:52:47 +02:00
Saar Wexler d49d1e3c7a update the version in the code snnipt (#1037) 2017-01-06 04:20:34 -08:00
Saar Wexler 3f68896027 version changed to 1.12.3 (#1036) 2017-01-06 04:19:17 -08:00
Joseph Mosby b7acfed1b6 Updating dockervolumes.md for Windows mounting
The code snippet for mounting Windows directories won't work: it will produce an "Invalid bind mount spec" error as Docker cannot properly read the path. The core error was addressed in [#12590](https://github.com/docker/docker/issues/12590#issuecomment-96767796), this is just an update to the tutorial.
2017-01-04 18:30:54 -05:00
dougalrm ae036ae0f5 Update to usingdocker.md
Link destination changed toa more appropriate (imo) destination.

Link originally linked to docker env varibles whereas link description describes other docker commands.
2017-01-04 23:23:31 +00:00
Peter Dave Hello 5919563eb8 Lossless Image optimization (#959)
* re-compress jpg images losslessly using jpegoptim

* re-compress png images losslessly using zopflipng
2016-12-21 11:12:13 -08:00
gbzhu f1598cad58 modify the user name (#946) 2016-12-20 17:18:38 -08:00
Misty Stanley-Jones 7183279abb Merge pull request #476 from alexisbellido/master
Clarify the fact that VOLUME does not support host-dir
2016-12-19 13:49:28 -08:00
athend 5e2fc8bada Update dockerizing.md
Just added "to" in the sentence which may have been missed earlier.
2016-12-16 11:35:21 +05:30
John Mulhausen 5fc8dc4a02 Fixes #875 2016-12-13 15:39:16 -08:00
Alexis Bellido 8a7af7a037 move note about VOLUME and host-dir to existing note 2016-12-11 11:23:44 -05:00
Adrien Duermael 50ee158a65 CI - added test for keywords in markdown frontmatters (#805)
* added test for keywords

Signed-off-by: Adrien Duermael <adrien@duermael.com>

* fixed keywords in some md files for tests to pass

Signed-off-by: Adrien Duermael <adrien@duermael.com>

* fixed keywords in /datacenter

Signed-off-by: Adrien Duermael <adrien@duermael.com>

* tests/Dockerfile: no need to add git

Signed-off-by: Adrien Duermael <adrien@duermael.com>

* tests/Dockerfile: changed maintainer

Signed-off-by: Adrien Duermael <adrien@duermael.com>
2016-12-06 16:45:11 -08:00
Adrien Duermael 99ab7387e0 Missing title in engine/tutorials/index.md - add framework for CI checking (#763)
* added title in engine/tutorials/index.md

Signed-off-by: Adrien Duermael <adrien@duermael.com>

* added pre_build script for Docker Cloud CI

It includes one first test that should run when PRs are submitted.
For now it only checks if there’s always a title in fronmatters.
We should add more tests as we fix issues.

Signed-off-by: Adrien Duermael <adrien@duermael.com>

* Jenkinsfile + pre_build script update

Signed-off-by: Adrien Duermael <adrien@duermael.com>

* fix in Jenkinsfile

Signed-off-by: Adrien Duermael <adrien@duermael.com>

* chmod +x hooks/pre_build

Signed-off-by: Adrien Duermael <adrien@duermael.com>

* removed hooks folder

since we’re not using Docker Cloud CI

Signed-off-by: Adrien Duermael <adrien@duermael.com>
2016-12-05 15:22:59 -08:00
SRINIVASA RAO GURUBELLI 0e5a235610 Removing leave off the `-P` flag and also (#765)
I feel this sentence 'leave off the `-P` flag and also ' not necessary as that is not used that flag in the previous. User gets confused about this flag.
I am not sure any significance of that flag. If it is necessary to mention , we should better document it.

Thanks,
Srinivasarao Gurubelli
2016-12-02 23:34:15 -08:00
SRINIVASA RAO GURUBELLI 9aa7706799 Option --network not valid at least with the latest docker (#755)
--network option not valid with docker version 1.11.2. So, proposing to change --network to --net
--network=my-bridge-network
2016-11-30 17:07:25 -08:00
Sebastiaan van Stijn 951b19a398 Merge pull request #627 from docker/325_volume_create_opt_syntax
Fix syntax for passing options to `volume create`
2016-11-29 17:03:29 +01:00
John Mulhausen 921964a17c s/sizes/size 2016-11-28 14:55:56 -08:00
John Mulhausen 0891e122cf Merge pull request #408 from yangyuqian/explain_downloaded_image_and_container_size
Explain downloaded image and container sizes
2016-11-28 14:55:08 -08:00
John Mulhausen 2e5892e4a5 Writerly changes 2016-11-28 14:52:55 -08:00
Misty Stanley-Jones a4b2357e14 Clarification about flocker driver (#626)
* Clarification about flocker driver

Fixes #324
2016-11-23 15:42:34 -08:00
Misty Stanley-Jones 13dc8451cf Fix syntax for passing options to `volume create` 2016-11-17 11:38:47 -08:00
Misty Stanley-Jones 00b4a1ab00 Remove the naming digression from the networking tutorial
Fixes #575
2016-11-16 17:02:21 -08:00
Gaetan a5e01e1844 fix type of keywords entry in frontmatter (in /engine/) (#552)
keywords should be a string, not an array containing one string

Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2016-11-11 14:45:24 -08:00
Gaetan 57b45d5f8d fix duplicated page titles (#512)
this also breaks page consistency, regarding anchor links (see #510)

Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2016-11-09 16:35:33 -08:00
Roland Illig d35d1f7e2f Stylistic cleanup in usingdocker.md
- wrap lines
- update version numbers and dates
- remove -ing from headings
- remove redundant text
2016-11-07 00:35:52 +01:00
Roland Illig 2c9eff5bc9 Replace "we" with "you", as per the style guide 2016-11-07 00:20:05 +01:00
Alexis Bellido b01714f7f5 Clarify the fact that VOLUME does not support host-dir 2016-11-06 12:03:49 -05: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
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
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
Yuqian Yang fa5e8c3d5c Explain downloaded image and container sizes
Signed-off-by: Yuqian Yang <boscoyoung@gmail.com>
2016-11-01 18:48:25 +08:00
Adrien Duermael e7ab7f7d03 removed menu.md files
Signed-off-by: Adrien Duermael <adrien@duermael.com>
2016-10-31 13:45:56 -07:00
Boris Dušek 641a2137bd dockerimages.md: fix "gem2.0: command not found" 2016-10-23 13:30:46 +02:00
Misty Stanley-Jones cdaef772f8 Merge pull request #125 from sicwolf/patch-1
Wrong destination folder in container
2016-10-19 14:50:31 -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
milindchawre 9ce069647a Fixes #26818 : Removing bad reference in docker volumes tutorial
Signed-off-by: milindchawre <milindchawre@gmail.com>
2016-10-17 11:54:32 +00:00
Water Wang 96eec5a7b9 Update dockervolumes.md - Changed all wrong /opt/webapp
Changed all wrong /opt/webapp as /webapp

/opt/webapp of web container includes app.py, if set destination folder as /opt/webapp, app.py is not visible and below error log presents and the web container will exit, so it's better to set the destination folder as /webapp.

docker logs -f web
python: can't open file 'app.py': [Errno 2] No such file or directory
2016-10-11 09:54:25 +08:00
sicwolf 539f8aa082 Wrong destination folder in container
/opt/webapp of web container includes app.py, if set destination folder as /opt/webapp, app.py is not visible and below error log presents, so it's better to set the destination folder as /webapp. 

docker logs -f web
python: can't open file 'app.py': [Errno 2] No such file or directory
2016-10-08 18:52:15 +08:00
Benjamin R. Haskell 362e94b2bc Disable Liquid templating for blocks with `{{`
Instead of disabling templating for entire files, fix instances
individually by wrapping blocks in:

    ```{% raw %}
    ... content ...
    {% endraw %}```

Signed-off-by: Benjamin R. Haskell <docker@benizi.com>
2016-10-07 00:58:08 -04:00
Benjamin R. Haskell 65ec3a3763 Revert pull request #48
Reverts commit b3a620808a in order to
replace it with more-targeted blocks.
2016-10-07 00:56:17 -04:00