74 Commits

Author SHA1 Message Date
Allie Sadler
013f5331ca compose freshness (#17889)
Co-authored-by: aevesdocker <alliesadler@f693mt7fh6.home>
2023-08-10 08:45:02 +01:00
Allie Sadler
516bc623ba ENGDOCS-1507 (#17719)
* ENGDOCS-1507

* ENGDOCS-1507

* review edits

---------

Co-authored-by: aevesdocker <alliesadler@f693mt7fh6.home>
2023-07-12 12:15:09 +01:00
Allie Sadler
7db3dd483e Engdocs 1374 (#17390)
* ENGDOCS-1374

* fix

* fix
2023-05-23 12:19:18 +01:00
bagratte
584e588bcd Link to Docker for Windows too (#17244) 2023-05-04 11:29:10 +01:00
mturoci
b95f056f9f docs: Fix typo. (#16864) 2023-03-10 14:35:13 +00:00
Allie Sadler
8e16fb9373 keywords (#16691) 2023-02-08 14:42:21 +00:00
Allie Sadler
d165097c0d ENGDOCS-1166a (#16641) 2023-01-31 15:27:52 +00:00
siamak-niroomandi
710535d5de Update gettingstarted.md (#16610)
Changed FLASK_DEBUG: True --> FLASK_DEBUG: "true"
2023-01-27 14:21:06 +00:00
Danny Sauer
6479f8ce9c fix variable name typo (#16255) 2022-12-01 08:47:00 +00:00
Muffexx
ff1accf0b7 Update gettingstarted.md - grammar/typo (#16243) 2022-11-29 08:53:43 +00:00
Allie Sadler
fb95c6bc75 Engdocs 1019 1021 (#15826)
* updated getting started guide

* toc update

* rearranging

* fix broken link

* fix broken links

* naming tweaks

* links fix

* add icon links
2022-10-21 09:55:54 +01:00
Abe
0b0f0888bd remove deprecated warning
fixes https://github.com/docker/docker.github.io/issues/15571
2022-09-05 14:42:30 -04:00
Allie Sadler
cab9f914bf ENGDOCS-846 (#15219)
* ENGDOCS-846

* fix broken links

* fix links

* fix broken links

* fix broken links

* fix broken links
2022-07-27 13:26:22 +01:00
Sebastiaan van Stijn
a9b15d6253 desktop: settings: remove "-settings" suffix from URLs
The "-settings" suffix in the URL duplicated the "/settings/" directory
in the URL, which made it redundant.

Using "/mac/", "/windows/" and "/linux/" keeps the URLs shorter, more
memorable, and more consistent with other locations, making it easier
to "guess" the URL when navigating using the browser's location bar.

No redirects were added, because the "-settings" pages have not yet
been published.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-07-15 12:57:14 +02:00
Allie Sadler
d17f279abc create a global setting section for DD (#15122)
* create a global setting section for DD

* fix broken links

* fix broken links

* fix broken links
2022-07-14 15:56:51 +01:00
Allie Sadler
38fec0d159 Engdocs 802b (#15108)
* moved install pages

* moved images

* update toc

* add redirects

* ammend page links

* fix broken links

* fix broken links

* fix broken links

* fix broken links
2022-07-13 10:41:56 +01:00
Ángel Cervera Claudio
684a5629b6 "docker compose" instead "docker-compose" 2022-06-29 11:37:04 +01:00
Dora Ribeiro
d49af6a449 ENGDOCS 711 Revisited Compose Install Page (#14838)
Revisiting Compose installation
2022-06-02 18:10:37 +01:00
Guillaume Lours
fea1b5240e hide the compose completion page until it's available for v2
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
2022-05-12 17:30:46 +02:00
Stefan Scherer
bcc2a90f52 Use host port 8000 to avoid conflicts on Monterey
Signed-off-by: Stefan Scherer <stefan.scherer@docker.com>
2022-02-09 13:05:34 +01:00
Sebastiaan van Stijn
346a066b68 Desktop: move "docker-for-windows" to "desktop/windows"
Unifying all content related to Docker Desktop to be withing the desktop
directory.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-14 13:28:15 +02:00
Sebastiaan van Stijn
d0bf342e52 Desktop: move "docker-for-mac" to "desktop/mac"
Unifying all content related to Docker Desktop to be withing the desktop
directory.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-14 13:07:41 +02:00
Sebastiaan van Stijn
e22984f7d4 use Dockerfile "syntax" directive in examples
BuildKit allows using alternative Dockerfile syntaxes to introduce new features
without having to update Docker itself. The general recommendation is to always
specify a "syntax" directive in a Dockerfile, so that (if needed) older versions
of Docker can download the correct syntax to build the Dockerfile.

This updates our examples to include a syntax directive, to make users more familiar
with these directives, and to illustrate best-pracitces in our documentation.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-04-20 10:19:12 +02:00
Dr. Walter Kammergruber
50bccc3b01 Update gettingstarted.md
updating `docker-compose ps` output. Seems to be outdated
2020-12-19 20:16:24 +01:00
Sebastiaan van Stijn
f6adc80d9a remove examples for ENV key value without '='
The `ENV key value` form can be ambiguous, for example, the following defines
a single env-variable (`ONE`) with value `"TWO= THREE=world"`:

    ENV ONE TWO= THREE=world

While we cannot deprecate/remove that syntax (as it would break existing
Dockerfiles), we should reduce exposure of the format in our examples.

Also updating some code-blocks that were missing language-hints

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-23 15:16:35 +02:00
Usha Mandya
f57bd0b321 Merge pull request #10717 from thaJeztah/compose_samples
compose: add WordPress example to TOC
2020-09-08 16:29:31 +01:00
Usha Mandya
675bdedd1f Add info about the Expose command (#11137) 2020-07-15 12:36:51 +02:00
Vemuluru Venkata Sri Harsha
39fe7accba Update gettingstarted.md (#11094)
* Update gettingstarted.md

1. Flask app was running in the wrong port.
2. 5000 port was not exposed in Dockerfile

* Update gettingstarted.md

mistook Redis port to flask port.
2020-07-13 17:06:02 +02:00
Sebastiaan van Stijn
9f4db87055 compose: add WordPress example to TOC
Also removes links to individual examples, instead linking
to the "compose samples" page.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-28 14:35:50 +02:00
Sebastiaan van Stijn
0f3caaca6a compose: use relative markdown links
Unfortunately, the only reliable way to create internal links
is to use relative links to other Markdown files. This does
match the way links on GitHub work, but makes it harder to
create these links.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-23 13:03:10 +02:00
Sebastiaan van Stijn
d813acb6e1 Engine: reorganize install topic
- Move getting started overview to /get-started/overview/
- Move engine installation files under /engine/
- Redirect the top-level /install/ to /get-docker/
- Updated titles in left-hand navigation
- Added back some pages to the navigation that were
  currently not included.
- Reduce some steps in the installation pages
- Move devicemapper prerequisites to the devicemapper
  storage driver page.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-06 10:50:28 +02:00
Sebastiaan van Stijn
331554f4b3 Fix various links that were generating URLs with .md (#10548)
* Fix incorrect links in compose section

there's a bug causing wrapped links to not work, and replacing
some links to point to the .md file, so that IDE's can check
if the anchors are valid. Also replaced some links to point
to their new location.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

* engine/swarm: update links

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

* Fix various broken links

There's a bug in the "jekyll-relative-links" plugin that causes wrapped links to not work.
Also replacing some links to point to the .md file, so that IDE's can check if the anchors
are valid. Finally, replaced some links to point to their new locations, so that users don't
get redirected..

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-01 12:05:50 +01:00
Usha Mandya
ac099018c1 Merge pull request #8609 from davidism/patch-1
Update Python and Flask usage in Compose tutorial
2019-05-23 09:54:13 +01:00
K-Sato
07a089f27d Add an indentation in compose-gettingstarted.md (#8487)
* Add an indentation

* Fix messaging on service dependencies
2019-05-07 18:16:29 -07:00
David Lord
f5da7af31f add gcc so markupsafe compiles speedups 2019-04-11 09:57:44 -07:00
David Lord
34fe3db007 remove 0.0.0.0 url 2019-04-11 09:48:27 -07:00
David Lord
6f2e3d389d remove unused app.run() call
This is not needed when using the recommended `flask run`
command to run the development server.
2019-04-07 02:12:35 -07:00
David Lord
86f716623f update python and flask usage in dockerfile
* Uses the modern Python 3.7 image, as 3.4 is EOL.
* Separates copying and installing requirements from copying
  project, to make rebuilds more efficient.
* Uses the recommended `flask run` command. This is especially
  needed on Windows, where `app.py` incorrectly looks like an
  executable file when copying into Docker.
* Uses the `FLASK_ENV` env var to control development mode.
2019-04-07 02:02:29 -07:00
paigehargrave
661100cce2 Update gettingstarted.md 2019-01-11 13:15:16 -05: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
Yang Luo
e74fd60201 Add the missing backtick 2018-06-28 15:26:03 -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
Joffrey F
1f36a5274f Update getting started guide with retry-loop and short explanation (#5635)
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-27 12:59:22 -08:00
x1ah
310a9f8f8c fix docker-compose.yml have not link redis (#5602)
rt, if web have not link redis, `redis = Redis(host='redis', port=6379)` will can not recognize the host('redis')
2017-12-26 12:52:27 -08:00
Wang Jie
ca4b8b90e6 Update gettingstarted.md (#4985) 2017-10-16 16:58:58 -07:00
Gwendolynne Barr
34cd249844 Improvements to Getting Started content for Compose (#4617) 2017-09-13 16:55:51 -07:00