Commit Graph

228 Commits

Author SHA1 Message Date
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
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
mmoser18 aaa85c6100
Update part4.md
Some commands need to be run as Administrator on Windows or else they will fail or produce empty output.
2019-02-19 21:50:00 +01:00
paigehargrave 1e096d09b7
Update part3.md 2019-02-14 13:56:33 -05:00
Maria Bermudez ee821c590f
Final cleanup 2019-02-13 18:10:50 -08:00
Maria Bermudez 7ee7214028
Incorporate suggested content addition 2019-02-13 18:03:47 -08:00
Pavan Chilukuri 76a43be812
Added a command for getting the service
When you use `docker service ls`, it won't show you the list of services. Instead use `docker stack services getstartedlab` to show the service that was created and thereby getting the Service ID of it.
2019-02-07 21:03:16 -06: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
L-Hudson 559a1bfe1d
Merge pull request #8018 from Shofol/patch-1
Update index.md
2019-01-22 09:10:56 -05: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
paigehargrave 0dab4ade68
Merge branch 'master' into name-change-for-Docker-Desktop 2019-01-14 11:14:48 -05:00
Anower Jahan Shofol 2292bf707d
Update index.md
The first image looks smaller and unbalanced.
2019-01-14 12:21:51 +06:00
paigehargrave 670a052b52
Update part4.md 2019-01-11 15:03:24 -05:00
paigehargrave f052758c43
Update part3.md 2019-01-11 14:18:46 -05:00
paigehargrave 0e14f90a99
Update index.md 2019-01-11 13:45:13 -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
Anne Henmi 5d3f375b1d
Merge branch 'master' into Patch-for-7369 2018-12-26 10:10:11 -07:00
Jeremy H. Shi 9b47f769b7
Update part3.md 2018-12-21 15:15:52 -08:00
Ryan Haskell-Glatz bcd571efff
use port 4000 instead of 80 on host 2018-12-16 18:28:43 -06:00
Maria Bermudez 4bdcbf8ae9 Merge branch 'master' of github.com:docker/docker.github.io 2018-12-10 12:41:24 -08:00
L-Hudson 06761fda2d
Merge pull request #7789 from raunakkathuria/patch-1
Update port mapping 4000 to 80 for consistency
2018-12-07 15:45:43 -05:00
L-Hudson 4b063c5200
Update part6.md
edits
2018-12-07 08:40:54 -05:00
Raunak Kathuria e5f7eff732
Update port mapping 4000 to 80 for consistency
As of now docker-compose.yml file ports section is not consistent with terminal recording and also with what is specified in https://docs.docker.com/get-started/part5/
2018-12-04 15:44:22 +08:00
Edgar Barrantes 6396f5f479
Fix typo 2018-12-04 01:13:02 -06:00
Jeffrey Morgan f6bbf912db Typo fixes 2018-12-03 22:30:33 -05:00
Jeffrey Morgan dc62a08d60 Fixing get-started guide 2018-11-22 13:27:52 -05:00
Jeffrey Morgan 3602540596 Fix small issues 2018-11-21 16:49:26 -05:00
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
Adam 5b210e18ac
updated introduction with proper sentence 2018-10-31 14:38:12 -04: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
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
arthur_x1 7753a6cd5a Clarifying confusing explanations for limiting cpus resource in docker-compose file to prevent misunderstanding as "percent of total CPU available". 2018-09-25 10:55:18 +10: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
John Mulhausen 652659361c
Offer --native-ssh workaround
Fixes #5513
2017-12-15 15:38:44 -08:00
John Mulhausen e11d8ec998
Add a couple more prerequisites
Fixed #5447
2017-12-15 15:31:44 -08:00
Bui Quang Duc 94e0a5dc8c Update part4.md 2017-12-07 14:02:56 -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
maxstreichert d61b10fde1 creating a new service (#5295)
a new service will be created, not updated for the first time.
2017-11-13 13:25:37 -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
Max Mikhaylov c21ec69572 Added reference to the proxy setup in part 2 to part 1 of tutorial (#5170)
* Added reference to proxy settings

Added reference to proxy settings in part 2 since proxy needs to be configured in order to run hello-world container.

* Update index.md

add newline

* Update index.md

fixed link
2017-11-10 10:37:43 -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
Victoria Bialas 474c81b52f
fix spelling typo (#5215)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-11-03 11:38:26 -07:00
Leo Cho fbd66fb290 update service name 2017-11-02 11:05:42 -07:00
John Mulhausen 1e20b290e7
Update part3.md 2017-11-01 00:02:13 -07:00
John Mulhausen 7064350749
Shortening part 3 2017-10-31 17:49:51 -07:00
John Mulhausen c8e0ea9226 Fixes #5090 2017-10-25 15:36:47 -07:00