Commit Graph

142 Commits

Author SHA1 Message Date
Jeffrey Morgan c0656fa7fa Rename official repos to official images 2018-11-21 15:19:50 -05:00
Jeffrey Morgan ca4ffb1ee2 Merge branch 'master' into consolidation-changes 2018-11-14 18:30:02 -05:00
Jeffrey Morgan d15739c5e7 Merge branch 'master' into consolidation-changes 2018-11-14 18:29:09 -05:00
Maria Bermudez b06c4585c3
Merge pull request #7685 from docker/backport-fixes
Backport fixes
2018-11-14 12:28:33 -08:00
Maria Bermudez 99d15559a7 Add broken images, update links 2018-11-14 12:14:01 -08:00
newoneforasn4 f665d8b711
sentence structure changed in introduction 2018-11-13 09:38:57 -08:00
Gabriel Dutra a367850547 Add missing "to" 2018-10-12 22:18:25 -03:00
Jeffrey Morgan ca466a55ed Rename Docker Store and Docker Cloud - WIP 2018-10-04 19:41:32 -04: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
Lee Gaines 3a1023d66b adds port 4000
In the docker-compose file, the ports sections maps host port 4000 to container port 80, so if we want to see our app in a browser we should check on port 4000.
2018-06-21 13:57:55 -07:00
Onur Yaman 9735a24b12 Fix typo 2018-06-21 13:42:25 -07: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
Alex Neves 1ec7ace6d6 Changed host port from 80 to 4000
The host port was set to 80, which was both inconsistent with the previous tutorial and also causing issues when following the tutorial on Windows.

For reference, here is the error when attempting to run a container on port 80:

C:\Program Files\Docker\Docker\Resources\bin\docker.exe: Error response from daemon: driver failed programming external connectivity on endpoint focused_euler (079893ea98df78bf7043f86072263317be106cbb7f4a3fcde23c2ef19ad39a01): Error starting userland proxy: Bind for 0.0.0.0:80: unexpected error Permission denied.
ERRO[0000] error waiting for container: context canceled
2018-06-06 11:26:22 -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
Alan Isherwood 735ba94e6b Add Windows unset shell variables instructions
Instructions on unsetting docker-machine shell variable settings covered Mac/Linux only. Adding instructions for Windows too.
2018-04-11 11:05:31 -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
Gwendolynne Barr 9eddd362bc
Remove text on kube support in D4W stable channels (#6350) 2018-03-30 08:08:59 -07:00
Gwendolynne Barr 978b1ac964
Copyedit phase 1 (#6296) 2018-03-26 22:14:39 -07:00
Karl ac38f259cb Fixed a small typo on the word 'Execute' (#6274) 2018-03-21 08:18:47 -07:00
Laney Smith 6c4814e52c Update part5.md (#6259) 2018-03-19 19:35:02 -07:00
Gwendolynne Barr f4319a5222
Add docker ps for old Docker versions (#6246) 2018-03-16 14:22:29 -07:00
Akim Demaille ddc8bc6dd1 Desktop: split stable/edge release notes (#6231) 2018-03-16 11:03:24 -07:00
Joao Fernandes 610f952eca Remove duplicate sentence 2018-03-06 10:14:48 -08:00
刘冲 371f9fb532 Update index.md (#6052) 2018-02-23 09:06:47 -08:00
Giancarlo Romeo 55108f0575 Fix typo
Wrong docker-compose filename.
2018-02-15 11:25:23 -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
jugdizh 54fde831c6 Update index.md (#5903) 2018-02-02 09:48:50 -08:00
Misty Stanley-Jones 72c6cbce38
Document an example for --with-registry-auth flag (#5882) 2018-01-31 13:55:42 -08:00
Gwendolynne Barr 3fbcb00c7d
Update part 1 (#5806) 2018-01-31 10:00:10 -08:00
Misty Stanley-Jones e14d16d79d
Fix typo (#5869) 2018-01-30 15:48:42 -08:00
modem_down 84b61d2ecf Fix broken link (#5790) 2018-01-29 15:52:40 -08:00
Misty Stanley-Jones a55ddf60a9
Move /engine/installation to /install (#5651)
* Move /engine/installation to /install

* Add Docker for IBM Cloud to the matrix
2018-01-26 10:29:14 -08:00
alstas d506e2f770 Update part4.md (#5653)
* Update part4.md

Add clarification about `docker stack deploy` command that it takes time to update all services
2018-01-25 18:10:32 -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
Joao Fernandes 1df7737c73
Fix broken url (#5829) 2018-01-25 15:46:19 -08:00
mertz1 8128cb3544 Update part5.md (#5776) 2018-01-19 11:43:23 -08:00
modem_down b210a7295f Remove .md extensions that break links (#5742)
The navigation links at the start of the content on pages such as https://docs.docker.com/get-started/part2/ have broken links (at least, with JavaScript disabled). The links go to e.g. https://docs.docker.com/get-started/part2.md but should instead go to https://docs.docker.com/get-started/part2 or https://docs.docker.com/get-started/part2/ .
2018-01-19 11:17:40 -08:00
Giancarlo Romeo 51e13af460 Fix typo (#5739) 2018-01-16 12:12:34 -08:00
modem_down 3cf3f4c986 Remove extraneous link (#5678)
The deleted link redirects to the same page as the (retained) preceding link, and is therefore redundant and confusing.
2018-01-07 18:57:18 -08:00
Ikai Lan f52ea05957 Update part3.md (#5675)
Spelling fix
2018-01-06 11:29:56 -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