Skip to content

Commit 5f83b10

Browse files
Run update.sh
1 parent 2613481 commit 5f83b10

File tree

19 files changed

+103
-119
lines changed

19 files changed

+103
-119
lines changed

backdrop/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,9 @@ $ docker run --name some-backdrop \
9393
-d backdrop
9494
```
9595

96-
## ... via [`docker-compose`](https://github.com/docker/compose)
96+
## ... via [Docker Compose](https://github.com/docker/compose)
9797

98-
Example `docker-compose.yml` for `backdrop`:
98+
Example `compose.yaml` for `backdrop`:
9999

100100
```yaml
101101
backdrop:
@@ -114,7 +114,7 @@ db:
114114
MYSQL_DATABASE: backdrop
115115
```
116116
117-
Run `docker-compose up`, wait for it to initialize completely, and visit `http://localhost:8080` or `http://host-ip:8080`.
117+
Run `docker compose up`, wait for it to initialize completely, and visit `http://localhost:8080` or `http://host-ip:8080`.
118118

119119
## Adding additional libraries / extensions
120120

bonita/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ services:
129129
130130
[![Try in PWD](https://github.com/play-with-docker/stacks/raw/cff22438cb4195ace27f9b15784bbb497047afa7/assets/images/button.png)](http://play-with-docker.com?stack=https://raw.githubusercontent.com/docker-library/docs/b9ac3b631e82399477dd12a906f6bf68b3d872b3/bonita/stack.yml)
131131
132-
Run `docker stack deploy -c stack.yml bonita` (or `docker-compose -f stack.yml up`), wait for it to initialize completely, and visit `http://swarm-ip:8080`, `http://localhost:8080`, or `http://host-ip:8080` (as appropriate).
132+
Run `docker stack deploy -c stack.yml bonita` (or `docker compose -f stack.yml up`), wait for it to initialize completely, and visit `http://swarm-ip:8080`, `http://localhost:8080`, or `http://host-ip:8080` (as appropriate).
133133

134134
- Replace `<hostname>` with the one used in the licence generation command
135135
- leave double `$$` untouched

cassandra/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ The `-v /my/own/datadir:/var/lib/cassandra` part of the command mounts the `/my/
169169

170170
## No connections until Cassandra init completes
171171

172-
If there is no database initialized when the container starts, then a default database will be created. While this is the expected behavior, this means that it will not accept incoming connections until such initialization completes. This may cause issues when using automation tools, such as `docker-compose`, which start several containers simultaneously.
172+
If there is no database initialized when the container starts, then a default database will be created. While this is the expected behavior, this means that it will not accept incoming connections until such initialization completes. This may cause issues when using automation tools, such as Docker Compose, which start several containers simultaneously.
173173

174174
# License
175175

convertigo/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -322,15 +322,15 @@ The default `ENABLE_JDWP_DEBUG` value is **false** and can be defined this way:
322322
$ docker run -d –name C8O -e ENABLE_JDWP_DEBUG=true -p 28080:28080 convertigo
323323
```
324324

325-
## Pre configurated Docker compose stack
325+
## Pre-configurated Docker Compose file
326326

327-
You can use this [stack](https://github.com/convertigo/docker/blob/master/compose/mbaas/docker-compose.yml) to run a complete Convertigo Low Code server with FullSync repository and MySQL analytics in a few command lines.
327+
You can use [this Docker Compose file](https://github.com/convertigo/docker/blob/master/compose/mbaas/docker-compose.yml) to run a complete Convertigo Low Code server with FullSync repository and MySQL analytics in a few command lines.
328328

329329
```console
330330
$ mkdir c8oMBaaS
331331
$ cd c8oMBaaS
332332
$ wget https://raw.githubusercontent.com/convertigo/docker/master/compose/mbaas/docker-compose.yml
333-
$ docker-compose up -d
333+
$ docker compose up -d
334334
```
335335

336336
# License

drupal/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ services:
271271
272272
[![Try in PWD](https://github.com/play-with-docker/stacks/raw/cff22438cb4195ace27f9b15784bbb497047afa7/assets/images/button.png)](http://play-with-docker.com?stack=https://raw.githubusercontent.com/docker-library/docs/8b35a43795bda4f4ca1299bee2d02afe2434ee7f/drupal/stack.yml)
273273
274-
Run `docker stack deploy -c stack.yml drupal` (or `docker-compose -f stack.yml up`), wait for it to initialize completely, and visit `http://swarm-ip:8080`, `http://localhost:8080`, or `http://host-ip:8080` (as appropriate). When installing select `postgres` as database with the following parameters: `dbname=postgres` `user=postgres` `pass=example` `hostname=postgres`
274+
Run `docker stack deploy -c stack.yml drupal` (or `docker compose -f stack.yml up`), wait for it to initialize completely, and visit `http://swarm-ip:8080`, `http://localhost:8080`, or `http://host-ip:8080` (as appropriate). When installing select `postgres` as database with the following parameters: `dbname=postgres` `user=postgres` `pass=example` `hostname=postgres`
275275

276276
## Adding additional libraries / extensions
277277

eggdrop/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,13 +155,13 @@ to your docker run command line.
155155

156156
## Common Errors
157157

158-
# docker-compose.yml
158+
# compose.yaml
159159

160-
A docker-compose.yml example is hosted at https://github.com/eggheads/eggdrop-docker/blob/master/docker-compose.yml . A common error creating your own docker-compose.yml file from scratch is not adding
160+
A `docker-compose.yml` example is hosted at https://github.com/eggheads/eggdrop-docker/blob/master/docker-compose.yml. A common error creating your own Docker Compose file from scratch is not adding:
161161

162162
stdin_open: true
163163

164-
to the docker-compose.yml file. Without it, Eggdrop will give you an "END OF FILE ON TERMINAL" error and not start.
164+
Without it, Eggdrop will give you an "END OF FILE ON TERMINAL" error and not start.
165165

166166
## Troubleshooting / Support
167167

emqx/README.md

Lines changed: 34 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -111,53 +111,51 @@ If not specified, EMQX determines its node name based on the running environment
111111

112112
EMQX supports a variety of clustering methods, see our [documentation](https://docs.emqx.com/en/emqx/latest/deploy/cluster/create-cluster.html) for details.
113113

114-
Let's create a static node list cluster from docker-compose.
114+
Let's create a static node list cluster from Docker Compose.
115115

116-
- Create `docker-compose.yaml`:
116+
- Create `compose.yaml`:
117117

118118
```yaml
119-
version: '3'
120-
121-
services:
122-
emqx1:
123-
image: emqx:latest
124-
environment:
125-
126-
- "EMQX_CLUSTER__DISCOVERY_STRATEGY=static"
127-
- "EMQX_CLUSTER__STATIC__SEEDS=[[email protected], [email protected]]"
128-
networks:
129-
emqx-bridge:
130-
aliases:
131-
- node1.emqx.io
132-
133-
emqx2:
134-
image: emqx:latest
135-
environment:
136-
137-
- "EMQX_CLUSTER__DISCOVERY_STRATEGY=static"
138-
- "EMQX_CLUSTER__STATIC__SEEDS=[[email protected], [email protected]]"
139-
networks:
140-
emqx-bridge:
141-
aliases:
142-
- node2.emqx.io
143-
144-
networks:
145-
emqx-bridge:
146-
driver: bridge
119+
services:
120+
emqx1:
121+
image: emqx:latest
122+
environment:
123+
124+
- "EMQX_CLUSTER__DISCOVERY_STRATEGY=static"
125+
- "EMQX_CLUSTER__STATIC__SEEDS=[[email protected], [email protected]]"
126+
networks:
127+
emqx-bridge:
128+
aliases:
129+
- node1.emqx.io
130+
131+
emqx2:
132+
image: emqx:latest
133+
environment:
134+
135+
- "EMQX_CLUSTER__DISCOVERY_STRATEGY=static"
136+
- "EMQX_CLUSTER__STATIC__SEEDS=[[email protected], [email protected]]"
137+
networks:
138+
emqx-bridge:
139+
aliases:
140+
- node2.emqx.io
141+
142+
networks:
143+
emqx-bridge:
144+
driver: bridge
147145
```
148146
149-
- Start the docker-compose cluster
147+
- Start the Docker Compose services
150148
151149
```bash
152-
docker-compose -p my_emqx up -d
150+
docker compose -p my_emqx up -d
153151
```
154152

155153
- View cluster
156154

157155
```bash
158-
$ docker exec -it my_emqx_emqx1_1 sh -c "emqx ctl cluster status"
159-
Cluster status: #{running_nodes => ['[email protected]','[email protected]'],
160-
stopped_nodes => []}
156+
$ docker exec -it my_emqx_emqx1_1 sh -c "emqx ctl cluster status"
157+
Cluster status: #{running_nodes => ['[email protected]','[email protected]'],
158+
stopped_nodes => []}
161159
```
162160

163161
### Persistence
@@ -169,7 +167,7 @@ If you want to persist the EMQX docker container, you need to keep the following
169167

170168
Since data in these folders are partially stored under the `/opt/emqx/data/mnesia/${node_name}`, the user also needs to reuse the same node name to see the previous state. To make this work, one needs to set the host part of `EMQX_NODE__NAME` to something static that does not change when you restart or recreate the container. It could be container name, hostname or loopback IP address `127.0.0.1` if you only have one node.
171169

172-
In if you use docker-compose, the configuration would look something like this:
170+
In if you use Docker Compose, the configuration would look something like this:
173171

174172
```YAML
175173
volumes:

friendica/README.md

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,13 @@ Now you can access the Friendica installation wizard at http://localhost:8080/ f
9191

9292
## Using the fpm image
9393

94-
To use the fpm image you need an additional web server that can proxy http-request to the fpm-port of the container. For fpm connection this container exposes port 9000. In most cases you might want use another container or your host as proxy. If you use your host you can address your Friendica container directly on port 9000. If you use another container, make sure that you add them to the same docker network (via `docker run --network <NAME> ...` or a `docker-compose` file). In both cases you don't want to map the fpm port to you host.
94+
To use the fpm image you need an additional web server that can proxy http-request to the fpm-port of the container. For fpm connection this container exposes port 9000. In most cases you might want use another container or your host as proxy. If you use your host you can address your Friendica container directly on port 9000. If you use another container, make sure that you add them to the same docker network (via `docker run --network <NAME> ...` or a `compose.yaml` file). In both cases you don't want to map the fpm port to you host.
9595

9696
```console
9797
$ docker run -d friendica:fpm
9898
```
9999

100-
As the fastCGI-Process is not capable of serving static files (style sheets, images, ...) the webserver needs access to these files. This can be achieved with the `volumes-from` option. You can find more information in the docker-compose section.
100+
As the fastCGI-Process is not capable of serving static files (style sheets, images, ...) the webserver needs access to these files. This can be achieved with the `volumes-from` option. You can find more information in the Docker Compose section.
101101

102102
## Background tasks
103103

@@ -222,8 +222,6 @@ The Friendica image supports auto configuration via environment variables. You c
222222
As an alternative to passing sensitive information via environment variables, _FILE may be appended to the previously listed environment variables, causing the initialization script to load the values for those variables from files present in the container. In particular, this can be used to load passwords from Docker secrets stored in /run/secrets/<secret_name> files. For example:
223223

224224
```yaml
225-
version: '3.2'
226-
227225
services:
228226
db:
229227
image: mariadb
@@ -283,9 +281,9 @@ Currently, this is only supported for `FRIENDICA_ADMIN_MAIL`, `MYSQL_DATABASE`,
283281

284282
You have to pull the latest image from the hub (`docker pull friendica`). The stable branch gets checked at every startup and will get updated if no installation was found or a new image is used.
285283

286-
# Running this image with docker-compose
284+
# Running this image with Docker Compose
287285

288-
The easiest way to get a fully featured and functional setup is using a `docker-compose` file. There are too many different possibilities to setup your system, so here are only some examples what you have to look for.
286+
The easiest way to get a fully featured and functional setup is using a `compose.yaml` file. There are too many different possibilities to setup your system, so here are only some examples what you have to look for.
289287

290288
At first make sure you have chosen the right base image (fpm or apache) and added the features you wanted (see below). In every case you want to add a database container and docker volumes to get easy access to your persistent data. When you want your server reachable from the internet adding HTTPS-encryption is mandatory! See below for more information.
291289

@@ -296,8 +294,6 @@ This version will use the apache image and add a mariaDB container. The volumes
296294
Make sure to set the variable `MYSQL_PASSWORD` before run this setup.
297295

298296
```yaml
299-
version: '2'
300-
301297
services:
302298
db:
303299
image: mariadb
@@ -331,7 +327,7 @@ volumes:
331327
friendica:
332328
```
333329

334-
Then run `docker-compose up -d`, now you can access Friendica at http://localhost:8080/ from your system.
330+
Then run `docker compose up -d`, now you can access Friendica at http://localhost:8080/ from your system.
335331

336332
## Base version - FPM
337333

@@ -344,11 +340,9 @@ As this setup does **not include encryption** it should to be run behind a proxy
344340
Prerequisites for this example:
345341

346342
- Make sure to set the variable `MYSQL_PASSWORD` and `MYSQL_USER` before you run the setup.
347-
- Create a `nginx.conf` in the same directory as the docker-compose.yml file (take it from [example](https://github.com/friendica/docker/tree/master/.examples/docker-compose/with-traefik-proxy/mariadb-cron-smtp/fpm/web/nginx.conf))
343+
- Create a `nginx.conf` in the same directory as the `compose.yaml` file (take it from [example](https://github.com/friendica/docker/tree/master/.examples/docker-compose/with-traefik-proxy/mariadb-cron-smtp/fpm/web/nginx.conf))
348344

349345
```yaml
350-
version: '2'
351-
352346
services:
353347
db:
354348
image: mariadb
@@ -396,7 +390,7 @@ networks:
396390
proxy-tier:
397391
```
398392

399-
Then run `docker-compose up -d`, now you can access Friendica at http://localhost:8080/ from your system.
393+
Then run `docker compose up -d`, now you can access Friendica at http://localhost:8080/ from your system.
400394

401395
# Special settings for DEV/RC images
402396

geonetwork/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ services:
345345

346346
[![Try in PWD](https://github.com/play-with-docker/stacks/raw/cff22438cb4195ace27f9b15784bbb497047afa7/assets/images/button.png)](http://play-with-docker.com?stack=https://raw.githubusercontent.com/docker-library/docs/c36fe01925fbb3bd409b060190b7d99be5107af0/geonetwork/stack.yml)
347347

348-
Run `docker stack deploy -c stack.yml geonetwork` (or `docker-compose -f stack.yml up`), wait for it to initialize completely, and visit `http://swarm-ip:8080/geonetwork`, `http://localhost:8080/geonetwork`, or `http://host-ip:8080/geonetwork` (as appropriate).
348+
Run `docker stack deploy -c stack.yml geonetwork` (or `docker compose -f stack.yml up`), wait for it to initialize completely, and visit `http://swarm-ip:8080/geonetwork`, `http://localhost:8080/geonetwork`, or `http://host-ip:8080/geonetwork` (as appropriate).
349349

350350
### Default credentials
351351

ghost/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ $ docker run -d \
9393
ghost:alpine
9494
```
9595

96-
Note: `database__connection__filename` is only valid in development mode and is the location for the SQLite database file. If using development mode, it should be set to a writeable path within a persistent folder (bind mount or volume). It is not available in production mode because an external MySQL server is required (see the `docker-compose` example below).
96+
Note: `database__connection__filename` is only valid in development mode and is the location for the SQLite database file. If using development mode, it should be set to a writeable path within a persistent folder (bind mount or volume). It is not available in production mode because an external MySQL server is required (see the Docker Compose example below).
9797

9898
### Docker Volume
9999

@@ -181,7 +181,7 @@ volumes:
181181
182182
[![Try in PWD](https://github.com/play-with-docker/stacks/raw/cff22438cb4195ace27f9b15784bbb497047afa7/assets/images/button.png)](http://play-with-docker.com?stack=https://raw.githubusercontent.com/docker-library/docs/8b35a43795bda4f4ca1299bee2d02afe2434ee7f/ghost/stack.yml)
183183
184-
Run `docker stack deploy -c stack.yml ghost` (or `docker-compose -f stack.yml up`), wait for it to initialize completely, and visit `http://swarm-ip:8080`, `http://localhost:8080`, or `http://host-ip:8080` (as appropriate).
184+
Run `docker stack deploy -c stack.yml ghost` (or `docker compose -f stack.yml up`), wait for it to initialize completely, and visit `http://swarm-ip:8080`, `http://localhost:8080`, or `http://host-ip:8080` (as appropriate).
185185

186186
# Image Variants
187187

0 commit comments

Comments
 (0)