Commit Graph

1584 Commits

Author SHA1 Message Date
Sebastiaan van Stijn
e3ef5c5085 machine: move overview page to /machine/
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-21 15:44:05 +02:00
Sebastiaan van Stijn
03d60f916a Replace "hide_from_sitemap" with "sitemap: false"
The `hide_from_sitemap` metadata variable was a custom thing we implemented
to add a "noindex" meta-header to pages and to exclude a page from the
search auto-complete.

However, pages with that option set would still be included in sitemap.xml,
resulting in search engines to visit those pages (only to discover they
should not index them).

This patch replaces the custom `hide_from_sitemap` value for `sitemap: false`,
which is a metadata variable that's defined by the "jekyll-sitemap" plugin
we use to generate the sitemap.xml;

https://github.com/jekyll/jekyll-sitemap/blob/v1.4.0/README.md#exclusions

Setting this variable will now:

- add a "noindex" metadata header to the page
- exclude the page from the sitemap.xml.
- exclude the page from /js/metadata.json (used for search autocomplete)

Also fixed an issue in the metadata.json where the `notoc` metadata was
used to exclude pages, however that variable is meant to disable the
in-page TOC (right-hand side navigation with anchor links).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-21 15:09:11 +02:00
Sebastiaan van Stijn
088c702b21 Merge pull request #11587 from usha-mandya/engdocs-354
Remove Docker Toolbox docs
2020-10-20 23:33:50 +02:00
Usha Mandya
e885a5aeaa Remove Docker Toolbox docs
Signed-off-by: Usha Mandya <usha.mandya@docker.com>
2020-10-20 18:05:36 +01:00
Sebastiaan van Stijn
92e2068c38 [Desktop] remove content refering to removed "osxfs" topic
This topic was removed in 9bebb666d9

We may want to add back the part describing sharing sshagent somewhere,
which is not really a feature related to osxfs. Also, some generic
description about file sharing (permissions, syncing) should probably
be added back.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-20 14:08:46 +02:00
Sebastiaan van Stijn
c119ed174e Use https:// for links and examples
Found these using `http://[^lp10\*`<][^o]` (to exclude "localhost" and IP-addresses)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-13 12:09:11 +02:00
Sebastiaan van Stijn
393d3f6566 Add rel="noopener" to external links
See https://web.dev/external-anchors-use-rel-noopener/

Using noopener, as that addresses the security issue. "noreferer" blocks
the REFERER header, which may still be useful for some target URLs.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-12 13:09:30 +02:00
Liu Lantao
2a40c14676 update according to reviewer suggestion
Signed-off-by: Liu Lantao <liulantao@gmail.com>
2020-10-11 13:03:54 +08:00
Liu Lantao
c59542a042 Update rails.md
Fix parameter error in compose document.
2020-10-11 13:02:37 +08:00
Sebastiaan van Stijn
2eff941697 compose: move deprecated env-vars section, and fix duplicate redirects
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-07 12:49:30 +02:00
Sebastiaan van Stijn
b3d8bfa7c5 Remove old "Using Compose with Swarm" page
This page describes using docker compose with legacy swarm,
which has been deprecated.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-07 09:50:57 +02:00
Jak Spalding
e94985b22a Correcting update_config.monitor documented default value (#11034)
* Correcting update_config.monitor documentation

The default monitor period is 5s and cannot be set to 0. The lowest possible value is 1ns.

* Correcting default values
2020-10-01 09:44:00 +01:00
Anca Iordache
6f908532f4 Bump compose to 1.27.4 (#11418)
* Bump compose to 1.27.4

Signed-off-by: aiordache <anca.iordache@docker.com>

* Minor style update

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2020-09-24 18:24:19 +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
Sebastiaan van Stijn
26916468d3 compose: add highlighting and automate version for compose-file
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-22 15:25:20 +02:00
Usha Mandya
8f2327a1aa Merge pull request #11250 from sohmil97/patch-1
update docker-compose version
2020-09-22 14:23:51 +01:00
aiordache
d09b63f320 Bump compose to 1.27.3
Signed-off-by: aiordache <anca.iordache@docker.com>
2020-09-16 16:43:26 +02:00
Anca Iordache
85e11b239f Bump docker-compose to 1.27.2 (#11360)
* Bump docker-compose to 1.27.2

Signed-off-by: aiordache <anca.iordache@docker.com>

* Update formatting

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2020-09-14 08:16:22 +01:00
Anca Iordache
52497c10bd Bump docker-compose to 1.27.1 (#11357)
* Bump docker-compose to 1.27.1

Signed-off-by: aiordache <anca.iordache@docker.com>

* Minor style updates

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2020-09-10 16:15:09 +01: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
Ulysses Souza
411bf944cb Update docs on command help (#11341)
* Update docs on command help

This is change is based on the output of the script proposed by @smola
in: https://github.com/docker/docker.github.io/pull/11173


Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>

* Formatting updates

* Minor style update

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2020-09-08 11:57:19 +01:00
Anca Iordache
4236ca0914 Post docker-compose 1.27.0 (#11344)
* Post docker-compose 1.27.0

Signed-off-by: aiordache <anca.iordache@docker.com>

* Minor style updates

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2020-09-08 11:56:45 +01:00
Usha Mandya
1c8cdff1e4 Fix extra space in Compose file ref 2020-09-03 15:19:55 +01:00
Usha Mandya
9df2ab4aaf Merge pull request #11287 from DavidTheProgrammer/patch-1
Added documentation for docker-compose --env-file option to compose/environment-variables.md
2020-08-26 16:43:48 +01:00
Usha Mandya
ad5bd1a13c Merge pull request #11204 from melaniemkwon/patch-1
Update quickstart Django example
2020-08-26 13:48:41 +01:00
Usha Mandya
7d9d5f3aac Minor style updates 2020-08-26 13:40:21 +01:00
Usha Mandya
be5688b2d2 Merge pull request #11092 from jasonsychau/patch-1
Proposition in startup-order.md
2020-08-26 09:37:00 +01:00
Muma David Bwalya
231b04065e Update environment-variables.md
I'm not sure if these are in the right place, but I think it's really important it's somewhere.

Closes issue https://github.com/docker/docker.github.io/issues/11286
2020-08-24 17:48:26 +02:00
Sohrab Shahinfar
b6cace9640 update docker-compose version
update docker-compose.yml to version 3
2020-08-15 15:32:27 +04:30
Usha Mandya
1532bb4772 Fix md syntax 2020-08-12 09:56:06 +01:00
Mark Schmale
ce341bd72f Add note about setup being not viable for production (#11228)
* Add note about setup beeing not viable production

I think there should at least a small hint that this guide is just intended as a bare-bones development environment and should not at all be rolled into production like this. 
Relates to #7622

* Minor style updates

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2020-08-11 15:36:25 +01:00
Geetha Rangaswamaiah
77b7b73652 Fix compose docs grammatical errors 2020-08-06 12:49:26 +05:30
Melanie Kwon
f256ba065b Update quickstart Django example
Updating example from Django 2.x to Django 3.x
2020-07-31 08:49:41 -07:00
Usha Mandya
e6b1d671cb Merge pull request #11116 from kaden-weber/patch-1
Update django.md
2020-07-22 13:41:38 +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
Kaden Weber
80b4f06fa2 Update django.md
typo
2020-07-09 10:55:44 -05:00
Usha Mandya
991da00bf7 Merge pull request #11021 from IMMORTALxJO/patch-1
Fixed typo in tmpfs example index.md
2020-07-07 16:26:10 +01:00
Ulysses Souza
262aa4a1e3 Post docker-compose 1.26.2 (#11100)
* Post docker-compose 1.26.2

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>

* Minor style update

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2020-07-07 10:20:29 +01:00
Jason C
7e9e551fb8 Update startup-order.md 2020-07-06 01:58:18 -07:00
David Florness
f89bbe13ed Fix grammar (#11072) 2020-07-02 09:33:54 +01:00
Usha Mandya
9031d87295 Update to use lowercase 2020-07-01 16:58:28 +01:00
Usha Mandya
ff1578ba9d Update image push reference 2020-07-01 16:30:02 +01:00
Ulysses Souza
7b70c20f1f Bump docker-compose 1.26.1 (#11068)
* Bump docker-compose 1.26.1

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>

* Minor style updates

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2020-07-01 15:21:33 +01:00
Usha Mandya
e7899d34ed Merge pull request #7349 from alioguzhan/patch-1
rename psycopg2 to psycopg2-binary
2020-07-01 13:59:03 +01:00
Alan Bondarchuk
ea11c50410 Add missing space (#11061) 2020-06-30 10:32:22 +01:00
Sebastiaan van Stijn
e3b9c741d0 Merge pull request #10774 from BeniRupp/patch-1
Add description for unless-stopped restart policy
2020-06-25 11:11:49 +02:00
Aleksandr Prusov
1b25464e65 Fixed typo in tmpfs example index.md
tmpfs example has incorrect yaml syntax
2020-06-22 10:37:54 +03:00
Aravind
fa4b25cf64 Update to Posgtres instructions (#10982)
### Background
Newer upstream PostgreSQL Docker images, now require a password for use. If you were previously using passwordless access to a PostgreSQL DB, it will likely fail with an error.

This linked GitHub issue showcases the error: 
https://github.com/docker-library/postgres/issues/681

### Solution
The postgres docker page gives instructions on how to use the new image : https://hub.docker.com/_/postgres

There seems to be two different options we can take here :

Option 1 - Implement a password using the environment variable
Option 2 - Revert back to old behavior of having no password requirement

### Thoughts
Based on the team members remark it looks like increased security was the major reason for this breaking changing happening in a minor update.  Refer to this comment : https://github.com/docker-library/postgres/issues/681#issuecomment-586517154

As such I opted to use Option 1 here in this change as increased security of a DB is generally a win for every one in most cases.
2020-06-12 11:23:02 +01:00
Daniel Martinez Sarta
5909058694 Fix Typo. (#10990)
verison -> version
2020-06-12 10:52:41 +01:00