Merge pull request #10717 from thaJeztah/compose_samples

compose: add WordPress example to TOC
2020-09-08 16:29:31 +01:00 · 2020-09-08 16:29:31 +01:00 · f57bd0b321
parent 2eddb84ce3 9f4db87055
commit f57bd0b321
17 changed files with 39 additions and 37 deletions
--- a/_data/toc.yaml
+++ b/_data/toc.yaml
@ -1018,6 +1018,8 @@ samples:
    title: CouchDB
  - path: /compose/django/
    title: Django and PostgreSQL
+  - path: /compose/wordpress/
+    title: WordPress
  - path: /engine/examples/postgresql_service/
    title: PostgreSQL
  - path: /compose/rails/
--- a/compose/completion.md
+++ b/compose/completion.md
@ -118,8 +118,6 @@ Enjoy working with Compose faster and with fewer typos!

 - [User guide](index.md)
 - [Installing Compose](install.md)
- [Get started with Django](django.md)
- [Get started with Rails](rails.md)
- [Get started with WordPress](wordpress.md)
 - [Command line reference](reference/index.md)
 - [Compose file reference](compose-file/index.md)
+- [Sample apps with Compose](samples-for-compose.md)
--- a/compose/compose-file/compose-file-v1.md
+++ b/compose/compose-file/compose-file-v1.md
@ -653,5 +653,5 @@ tty: true
 - [User guide](../index.md)
 - [Installing Compose](../install.md)
 - [Compose file versions and upgrading](compose-versioning.md)
- [Samples](../../samples/index.md)
+- [Sample apps with Compose](../samples-for-compose.md)
 - [Command line reference](../reference/index.md)
--- a/compose/compose-file/compose-file-v2.md
+++ b/compose/compose-file/compose-file-v2.md
@ -1994,5 +1994,5 @@ networks:
 - [User guide](../index.md)
 - [Installing Compose](../install.md)
 - [Compose file versions and upgrading](compose-versioning.md)
- [Samples](../../samples/index.md)
+- [Sample apps with Compose](../samples-for-compose.md)
 - [Command line reference](../reference/index.md)
--- a/compose/compose-file/index.md
+++ b/compose/compose-file/index.md
@ -2758,5 +2758,5 @@ stack.
 - [User guide](../index.md)
 - [Installing Compose](../install.md)
 - [Compose file versions and upgrading](compose-versioning.md)
- [Samples](../../samples/index.md)
+- [Sample apps with Compose](../samples-for-compose.md)
 - [Command line reference](../reference/index.md)
--- a/compose/django.md
+++ b/compose/django.md
@ -255,7 +255,6 @@ def85eff5f51        django_web          "python3 manage.py..."   10 minutes ago
 - [User guide](index.md)
 - [Installing Compose](install.md)
 - [Getting Started](gettingstarted.md)
- [Get started with Rails](rails.md)
- [Get started with WordPress](wordpress.md)
 - [Command line reference](reference/index.md)
 - [Compose file reference](compose-file/index.md)
+- [Sample apps with Compose](samples-for-compose.md)
--- a/compose/env-file.md
+++ b/compose/env-file.md
@ -50,5 +50,8 @@ in your Compose file, and can also be used to define the following
 ## More Compose documentation

 - [User guide](index.md)
+- [Installing Compose](install.md)
+- [Getting Started](gettingstarted.md)
 - [Command line reference](reference/index.md)
 - [Compose file reference](compose-file/index.md)
+- [Sample apps with Compose](samples-for-compose.md)
--- a/compose/extends.md
+++ b/compose/extends.md
@ -372,8 +372,6 @@ container:
 - [User guide](index.md)
 - [Installing Compose](install.md)
 - [Getting Started](gettingstarted.md)
- [Get started with Django](django.md)
- [Get started with Rails](rails.md)
- [Get started with WordPress](wordpress.md)
 - [Command line reference](reference/index.md)
 - [Compose file reference](compose-file/index.md)
+- [Sample apps with Compose](samples-for-compose.md)
--- a/compose/faq.md
+++ b/compose/faq.md
@ -111,9 +111,9 @@ github](https://github.com/search?q=in%3Apath+docker-compose.yml+extension%3Ayml

 ## Compose documentation

+- [User guide](index.md)
 - [Installing Compose](install.md)
- [Get started with Django](django.md)
- [Get started with Rails](rails.md)
- [Get started with WordPress](wordpress.md)
+- [Getting Started](gettingstarted.md)
 - [Command line reference](reference/index.md)
 - [Compose file reference](compose-file/index.md)
+- [Sample apps with Compose](samples-for-compose.md)
--- a/compose/gettingstarted.md
+++ b/compose/gettingstarted.md
@ -333,8 +333,7 @@ At this point, you have seen the basics of how Compose works.

 ## Where to go next

- Next, try the quick start guide for [Django](django.md),
-  [Rails](rails.md), or [WordPress](wordpress.md)
+- Next, try the [Sample apps with Compose](samples-for-compose.md)
 - [Explore the full list of Compose commands](reference/index.md)
 - [Compose configuration file reference](compose-file/index.md)
 - To learn more about volumes and bind mounts, see [Manage data in Docker](../storage/index.md)
--- a/compose/install.md
+++ b/compose/install.md
@ -277,9 +277,8 @@ pip uninstall docker-compose
 ## Where to go next

 - [User guide](index.md)
+- [Installing Compose](install.md)
 - [Getting Started](gettingstarted.md)
- [Get started with Django](django.md)
- [Get started with Rails](rails.md)
- [Get started with WordPress](wordpress.md)
 - [Command line reference](reference/index.md)
 - [Compose file reference](compose-file/index.md)
+- [Sample apps with Compose](samples-for-compose.md)
--- a/compose/link-env-deprecated.md
+++ b/compose/link-env-deprecated.md
@ -39,5 +39,7 @@ Fully qualified container name, such as `DB_1_NAME=/myapp_web_1/myapp_db_1`

 - [User guide](index.md)
 - [Installing Compose](install.md)
+- [Getting Started](gettingstarted.md)
 - [Command line reference](reference/index.md)
 - [Compose file reference](compose-file/index.md)
+- [Sample apps with Compose](samples-for-compose.md)
--- a/compose/production.md
+++ b/compose/production.md
@ -75,6 +75,9 @@ Read more about the Compose/Swarm integration in the

 ## Compose documentation

+- [User guide](index.md)
 - [Installing Compose](install.md)
+- [Getting Started](gettingstarted.md)
 - [Command line reference](reference/index.md)
 - [Compose file reference](compose-file/index.md)
+- [Sample apps with Compose](samples-for-compose.md)
--- a/compose/rails.md
+++ b/compose/rails.md
@ -269,7 +269,6 @@ host.
 - [User guide](index.md)
 - [Installing Compose](install.md)
 - [Getting Started](gettingstarted.md)
- [Get started with Django](django.md)
- [Get started with WordPress](wordpress.md)
 - [Command line reference](reference/index.md)
 - [Compose file reference](compose-file/index.md)
+- [Sample apps with Compose](samples-for-compose.md)
--- a/compose/startup-order.md
+++ b/compose/startup-order.md
@ -89,9 +89,9 @@ script:

 ## Compose documentation

+- [User guide](index.md)
 - [Installing Compose](install.md)
- [Get started with Django](django.md)
- [Get started with Rails](rails.md)
- [Get started with WordPress](wordpress.md)
+- [Getting Started](gettingstarted.md)
 - [Command line reference](reference/index.md)
 - [Compose file reference](compose-file/index.md)
+- [Sample apps with Compose](samples-for-compose.md)
--- a/compose/wordpress.md
+++ b/compose/wordpress.md
@ -142,7 +142,6 @@ network, and the WordPress database.
 - [User guide](index.md)
 - [Installing Compose](install.md)
 - [Getting Started](gettingstarted.md)
- [Get started with Django](django.md)
- [Get started with Rails](rails.md)
 - [Command line reference](reference/index.md)
 - [Compose file reference](compose-file/index.md)
+- [Sample apps with Compose](samples-for-compose.md)
--- a/samples/index.md
+++ b/samples/index.md
@ -27,17 +27,18 @@ repository]({{ labsbase }}).

 Run popular software using Docker.

-| Sample | Description |
-| ------ | ----------- |
-| [apt-cacher-ng](/engine/examples/apt-cacher-ng/) | Run a Dockerized apt-cacher-ng instance. |
-| [.Net Core application](/engine/examples/dotnetcore/) | Run a Dockerized ASP.NET Core application. |
-| [ASP.NET Core + SQL Server on Linux](/compose/aspnet-mssql-compose/) | Run a Dockerized ASP.NET Core + SQL Server environment. |
-| [CouchDB](/engine/examples/couchdb_data_volumes/) | Run a Dockerized CouchDB instance. |
-| [Django + PostgreSQL](/compose/django/) | Run a Dockerized Django + PostgreSQL environment. |
-| [PostgreSQL](/engine/examples/postgresql_service/) | Run a Dockerized PostgreSQL instance. |
-| [Rails + PostgreSQL](/compose/rails/) | Run a Dockerized Rails + PostgreSQL environment. |
-| [Riak](/engine/examples/running_riak_service/) | Run a Dockerized Riak instance. |
-| [SSHd](/engine/examples/running_ssh_service/) | Run a Dockerized SSHd instance. |
+| Sample                                                                    | Description                                               |
+| ------------------------------------------------------------------------- | --------------------------------------------------------- |
+| [apt-cacher-ng](../engine/examples/apt-cacher-ng.md)                      | Run a Dockerized apt-cacher-ng instance.                  |
+| [.Net Core application](../engine/examples/dotnetcore.md)                 | Run a Dockerized ASP.NET Core application.                |
+| [ASP.NET Core + SQL Server on Linux](../compose/aspnet-mssql-compose.md)  | Run a Dockerized ASP.NET Core + SQL Server environment.   |
+| [CouchDB](../engine/examples/couchdb_data_volumes.md)                     | Run a Dockerized CouchDB instance.                        |
+| [Django + PostgreSQL](../compose/django.md)                               | Run a Dockerized Django + PostgreSQL environment.         |
+| [PostgreSQL](../engine/examples/postgresql_service.md)                    | Run a Dockerized PostgreSQL instance.                     |
+| [Rails + PostgreSQL](../compose/rails.md)                                 | Run a Dockerized Rails + PostgreSQL environment.          |
+| [Riak](../engine/examples/running_riak_service.md)                        | Run a Dockerized Riak instance.                           |
+| [SSHd](../engine/examples/running_ssh_service.md)                         | Run a Dockerized SSHd instance.                           |
+| [WordPress](../compose/wordpress.md)                                      | Quickstart: Compose and WordPress.                        |

 ## Library references