Commit Graph

55 Commits

Author SHA1 Message Date
brightworks 396f4198bc Update part2.md (#8604)
LGTM, thanks!
2019-07-12 14:17:06 -07:00
Jakob Krigovsky 2fad6265d2 Fix spelling of “DigitalOcean” (#8938)
Thanks for helping with this as well!
2019-07-10 15:07:59 -07:00
Yoju LEE 1662ab4867
typo fix
friendlyname -> friendlyhello
2019-04-02 20:42:20 +02: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
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
paigehargrave 99b474bdf9
Update part2.md 2019-02-26 08:04:35 -05:00
Ekwinder Saini 09c5d0ceec
Update part2.md
Specified where to create an empty directory while adding the Dockerfile.
2019-02-07 13:05:36 +05:30
arhaasdev 2623670a4c
Update part2.md
Eliminates the inappropriately placed "the" from "The second item is the Google's DNS [...]".
2019-02-04 02:00:44 -08:00
Stuart C. Robinson 790432958e
extraneous 'a'
in *Build the app*, replace:

`if you want to use the a shorter option` with
`if you want to use the shorter option`
2019-01-18 11:26:16 -05:00
Anne Henmi 9ae4095bf8
Merge branch 'master' into patch-2 2019-01-02 08:47:44 -07:00
Anne Henmi 77e1c3d700
Update part2.md
Wording cleanup.
2019-01-01 17:58:27 -07:00
Maria Bermudez 76e53fbd4d
Relates to PR 7688 2018-12-27 16:04:25 -08:00
Waldir Pimenta 48f1f64636
mention both -t and --tag 2018-12-27 15:56:04 +00:00
newoneforasn4 f665d8b711
sentence structure changed in introduction 2018-11-13 09:38:57 -08:00
Waldir Pimenta 97ad2a634d
get-started/part2: clarify usage of -t/--tag
As this is an introductory document, using short options
and relying on default behaviors without explanation
may cause some confusion.

This change it explicit how the --tag option is being used.

It also uses an equal sign to visually group the option and its value,
so that the . at the end of the command doesn't go unnoticed.
2018-10-02 11:59:19 +01:00
Craig Pastro 5458e78474
Change ADD to COPY
According to "Best practices for writing Dockerfiles" COPY is preferred "because it’s more transparent than ADD".
2018-08-13 15:16:18 +09:00
Tammy Fox 3ae1dd99a5
improve wording 2018-07-30 11:57:32 -04:00
Ayondeep Datta ccad7fd3da
Update part2.md
Fixed a typographical error on line 246 - " we just map port 80 on the host to port 80 in the container" should be " we just map port 4000 on the host to port 80 in the container"
2018-07-30 10:30:43 -05:00
Johandry Amador f35afbe812 Replacing cloud.docker.com for hub.docker.com 2018-06-15 14:48:42 -07:00
Antonio Gutierrez 9e15f743a1 Switch places of subtitles DNS and Proxy settings
Proxy settings titles was placed in the DNS misconfiguration part, and the DNS settings title was placed in the proxy configuration part. This changes moves the places of the titles so that they both present the section they intend to.
2018-06-14 14:29:54 -07:00
Gwendolynne Barr a55d0c9dfc
Cleanup (#6864) 2018-06-11 12:48:24 -07:00
Henry T. Phan eeb4a8843a Fixed typo in get-started (#6627) 2018-05-03 12:23:11 -07:00
Max Lin a3baec85e4 Fix typo (#6480)
DNS "misconfgiurations" -> "misconfigurations"
2018-04-18 15:53:49 -07:00
Andrea c8d2c04876 Add a note for the DNS settings in docs. (#6372)
* Add a note for the DNS settings

Reason: a lot of people struggle against problems with the DNS configuration when they try to build their first app.

* Merge DNS and proxy notes
2018-04-10 15:10:43 -07:00
Joao Fernandes 610f952eca Remove duplicate sentence 2018-03-06 10:14:48 -08:00
Misty Stanley-Jones a17a47dd77
Favor docker <object> <verb> format of commands (#5914)
Remove instances of:
- docker rmi
- docker images
- docker stop
- docker rm
- docker create
- docker exec
- docker attach
2018-02-05 09:33:47 -08:00
Misty Stanley-Jones a4f5e30249
Various copyedits to reduce future tense, wordiness, and use of 'please' (#5788)
* Reword lots of instances of 'will'

* Reword lots of instances of won't

* Reword lots of instances of we'll

* Eradicate you'll

* Eradicate 'be able to' type of phrases

* Eradicate 'unable to' type of phrases

* Eradicate 'has / have to' type of phrases

* Eradicate 'note that' type of phrases

* Eradicate 'in order to' type of phrases

* Redirect to official Chef and Puppet docs

* Eradicate gratuitous 'please'

* Reduce use of e.g.

* Reduce use of i.e.

* Reduce use of N.B.

* Get rid of 'sexagesimal' and correct some errors
2018-01-25 17:37:23 -08:00
Zane Matthew 2ec748bb8b Incorrect build tag (#5677)
`friendlyname` should have been named `friendlyhello`
2018-01-06 11:25:16 -08:00
John Mulhausen 5428939083
Update part2.md (#5586) 2017-12-26 17:26:33 -05:00
John Mulhausen d17340d394
Speed up site rendering for authors (#5241)
* rough pass at tabs, jsonification

* GHPages 147, authoring YML, sitemap via plugin, working JS

* Update Gemfile

* Removing dk.rb artifact

* Simplifying authoring YML even more

* More YML simplification

* Remove jekyll-seo -- even more perf gain

* Glossary support

* Collections support

* Incremental off; GH Pages 172 gets build time to 50 seconds
2017-12-19 18:15:15 -08:00
John Mulhausen 3a408a8231
Reducing the asides for better flow 2017-12-19 15:16:21 -08:00
John Mulhausen c8eeebcd0d
Adding note on where to insert ENV calls for proxy config
Fixes #5386
2017-12-15 16:22:43 -08:00
Victoria Bialas fa27b198a0
added note in get started to emphasize need to use up-to-date versions and tools (#5311)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-11-15 12:51:46 -08:00
Antti Ollilainen 4bbaa46993 Get started part 2: How to access app in container on Windows 7 Docker Toolbox (#5182) 2017-11-10 15:25:54 -08:00
umarcostuc dc55b65d2e Cert issues fixed when running pip
I had certificates issues when the pip command was run:
There was a problem confirming the ssl certificate: [SSL: CERTIFICATE_VERIFY_FAILED] certificate verify failed (_ssl.c:661)
Using the pip like this solved the issue:
RUN pip install --trusted-host pypi.python.org -r requirements.txt
2017-11-07 10:04:33 -08:00
Victoria Bialas 717521dc1c
added note re: needing to explicitly stop containers on Windows vs. Ctrl+C (#5224)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-11-06 13:37:38 -08:00
Thomas Sjögren e6f3b11388 fix env proxy format (#4989)
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
2017-10-20 15:59:25 -07:00
Victoria Bialas a6df37fc99 updates per feedback (#4836)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-10-09 11:01:54 -07:00
John Mulhausen 532f8d5e46 Update part2.md 2017-10-05 21:30:15 -07:00
Victoria Bialas 788532ff45 added note re: setting ENV variables for proxy servers in Dockerfile (#4759)
* added note re: setting ENV variables for proxy servers in Dockerfile

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* review comments

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* reworded note title, removed link out to ENV per review comments

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* added info to docs test page about how to link to auto-generated reference pages

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* added more info to test on re: linking

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* format ENV as a command

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-09-29 13:29:21 -07:00
Gaudichon Pierre ecf59d14ce Update the tag of the example image. (#4694)
Change the tag form "part1" to "part2" to match the tutorial progression.
2017-09-22 13:25:46 -07:00
Sebastiaan van Stijn 02635843e3 Fix pull output example to match username (#4655)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-09-18 16:45:50 -07:00
French Ben 4445f27581 Cleanup editions (#4350) 2017-08-25 12:13:07 -07:00
Gwendolynne Barr 6779aed327 Update docker commands (#4291) 2017-08-22 16:37:51 -07:00
nemophila c70784edd0 Change EXPOSEd to published (#4253) 2017-08-17 14:27:01 -07:00
Victoria Bialas a4f1cbd633 improve, clarify getting started tutorial steps (#3893)
* more copyedits

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* copyedit

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* copyedits and wording changes per reviews

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* add back in explanation of Dockerfile commands

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* Update part2.md
2017-07-24 18:49:44 -07:00
Misty Stanley-Jones 17e1da077b Tighten up base image and parent image terminology (#3720) 2017-06-28 11:56:41 -07:00
Tim Sorbera 59f1eceb8e update app.py to have consistent spacing (#3659)
shouldn't have both tabs and spaces in the same file
2017-06-22 16:36:27 -07:00
Victoria Bialas 4c05490bab Getstarted tweaks (#3294)
* getting started edits, improvements to flow

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* added image of app in browser, more subtopics

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* copyedit of Orientation

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* copyedits, rewording, examples, additions for swarms and services

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* review comments, troubleshooting hints and clarifications

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* corrected cloud link to AWS beta swarm topic, added Azure

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-06-09 17:55:37 -07:00
Alex Pulver 487bcdaf58 Align quotes coding style to double (#3263) 2017-05-17 12:36:01 -07:00