Skip to content

Commit 8fe23ca

Browse files
committed
Use proper command of docker compose and proper name of Docker Compose
Add Docker Compose to glossary
1 parent c2b86af commit 8fe23ca

File tree

9 files changed

+34
-31
lines changed

9 files changed

+34
-31
lines changed

docs/glossary.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,9 @@ DPI
289289
Docker
290290
[Docker](https://www.docker.com/) is an open platform for developing, shipping, and running applications using containers.
291291
292+
Docker Compose
293+
[Docker Compose](https://docs.docker.com/compose/) is a tool for defining and running multi-container Docker applications.
294+
292295
RelStorage
293296
[RelStorage](https://relstorage.readthedocs.io/en/latest/) is a storage implementation for ZODB that stores pickles in a relational database.
294297

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ volumes:
6363
6464
## Build the project with multiple backends
6565
66-
Run `docker-compose up -d --scale backend=4` from your project directory.
66+
Run `docker compose up -d --scale backend=4` from your project directory.
6767

6868

6969
## Access Plone via Browser
@@ -82,6 +82,6 @@ You should see HAProxy statistics for your Plone cluster.
8282

8383
## Shutdown and cleanup
8484

85-
The command `docker-compose down` removes the containers and default network, but preserves the Plone database.
85+
The command `docker compose down` removes the containers and default network, but preserves the Plone database.
8686

87-
The command `docker-compose down --volumes` removes the containers, default network, and the Plone database.
87+
The command `docker compose down --volumes` removes the containers, default network, and the Plone database.

docs/install/containers/examples/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ nginx-plone
1919
haproxy-plone-zeo
2020
```
2121

22-
Examples of projects running Plone using `docker-compose`.
22+
Examples of projects running Plone using `docker compose`.
2323

2424
| Project example | Description |
2525
| --- | --- |

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ server {
5757
You can either use `localhost`, or add it in your `etc/hosts` file or DNS to point to the docker host IP.
5858
```
5959

60-
### Service configuration with `docker-compose`
60+
### Service configuration with Docker Compose
6161

6262
Now let's create a `docker-compose.yml` file:
6363

@@ -91,10 +91,10 @@ volumes:
9191
9292
## Build the project
9393
94-
Start the stack with `docker-compose`.
94+
Start the stack with `docker compose`.
9595

9696
```shell
97-
docker-compose up -d
97+
docker compose up -d
9898
```
9999

100100
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.
107107

108108
## Shutdown and cleanup
109109

110-
The command `docker-compose down` removes the containers and default network, but preserves the Plone database.
110+
The command `docker compose down` removes the containers and default network, but preserves the Plone database.
111111

112-
The command `docker-compose down --volumes` removes the containers, default network, and the Plone database.
112+
The command `docker compose down --volumes` removes the containers, default network, and the Plone database.

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ You can either use `localhost`, or add it in your `etc/hosts` file or DNS to poi
8383
```
8484

8585

86-
### Service configuration with `docker-compose`
86+
### Service configuration with Docker Compose
8787

8888
Now let's create a `docker-compose.yml` file:
8989

@@ -138,10 +138,10 @@ volumes:
138138
139139
## Build the project
140140
141-
Start the stack with `docker-compose`.
141+
Start the stack with `docker compose`.
142142

143143
```shell
144-
docker-compose up -d
144+
docker compose up -d
145145
```
146146

147147
This pulls the needed images and starts Plone.
@@ -154,15 +154,15 @@ After startup, go to `http://plone.localhost/` and you should see the site.
154154

155155
## Increase the number of backends
156156

157-
To use two containers for backend, run `docker-compose` with `--scale`.
157+
To use two containers for backend, run `docker compose` with `--scale`.
158158

159159
```shell
160-
docker-compose up --scale backend=2
160+
docker compose up --scale backend=2
161161
```
162162

163163

164164
## Shutdown and cleanup
165165

166-
The command `docker-compose down` removes the containers and default network, but preserves the Plone database.
166+
The command `docker compose down` removes the containers and default network, but preserves the Plone database.
167167

168-
The command `docker-compose down --volumes` removes the containers, default network, and the Plone database.
168+
The command `docker compose down --volumes` removes the containers, default network, and the Plone database.

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ You can either use `localhost`, or add it in your `etc/hosts` file or DNS to poi
8383
```
8484

8585

86-
### Service configuration with `docker-compose`
86+
### Service configuration with Docker Compose
8787

8888
Now let's create a `docker-compose.yml` file:
8989

@@ -135,10 +135,10 @@ volumes:
135135
136136
## Build the project
137137
138-
Start the stack with `docker-compose`.
138+
Start the stack with `docker compose`.
139139

140140
```shell
141-
docker-compose up -d
141+
docker compose up -d
142142
```
143143

144144
This pulls the needed images and starts Plone.
@@ -151,15 +151,15 @@ After startup, go to `http://plone.localhost/` and you should see the site.
151151

152152
## Increase the number of backends
153153

154-
To use two containers for the backend, run `docker-compose` with `--scale`.
154+
To use two containers for the backend, run `docker compose` with `--scale`.
155155

156156
```shell
157-
docker-compose up --scale backend=2
157+
docker compose up --scale backend=2
158158
```
159159

160160

161161
## Shutdown and cleanup
162162

163-
The command `docker-compose down` removes the containers and default network, but preserves the Plone database.
163+
The command `docker compose down` removes the containers and default network, but preserves the Plone database.
164164

165-
The command `docker-compose down --volumes` removes the containers, default network, and the Plone database.
165+
The command `docker compose down --volumes` removes the containers, default network, and the Plone database.

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ server {
8181
You can either use `localhost`, or add it in your `etc/hosts` file or DNS to point to the docker host IP.
8282
```
8383

84-
### Service configuration with `docker-compose`
84+
### Service configuration with Docker Compose
8585

8686
Now let's create a `docker-compose.yml` file:
8787

@@ -124,10 +124,10 @@ volumes:
124124
125125
## Build the project
126126
127-
Start the stack with `docker-compose`.
127+
Start the stack with `docker compose`.
128128

129129
```shell
130-
docker-compose up -d
130+
docker compose up -d
131131
```
132132

133133
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.
140140

141141
## Shutdown and cleanup
142142

143-
The command `docker-compose down` removes the containers and default network, but preserves the Plone database.
143+
The command `docker compose down` removes the containers and default network, but preserves the Plone database.
144144

145-
The command `docker-compose down --volumes` removes the containers, default network, and the Plone database.
145+
The command `docker compose down --volumes` removes the containers, default network, and the Plone database.

docs/install/containers/images/frontend.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ services:
100100
101101
To start, run
102102
```shell
103-
docker-compose up -d
103+
docker compose up -d
104104
```
105105

106106
## Versions

docs/install/containers/images/zeo.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ docker run -p 8100:8100 plone/plone-zeo:latest
2323
```
2424

2525

26-
### Docker-compose
26+
### Service configuration with Docker Compose
2727

2828
Create a directory for your project, and inside it create a `docker-compose.yml` file that starts your Plone instance and the ZEO instance with volume mounts for data persistence:
2929

@@ -51,7 +51,7 @@ volumes:
5151
data: {}
5252
```
5353
54-
Now, run `docker-compose up -d` from your project directory.
54+
Now, run `docker compose up -d` from your project directory.
5555

5656
Point your browser at http://localhost:8080 and you should see the default Plone site creation page.
5757

0 commit comments

Comments
 (0)