Merge pull request plone#1250 from plone/containers-clean-up

Containers clean up

Author: stevepiercy

docs/glossary.md

@@ -289,6 +289,9 @@ DPI
 Docker
     [Docker](https://www.docker.com/) is an open platform for developing, shipping, and running applications using containers.
 
+Docker Compose
+    [Docker Compose](https://docs.docker.com/compose/) is a tool for defining and running multi-container Docker applications.
+
 RelStorage
     [RelStorage](https://relstorage.readthedocs.io/en/latest/) is a storage implementation for ZODB that stores pickles in a relational database.
 
@@ -297,4 +300,10 @@ ZEO
 
 PostgreSQL
     [PostgreSQL](https://www.postgresql.org/) is a powerful, open source object-relational database.
+
+HAProxy
+    [HAProxy](https://www.haproxy.org/) is a free, very fast and reliable reverse-proxy offering high availability, load balancing, and proxying for TCP and HTTP-based applications.
+
+nginx
+    [nginx](https://docs.nginx.com/nginx/) (pronounced "engine x") is an HTTP and reverse proxy server, a mail proxy server, and a generic TCP/UDP proxy server, originally written by Igor Sysoev.
 ```

docs/install/containers/examples/haproxy-plone-zeo.md

@@ -1,16 +1,18 @@
 ---
 html_meta:
-  "description": "Simple Plone 6 setup with scalable backend and data being persisted in a Zeo volume."
-  "property=og:description": "Simple Plone 6 setup with scalable backend and data being persisted in a Zeo volume."
-  "property=og:title": "HAproxy, Backend, ZEO container example"
-  "keywords": "Plone 6, Container, Docker, HAproxy, Zeo"
+  "description": "Simple Plone 6 setup with scalable backend and data being persisted in a ZEO volume."
+  "property=og:description": "Simple Plone 6 setup with scalable backend and data being persisted in a ZEO volume."
+  "property=og:title": "HAProxy, Backend, ZEO container example"
+  "keywords": "Plone 6, Container, Docker, HAProxy, ZEO"
 ---
 
-# Haproxy, Backend, ZEO container example
+# HAProxy, Backend, ZEO container example
 
-Very simple setup with only one or more backend instances accessing a ZEO server and data being persisted in a Docker volume.
+This example is a very simple setup with one or more backend instances accessing a ZEO server and data being persisted in a Docker volume.
+
+{term}`HAProxy` is used for load balancing in this example.
+We will use the image [`plone/plone-haproxy`](https://github.com/plone/plone-haproxy).
 
-HAProxy is used for load balancing in this example.
 
 ## Setup
 
@@ -58,20 +60,28 @@ volumes:
   data: {}
 ```
 
+
 ## Build the project with multiple backends
 
-Run `docker-compose up -d --scale backend=4` from your project directory.
+Run `docker compose up -d --scale backend=4` from your project directory.
+
 
 ## Access Plone via Browser
 
-Point your browser at `http://localhost:8080`, using the username and password combination of `admin` and `admin`, and you should see the default Plone site creation page.
+Point your browser at `http://localhost:8080`.
+Login using the username and password combination of `admin` and `admin`.
+You should see the default Plone site creation page.
+
 
 ## Access HAProxy Stats Page via Browser
 
-Point your browser at `http://localhost:1936`, using the username and password combination of `admin` and `admin`, and you should see HAProxy statistics for your Plone cluster.
+Point your browser at `http://localhost:1936`.
+Login using the username and password combination of `admin` and `admin`.
+You should see HAProxy statistics for your Plone cluster.
+
 
 ## Shutdown and cleanup
 
-The command `docker-compose down` removes the containers and default network, but preserves the Plone database.
+The command `docker compose down` removes the containers and default network, but preserves the Plone database.
 
-The command `docker-compose down --volumes` removes the containers, default network, and the Plone database.
+The command `docker compose down --volumes` removes the containers, default network, and the Plone database.

docs/install/containers/examples/index.md

@@ -19,12 +19,12 @@ nginx-plone
 haproxy-plone-zeo
 ```
 
-Examples of projects running Plone using `docker-compose`.
+Examples of projects running Plone using `docker compose`.
 
 | Project example | Description |
 | --- | --- |
-| [nginx-volto-plone](nginx-volto-plone) | Stack with nginx, Frontend and Backend |
-| [nginx-volto-plone-zeo](nginx-volto-plone-zeo) | Stack with nginx, Frontend, Backend and ZEO server |
-| [nginx-volto-plone-postgresql](nginx-volto-plone-postgresql) | Stack with nginx, Frontend, Backend and PostgreSQL DB |
-| [nginx-plone](nginx-plone) | Stack with nginx, and Backend (Plone Classic) |
-| [haproxy-plone-zeo](haproxy-plone-zeo) | Stack with haproxy, Backend and ZEO server |
+| [nginx-volto-plone](nginx-volto-plone) | Stack with nginx, Frontend, and Backend |
+| [nginx-volto-plone-zeo](nginx-volto-plone-zeo) | Stack with nginx, Frontend, Backend, and ZEO server |
+| [nginx-volto-plone-postgresql](nginx-volto-plone-postgresql) | Stack with nginx, Frontend, Backend, and PostgreSQL DB |
+| [nginx-plone](nginx-plone) | Stack with nginx and Backend (Plone Classic) |
+| [haproxy-plone-zeo](haproxy-plone-zeo) | Stack with HAProxy, Backend, and ZEO server |

docs/install/containers/examples/nginx-plone.md

@@ -2,15 +2,15 @@
 html_meta:
   "description": "Simple Plone 6 setup with one backend and data being persisted in a Docker volume."
   "property=og:description": "Simple Plone 6 setup with one backend and data being persisted in a Docker volume."
-  "property=og:title": "Nginx, Plone Classic container example"
-  "keywords": "Plone 6, Container, Docker, Nginx, Plone Classic"
+  "property=og:title": "nginx, Plone Classic container example"
+  "keywords": "Plone 6, Container, Docker, nginx, Plone Classic"
 ---
 
-# Nginx, Plone Classic container example
+# nginx, Plone Classic container example
 
-Simple setup with one backend and data being persisted in a Docker volume.
+This example is a simple setup with one backend and data being persisted in a Docker volume.
 
-Nginx in this example is used as a [reverse proxy](https://docs.nginx.com/nginx/admin-guide/web-server/reverse-proxy/").
+{term}`nginx` in this example is used as a [reverse proxy](https://docs.nginx.com/nginx/admin-guide/web-server/reverse-proxy/).
 
 
 ## Setup
@@ -53,11 +53,11 @@ server {
 ```
 
 ```{note}
-`http://plone.localhost/` is the url you will be using to access the website.
-You can either use `localhost`, or add it in your `etc/hosts` file or DNS to point to the docker host IP.
+`http://plone.localhost/` is the URL you will be using to access the website.
+You can either use `localhost`, or add it in your `/etc/hosts` file or DNS to point to the Docker host IP.
 ```
 
-### Service configuration with `docker-compose`
+### Service configuration with Docker Compose
 
 Now let's create a `docker-compose.yml` file:
 
@@ -91,10 +91,10 @@ volumes:
 
 ## Build the project
 
-Start the stack with `docker-compose`.
+Start the stack with `docker compose`.
 
 ```shell
-docker-compose up -d
+docker compose up -d
 ```
 
 This pulls the needed images and starts Plone.
@@ -107,6 +107,6 @@ After startup, go to `http://plone.localhost/` and you should see the site.
 
 ## Shutdown and cleanup
 
-The command `docker-compose down` removes the containers and default network, but preserves the Plone database.
+The command `docker compose down` removes the containers and default network, but preserves the Plone database.
 
-The command `docker-compose down --volumes` removes the containers, default network, and the Plone database.
+The command `docker compose down --volumes` removes the containers, default network, and the Plone database.

docs/install/containers/examples/nginx-volto-plone-postgresql.md

@@ -2,15 +2,15 @@
 html_meta:
   "description": "Very simple Plone 6 setup with only one or more backend instances accessing a PostgreSQL server and data being persisted in a Docker volume."
   "property=og:description": "Very simple Plone 6 setup with only one or more backend instances accessing a PostgreSQL server and data being persisted in a Docker volume."
-  "property=og:title": "Nginx, Frontend, Backend, PostgreSQL container example"
-  "keywords": "Plone 6, Container, Docker, Nginx, Frontend, Backend, PostgreSQL, "
+  "property=og:title": "nginx, Frontend, Backend, PostgreSQL container example"
+  "keywords": "Plone 6, Container, Docker, nginx, Frontend, Backend, PostgreSQL, "
 ---
 
-# Nginx, Frontend, Backend, PostgreSQL container example
+# nginx, Frontend, Backend, PostgreSQL container example
 
-Very simple setup with only one or more backend instances accessing a Postgres server and data being persisted in a Docker volume.
+This example is a very simple setup with one or more backend instances accessing a Postgres server and data being persisted in a Docker volume.
 
-Nginx in this example is used as a [reverse proxy](https://docs.nginx.com/nginx/admin-guide/web-server/reverse-proxy/").
+{term}`nginx` in this example is used as a [reverse proxy](https://docs.nginx.com/nginx/admin-guide/web-server/reverse-proxy/).
 
 
 ## Setup
@@ -78,11 +78,12 @@ server {
 ```
 
 ```{note}
-`http://plone.localhost/` is the url you will be using to access the website.
-You can either use `localhost`, or add it in your `etc/hosts` file or DNS to point to the docker host IP.
+`http://plone.localhost/` is the URL you will be using to access the website.
+You can either use `localhost`, or add it in your `/etc/hosts` file or DNS to point to the Docker host IP.
 ```
 
-### Service configuration with `docker-compose`
+
+### Service configuration with Docker Compose
 
 Now let's create a `docker-compose.yml` file:
 
@@ -137,10 +138,10 @@ volumes:
 
 ## Build the project
 
-Start the stack with `docker-compose`.
+Start the stack with `docker compose`.
 
 ```shell
-docker-compose up -d
+docker compose up -d
 ```
 
 This pulls the needed images and starts Plone.
@@ -153,15 +154,15 @@ After startup, go to `http://plone.localhost/` and you should see the site.
 
 ## Increase the number of backends
 
-To use two containers for backend, run `docker-compose` with `--scale`.
+To use two containers for backend, run `docker compose` with `--scale`.
 
 ```shell
-docker-compose up --scale backend=2
+docker compose up --scale backend=2
 ```
 
 
 ## Shutdown and cleanup
 
-The command `docker-compose down` removes the containers and default network, but preserves the Plone database.
+The command `docker compose down` removes the containers and default network, but preserves the Plone database.
 
-The command `docker-compose down --volumes` removes the containers, default network, and the Plone database.
+The command `docker compose down --volumes` removes the containers, default network, and the Plone database.

docs/install/containers/examples/nginx-volto-plone-zeo.md

@@ -2,15 +2,16 @@
 html_meta:
   "description": "Very simple Plone 6 setup with only one or more backend instances accessing a ZEO server and data being persisted in a Docker volume."
   "property=og:description": "Very simple Plone 6 setup with only one or more backend instances accessing a ZEO server and data being persisted in a Docker volume."
-  "property=og:title": "Nginx, Frontend, Backend, ZEO container example"
-  "keywords": "Plone 6, Container, Docker, Nginx, Frontend, Backend, ZEO"
+  "property=og:title": "nginx, Frontend, Backend, ZEO container example"
+  "keywords": "Plone 6, Container, Docker, nginx, Frontend, Backend, ZEO"
 ---
 
-# Nginx, Frontend, Backend, ZEO container example
+# nginx, Frontend, Backend, ZEO container example
 
-Very simple setup with only one or more backend instances accessing a ZEO server and data being persisted in a Docker volume.
+This example is a very simple setup with one or more backend instances accessing a ZEO server and data being persisted in a Docker volume.
+
+{term}`nginx` in this example is used as a [reverse proxy](https://docs.nginx.com/nginx/admin-guide/web-server/reverse-proxy/).
 
-Nginx in this example is used as a [reverse proxy](https://docs.nginx.com/nginx/admin-guide/web-server/reverse-proxy/").
 
 ## Setup
 
@@ -77,11 +78,12 @@ server {
 ```
 
 ```{note}
-`http://plone.localhost/` is the url you will be using to access the website.
-You can either use `localhost`, or add it in your `etc/hosts` file or DNS to point to the docker host IP.
+`http://plone.localhost/` is the URL you will be using to access the website.
+You can either use `localhost`, or add it in your `/etc/hosts` file or DNS to point to the Docker host IP.
 ```
 
-### Service configuration with `docker-compose`
+
+### Service configuration with Docker Compose
 
 Now let's create a `docker-compose.yml` file:
 
@@ -133,10 +135,10 @@ volumes:
 
 ## Build the project
 
-Start the stack with `docker-compose`.
+Start the stack with `docker compose`.
 
 ```shell
-docker-compose up -d
+docker compose up -d
 ```
 
 This pulls the needed images and starts Plone.
@@ -149,15 +151,15 @@ After startup, go to `http://plone.localhost/` and you should see the site.
 
 ## Increase the number of backends
 
-To use two containers for the backend, run `docker-compose` with `--scale`.
+To use two containers for the backend, run `docker compose` with `--scale`.
 
 ```shell
-docker-compose up --scale backend=2
+docker compose up --scale backend=2
 ```
 
 
 ## Shutdown and cleanup
 
-The command `docker-compose down` removes the containers and default network, but preserves the Plone database.
+The command `docker compose down` removes the containers and default network, but preserves the Plone database.
 
-The command `docker-compose down --volumes` removes the containers, default network, and the Plone database.
+The command `docker compose down --volumes` removes the containers, default network, and the Plone database.

docs/install/containers/examples/nginx-volto-plone.md

@@ -2,15 +2,15 @@
 html_meta:
   "description": "Very simple Plone 6 setup with only one backend and data being persisted in a Docker volume."
   "property=og:description": "Very simple Plone 6 setup with only one backend and data being persisted in a Docker volume."
-  "property=og:title": "Nginx, Frontend, Backend container example"
-  "keywords": "Plone 6, Container, Docker, Nginx, Frontend, Backend"
+  "property=og:title": "nginx, Frontend, Backend container example"
+  "keywords": "Plone 6, Container, Docker, nginx, Frontend, Backend"
 ---
 
-# Nginx, Frontend, Backend container example
+# nginx, Frontend, Backend container example
 
-Very simple setup with only one backend and data being persisted in a Docker volume.
+This example is a very simple setup with one backend and data being persisted in a Docker volume.
 
-Nginx in this example is used as a [reverse proxy](https://docs.nginx.com/nginx/admin-guide/web-server/reverse-proxy/").
+{term}`nginx` in this example is used as a [reverse proxy](https://docs.nginx.com/nginx/admin-guide/web-server/reverse-proxy/).
 
 ## Setup
 
@@ -77,11 +77,11 @@ server {
 ```
 
 ```{note}
-`http://plone.localhost/` is the url you will be using to access the website.
-You can either use `localhost`, or add it in your `etc/hosts` file or DNS to point to the docker host IP.
+`http://plone.localhost/` is the URL you will be using to access the website.
+You can either use `localhost`, or add it in your `/etc/hosts` file or DNS to point to the Docker host IP.
 ```
 
-### Service configuration with `docker-compose`
+### Service configuration with Docker Compose
 
 Now let's create a `docker-compose.yml` file:
 
@@ -124,10 +124,10 @@ volumes:
 
 ## Build the project
 
-Start the stack with `docker-compose`.
+Start the stack with `docker compose`.
 
 ```shell
-docker-compose up -d
+docker compose up -d
 ```
 
 This pulls the needed images and starts Plone.
@@ -140,6 +140,6 @@ After startup, go to `http://plone.localhost/` and you should see the site.
 
 ## Shutdown and cleanup
 
-The command `docker-compose down` removes the containers and default network, but preserves the Plone database.
+The command `docker compose down` removes the containers and default network, but preserves the Plone database.
 
-The command `docker-compose down --volumes` removes the containers, default network, and the Plone database.
+The command `docker compose down --volumes` removes the containers, default network, and the Plone database.