Commit Graph

1549 Commits

Author SHA1 Message Date
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
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
Sebastiaan van Stijn
36e483169d compose-file: document additional changes in the 3.8 schema (#10980)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-06-12 10:51:35 +01:00
Ulysses Souza
ce973f4e98 Post 1.26.0 release updates (#10948)
* Post 1.26.0 release updates

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

* Minor style edits

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2020-06-03 17:09:29 +01:00
Sebastiaan van Stijn
3abbecd92d Merge pull request #10897 from DaleSeo/patch-1
Correct image for db service
2020-06-02 13:26:38 +02:00
ticalcster
5c5bbfb624 fixed max_replicas_per_node example (#10711)
The example for max_replicas_per_node was not inside the placement dict.
2020-05-29 17:12:29 +01:00
Dale Seo
568a163b85 Correct image for db service 2020-05-26 22:28:04 -04:00
Beni Rupp
4d5c70525e Add description for unless-stopped restart policy 2020-05-08 08:23:06 +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
3caa2cab82 compose-file: add some options that were missing in changes
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-21 20:57:16 +02:00
Sven Dowideit
d5e7a26efe Mention Docker 19.03 and its compose file version - and add max_replicas_per_node
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2020-04-17 08:49:33 +02:00
Ulysses Souza
dee187c282 Update docker-compose release notes for 1.25.5 (#10643)
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2020-04-16 11:23:23 +01:00
Young Jin Ahn
c36fb459e1 update postgres initialization for compose/django.md (#10624)
* update postgres initialization for compose/django.md

* omitted code blocks with postgres ports & comments
2020-04-16 10:07:03 +01:00
Charles Chan
68bda871de Improve example for setting environment variables (#10594) 2020-04-14 11:30:03 +01:00
Sebastiaan van Stijn
7cdc66fba9 compose: fix highlighting on startup-order page
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-11 16:07:13 +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
Hector S
4a3f0a68c4 Fixing bad url related to #10517 2020-03-25 22:37:34 +01:00
Sebastiaan van Stijn
93e24fe60e Move release notes inside each product's section
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-18 14:09:17 +01:00
Usha Mandya
30ea7f2562 Merge pull request #10467 from thaJeztah/update_compose_file_reference
Rewrite and cleaning-up compose file reference
2020-03-17 15:22:13 +00:00
Sebastiaan van Stijn
14bbe621e5 Update markdown language hints to work with "rouge"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-17 14:49:51 +01:00
Sebastiaan van Stijn
8a0f1f0c67 compose-file: disable indexing for compose file V1 format
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-17 14:15:28 +01:00
Sebastiaan van Stijn
02a36c2735 compose-file: fix constraint examples, and consistent format
Constraints don't accept spaces around `==` / `!=`

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-17 14:15:22 +01:00
Sebastiaan van Stijn
f15a3a1c4b compose-file: use JSON notation for entrypoint example
This format is also supported by YAML, and similar to
how it's used in the Dockerfile.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-17 14:15:20 +01:00
Sebastiaan van Stijn
4cf38f289f compose-file: reformat and rewrite some tips/notes
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-17 13:59:44 +01:00
Sebastiaan van Stijn
dc2ae46f92 compose-file v2: re-order topics to be the same as v3
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-17 13:31:43 +01:00
Sebastiaan van Stijn
fad62a6e9d compose-file: add missing code-hints, sync formatting between versions
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-17 13:31:36 +01:00
Sebastiaan van Stijn
73c9649967 Move "Glossary" from top nav to "reference" section
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-14 09:10:38 +01:00
hochan222
43de808c91 maybe version not update
hochan@hochan-node:~/Desktop/pfc/dockercompose$ sudo docker-compose up --build
ERROR: Version in "./docker-compose.yml" is unsupported. You might be seeing this error because you're using the wrong Compose file version. Either specify a version of "2" (or "2.0") and place your service definitions under the `services` key, or omit the `version` key and place your service definitions at the root of the file to use version 1.
2020-03-11 04:37:56 +09:00
charliemenke
bf99b1999c Update rails.md (#10271) 2020-02-12 10:14:56 +00:00
TribalNightOwl
b344d1beb3 Fix missing comma (#10226)
* Fix missing comma

* Improved way to describe boolean values in env

Great idea @dHannasch!
2020-02-11 14:21:50 +00:00
Sebastiaan van Stijn
d4ead1b120 Remove "bundle" subcommand and support for DAB files
Deploying stacks using the "Docker Application Bundle" (`.dab`) file
format was introduced as an experimental feature in Docker 1.13 /
17.03, but superseded by support for Docker Compose files in the CLI.

With no development being done on this feature, and no active use of the file
format, support for the DAB file format and the top-level `docker deploy` command
(hidden by default in 19.03), will be removed from the CLI, in favour of
`docker stack deploy` using compose files.

This patch removes documentation for the `docker-compose bundle` subcommand,
which was used to convert compose files into DAB files (and given the above,
will no longer be needed).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-01-22 15:34:58 +01:00
Andrey Kuchuk
5586e5e0da update compose install md (#10146)
make install as a container better for copy-paste
2020-01-22 13:42:09 +00:00
Daniel Naftalovich
8b05462660 Missing link to Getting Started w/ Compose (#9991)
* Missing link to Getting Started w/ Compose
* Style edits
2019-12-10 08:13:31 +00:00
lena-larionova
c620742964 turned deprecated notes into warnings (#9912)
Signed-off-by: Lena Larionova <lena.larionova@docker.com>
2019-11-19 15:24:22 -08:00
KoryKessel-Docker
2ce3996912 Push of Compose xref edits to public. 2019-11-14 14:40:19 +00:00