Skip to content

Commit 1e1865e

Browse files
Run update.sh
1 parent c405417 commit 1e1865e

File tree

7 files changed

+49
-49
lines changed

7 files changed

+49
-49
lines changed

aerospike/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ For more, see [How do I get a 2 nodes Aerospike cluster running quickly in Docke
217217

218218
## Image Versions
219219

220-
These images are based on [debian:strech-slim](https://hub.docker.com/_/debian).
220+
These images are based on [debian:*-slim](https://hub.docker.com/_/debian).
221221

222222
### ee-[version]
223223

bash/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ WARNING:
2424

2525
# Supported tags and respective `Dockerfile` links
2626

27-
- [`devel-20231023`, `devel`, `devel-20231023-alpine3.18`, `devel-alpine3.18`](https://github.com/tianon/docker-bash/blob/069d8927e1b5de80f948b58b6b2b615fd82456c0/devel/Dockerfile)
27+
- [`devel-20231030`, `devel`, `devel-20231030-alpine3.18`, `devel-alpine3.18`](https://github.com/tianon/docker-bash/blob/16576ce16333b5ceb07045b2d4114d1594a3a70e/devel/Dockerfile)
2828
- [`5.2.15`, `5.2`, `5`, `latest`, `5.2.15-alpine3.18`, `5.2-alpine3.18`, `5-alpine3.18`, `alpine3.18`](https://github.com/tianon/docker-bash/blob/fa56f3014aa4901e889d12910a711d1adc0fc6a6/5.2/Dockerfile)
2929
- [`5.1.16`, `5.1`, `5.1.16-alpine3.18`, `5.1-alpine3.18`](https://github.com/tianon/docker-bash/blob/24c782c1b77287b0cea03a00ba43498276bf8182/5.1/Dockerfile)
3030
- [`5.0.18`, `5.0`, `5.0.18-alpine3.18`, `5.0-alpine3.18`](https://github.com/tianon/docker-bash/blob/eb30d9e65ce00810fcc7e984f5a7d554433aaa34/5.0/Dockerfile)

dart/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ WARNING:
2424

2525
# Supported tags and respective `Dockerfile` links
2626

27-
- [`3.1.5-sdk`, `3.1-sdk`, `3-sdk`, `stable-sdk`, `sdk`, `3.1.5`, `3.1`, `3`, `stable`, `latest`](https://github.com/dart-lang/dart-docker/blob/2e7e751f174af125f91842b5d06450b5f1d94fbb/stable/bookworm/Dockerfile)
28-
- [`3.2.0-210.3.beta-sdk`, `beta-sdk`, `3.2.0-210.3.beta`, `beta`](https://github.com/dart-lang/dart-docker/blob/2e7e751f174af125f91842b5d06450b5f1d94fbb/beta/bookworm/Dockerfile)
27+
- [`3.1.5-sdk`, `3.1-sdk`, `3-sdk`, `stable-sdk`, `sdk`, `3.1.5`, `3.1`, `3`, `stable`, `latest`](https://github.com/dart-lang/dart-docker/blob/241f70ba23e6daa67dff9dedd525dece53e93fab/stable/bookworm/Dockerfile)
28+
- [`3.2.0-210.4.beta-sdk`, `beta-sdk`, `3.2.0-210.4.beta`, `beta`](https://github.com/dart-lang/dart-docker/blob/241f70ba23e6daa67dff9dedd525dece53e93fab/beta/bookworm/Dockerfile)
2929

3030
# Quick reference (cont.)
3131

jetty/README.md

Lines changed: 30 additions & 30 deletions
Large diffs are not rendered by default.

mariadb/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -314,9 +314,9 @@ This is documented on [MariaDB Knowledge Base : Adding Plugins to the Docker Off
314314
- [MariaDB MaxScale](https://hub.docker.com/r/mariadb/maxscale/tags)
315315
- [MariaDB ColumnStore](https://hub.docker.com/r/mariadb/columnstore/tags)
316316

317-
# Componse File Examples
317+
# Compose File Examples
318318

319-
Example compose files using this `mariadb` are located in %%GITHUB-REPO% in the `/examples` folder.
319+
Example compose files using this `mariadb` are located in https://github.com/MariaDB/mariadb-docker in the `/examples` folder.
320320

321321
# License
322322

monica/README.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,11 @@ where `monica` is the name of the service in your `docker-compose.yml` file.
111111

112112
## Configuration using environment variables
113113

114-
The Monica image will use environment variables to setup the application. See [Monica documentation](https://github.com/monicahq/monica/blob/main/.env.example) for common used variables you should setup.
114+
The Monica image will use environment variables to setup the application. See [Monica documentation](https://github.com/monicahq/monica/blob/4.x/.env.example) for common used variables you should setup.
115115

116116
## Running the image with docker-compose
117117

118-
See some examples of docker-compose possibilities in the [example section](https://github.com/monicahq/docker/blob/master/.examples).
118+
See some examples of docker-compose possibilities in the [example section](https://github.com/monicahq/docker/blob/main/.examples).
119119

120120
---
121121

@@ -128,7 +128,7 @@ Make sure to pass in values for `APP_KEY` variable before you run this setup.
128128
1. Create a `docker-compose.yml` file
129129

130130
```yaml
131-
version: "3.4"
131+
version: "3.9"
132132

133133
services:
134134
app:
@@ -138,7 +138,7 @@ Make sure to pass in values for `APP_KEY` variable before you run this setup.
138138
ports:
139139
- 8080:80
140140
environment:
141-
- APP_KEY=
141+
- APP_KEY= # Generate with `echo -n 'base64:'; openssl rand -base64 32`
142142
- DB_HOST=db
143143
- DB_USERNAME=monica
144144
- DB_PASSWORD=secret
@@ -147,7 +147,7 @@ Make sure to pass in values for `APP_KEY` variable before you run this setup.
147147
restart: always
148148

149149
db:
150-
image: mysql:5.7
150+
image: mariadb:11
151151
environment:
152152
- MYSQL_RANDOM_ROOT_PASSWORD=true
153153
- MYSQL_DATABASE=monica
@@ -184,28 +184,28 @@ Make sure to pass in values for `APP_KEY` variable before you run this setup.
184184

185185
When using FPM image, you will need another container with a webserver to proxy http requests. In this example we use nginx with a basic container to do this.
186186

187-
1. Download `nginx.conf` and `Dockerfile` file for nginx image. An example can be found on the [`example section`](https://github.com/monicahq/docker/blob/master/.examples/supervisor/fpm/web/)
187+
1. Download `nginx.conf` and `Dockerfile` file for nginx image. An example can be found on the [`example section`](https://github.com/monicahq/docker/blob/main/.examples/full/fpm/web/)
188188

189189
```sh
190190
mkdir web
191-
curl -sSL https://raw.githubusercontent.com/monicahq/docker/master/.examples/nginx-proxy/web/nginx.conf -o web/nginx.conf
192-
curl -sSL https://raw.githubusercontent.com/monicahq/docker/master/.examples/nginx-proxy/web/Dockerfile -o web/Dockerfile
191+
curl -sSL https://raw.githubusercontent.com/monicahq/docker/main/.examples/full/web/nginx.conf -o web/nginx.conf
192+
curl -sSL https://raw.githubusercontent.com/monicahq/docker/main/.examples/full/web/Dockerfile -o web/Dockerfile
193193
```
194194

195195
The `web` container image should be pre-build before each deploy with: `docker-compose build`.
196196

197197
2. Create a `docker-compose.yml` file
198198

199199
```yaml
200-
version: "3.4"
200+
version: "3.9"
201201

202202
services:
203203
app:
204204
image: monica:fpm
205205
depends_on:
206206
- db
207207
environment:
208-
- APP_KEY=
208+
- APP_KEY= # Generate with `echo -n 'base64:'; openssl rand -base64 32`
209209
- DB_HOST=db
210210
- DB_USERNAME=monica
211211
- DB_PASSWORD=secret
@@ -224,7 +224,7 @@ When using FPM image, you will need another container with a webserver to proxy
224224
restart: always
225225

226226
db:
227-
image: mysql:5.7
227+
image: mariadb:11
228228
environment:
229229
- MYSQL_RANDOM_ROOT_PASSWORD=true
230230
- MYSQL_DATABASE=monica
@@ -267,7 +267,7 @@ One way to expose your Monica instance is to use a proxy webserver from your hos
267267

268268
### Using a proxy webserver container
269269

270-
See some examples of docker-compose possibilities in the [example section](https://github.com/monicahq/docker/blob/master/.examples) to show how to a proxy webserver with ssl capabilities.
270+
See some examples of docker-compose possibilities in the [example section](https://github.com/monicahq/docker/blob/main/.examples) to show how to a proxy webserver with ssl capabilities.
271271

272272
# Image Variants
273273

sl/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ WARNING:
2424

2525
# Supported tags and respective `Dockerfile` links
2626

27-
- [`7`, `latest`](https://github.com/scientificlinux/sl-docker/blob/6774a5c2862153082a4f2271aa6073b5bd823e6b/sl7/Dockerfile)
27+
- [`7`, `latest`](https://github.com/scientificlinux/sl-docker/blob/bf1a75fd29d02465952d829b66a5f9081113555e/sl7/Dockerfile)
2828

2929
# Quick reference (cont.)
3030

0 commit comments

Comments
 (0)