Commit Graph

57 Commits

Author SHA1 Message Date
Sebastiaan van Stijn eb948508c1
various: use relative markdown links
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-23 13:03:53 +02:00
Justin Cormack ff0f496f4a
Use original short forms of Docker commands
The long forms of Docker commands have not caught on. I don't think we
should continue to encourage their use especially in the get started
guide. There is no evidence from online searches that anyone is really
using them. They are overly pedantic and verbose.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2020-03-23 10:58:11 +00:00
Usha Mandya 942fcb15cf fix hyperlinks and review comments 2020-02-18 12:18:07 +00:00
Usha Mandya 658092ce1f update ordered lists to fix yaml formatting issues 2020-02-17 15:49:52 +00:00
Usha Mandya 36aba6a7c6
Get started docs updates (#10218)
* Update Get started docs

* update part-1, add redirects

* draft updates to part 2 and 3

* tidy up the orchestration topics

* update examples, and other minor edits

* address Stefan's review comments

* moved orchestration to a new node

* fix Ben's review comments

* add email verification step

* Emphasize the CTA in part 3
2020-02-14 17:24:50 +00:00
Dawn-Docker 3c54d2ff9c
Update toc (#9819) 2019-11-08 08:13:40 -08:00
Dawn-Docker 5bddf49a1a Get started updates (#9608)
* first pass at gs pt 1

* suggestions from Dawn

* unbreak tabs

* get started part 2 refresh

* comments from Dawn and Adrian

* draft of kube get started

* first draft of swarm demo for gs

* saving some updates...

* first draft docker hub section

* comments from Dawn

* comments from Dawn

* comments from Dawn

* comments from Dawn

* gsu frontmatter

* removed toc entry for get started part 6 and changed toc titles for the rest of get started topics

* addressing Adrian's feedback

* fixing top nav buttons
2019-10-09 16:15:00 -07: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
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
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
paigehargrave f052758c43
Update part3.md 2019-01-11 14:18:46 -05: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
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
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
Maria Bermudez aaca9b83b5 Revert "Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2""
This reverts commit 4c95d161ca.
2018-08-29 19:01:03 -07:00
Maria Bermudez 4c95d161ca Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2"
This reverts commit af5f2fcc38, reversing
changes made to 338b690d26.
2018-08-29 18:37:44 -07:00
Maria Bermudez 840c167055 Revert "Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2""
This reverts commit 14080c18bd.
2018-08-29 18:36:03 -07:00
Maria Bermudez 14080c18bd Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2"
This reverts commit af5f2fcc38, reversing
changes made to 338b690d26.
2018-08-29 14:47:31 -07: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
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
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
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
Ikai Lan f52ea05957 Update part3.md (#5675)
Spelling fix
2018-01-06 11:29:56 -08: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
Victoria Bialas b7374d0f3a updated command summaries on Getting Started to reflect new workflows (#5014)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-10-17 16:24:03 -07:00
Gwendolynne Barr bdc6fb8e9c Configure curl to use ipv4 (#4964) 2017-10-14 10:10:35 -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
Ken Tanaka e9b565c5ad Use a sample screen shot that uses the default port 80. (#4761) 2017-10-05 18:42:04 -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
Victoria Bialas 6b51deb499 updated Compose file with absolute data path, removed scp from steps (#4734)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-09-27 16:46:28 -07:00
Victoria Bialas b764ab3356 Addressed Windows issues with get started tutorial (#4675)
* how to get scp to work on Windows

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

* clarified some commands in part 3

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

* fixed links on hyperv, machine pages

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

* removing notes about scp and ssh on Windows, WIP

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

* WIP: adding docker-machine env commands

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

* added docker-machine env option, re-worked tabs

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

* moved extra info re: docker-machine env out of note, to end of part 4

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

* updated parts 4, 5 with docker-machine env, added note re: commands

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

* changed rest of ssh examples, formatting fixes, copyedit

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

* copyedit on docker-machine env example

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

* reworded note title

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-09-22 18:55:40 -07:00
aiueogawa 0eda88f674 Fix typo (#4455) 2017-09-11 09:50:01 -07:00
Gwendolynne Barr 9a1330e966 Distinguish tasks from containers (#4378) 2017-08-29 15:32:43 -07:00
French Ben 4445f27581 Cleanup editions (#4350) 2017-08-25 12:13:07 -07:00
Wang Jie 5b44477e18 Update part3.md (#4131) 2017-08-10 15:05:58 -07:00
Wang Jie d2971dfd0d Update part3.md (#4119)
* Update part3.md

* Update part3.md
2017-08-10 10:55:22 -07:00
David Muganza 4ab7d191a8 Add missing word (#4063) 2017-08-01 11:52:32 -07:00
Victoria Bialas a922be3d0f Update admonitions CSS for consistency and better writer workflow (#4019) 2017-07-31 21:49:56 -07:00
Victoria Bialas bdc784a51e Get start streamline prereqs (#3628)
* streamlined get start prereqs

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

* copyedit for line spacing

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-06-16 11:52:54 -07:00
Victoria Bialas 4dd375f587 added explanation of Compose files and commands (#3588)
* added explanation of Compose files and commands

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

* improved note content, formatting

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-06-13 15:17:17 -07:00
Andres Salgado 8524b3e493 Typos and unicode mistakes (#3557)
A typo and a unicode mistake was fixed.
2017-06-13 11:51:42 -07:00
Victoria Bialas 209bfaf52d copyedit of mdash, miscellaneous (#3584)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-06-12 19:33:43 -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