Skip to content

Commit c06f52e

Browse files
chore: Upgrade to MariaDB 12.1 (#190)
* feat: Migrate docker-compose.prod.yml to MariaDB 12.1 * feat: Update docker-compose.yml to MariaDB 12.1 * Update README.md
1 parent 8dd5244 commit c06f52e

File tree

3 files changed

+21
-21
lines changed

3 files changed

+21
-21
lines changed

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ If plan to build some kind of hosted solution, have a look at `docker-compose.pr
5858

5959
No database integrated. For persistency look at the Compose-File example.
6060

61-
1. `docker run -d --name humhub_db -e MYSQL_ROOT_PASSWORD=root -e MYSQL_DATABASE=humhub mariadb:10.2`
61+
1. `docker run -d --name humhub_db -e MARIADB_ROOT_PASSWORD=root -e MARIADB_DATABASE=humhub mariadb:12.1`
6262
2. `docker run -d --name humhub -p 80:80 --link humhub_db:db mriedmann/humhub:stable`
6363
3. open <http://localhost/> in browser
6464
4. complete the installation wizard (use `db` as database hostname and `humhub` as database name)
@@ -84,12 +84,12 @@ services:
8484
HUMHUB_DB_PASSWORD: humhub
8585

8686
db:
87-
image: mariadb:10.2
87+
image: mariadb:12.1
8888
environment:
89-
MYSQL_ROOT_PASSWORD: root
90-
MYSQL_DATABASE: humhub
91-
MYSQL_USER: humhub
92-
MYSQL_PASSWORD: humhub
89+
MARIADB_ROOT_PASSWORD: root
90+
MARIADB_DATABASE: humhub
91+
MARIADB_USER: humhub
92+
MARIADB_PASSWORD: humhub
9393

9494
volumes:
9595
config: {}

docker-compose.prod.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,16 +63,16 @@ services:
6363
timeout: 10s
6464
retries: 3
6565
db:
66-
image: mariadb:10.4
66+
image: mariadb:12.1
6767
environment:
68-
MYSQL_ROOT_PASSWORD: ${MARIADB_ROOT_PASSWORD}
69-
MYSQL_DATABASE: "humhub"
70-
MYSQL_USER: ${HUMHUB_DB_USER}
71-
MYSQL_PASSWORD: ${HUMHUB_DB_PASSWORD}
68+
MARIADB_ROOT_PASSWORD: ${MARIADB_ROOT_PASSWORD}
69+
MARIADB_DATABASE: "humhub"
70+
MARIADB_USER: ${HUMHUB_DB_USER}
71+
MARIADB_PASSWORD: ${HUMHUB_DB_PASSWORD}
7272
volumes:
73-
- "mysql:/var/lib/mysql"
73+
- "mariadb:/var/lib/mysql"
7474
healthcheck:
75-
test: ["CMD", "mysqladmin", "ping", "--silent"]
75+
test: ["CMD", "mariadb-admin", "ping", "--silent"]
7676
interval: 30s
7777
timeout: 10s
7878
retries: 3
@@ -99,4 +99,4 @@ volumes:
9999
assets: {}
100100
modules: {}
101101
themes: {}
102-
mysql: {}
102+
mariadb: {}

docker-compose.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,14 @@ services:
4949
db:
5050
image: mariadb:10.4
5151
environment:
52-
MYSQL_ROOT_PASSWORD: ${MARIADB_ROOT_PASSWORD}
53-
MYSQL_DATABASE: "humhub"
54-
MYSQL_USER: ${HUMHUB_DB_USER}
55-
MYSQL_PASSWORD: ${HUMHUB_DB_PASSWORD}
52+
MARIADB_ROOT_PASSWORD: ${MARIADB_ROOT_PASSWORD}
53+
MARIADB_DATABASE: "humhub"
54+
MARIADB_USER: ${HUMHUB_DB_USER}
55+
MARIADB_PASSWORD: ${HUMHUB_DB_PASSWORD}
5656
volumes:
57-
- "mysql:/var/lib/mysql"
57+
- "mariadb:/var/lib/mysql"
5858
healthcheck:
59-
test: ["CMD", "mysqladmin", "ping", "--silent"]
59+
test: ["CMD", "mariadb-admin", "ping", "--silent"]
6060
interval: 30s
6161
timeout: 10s
6262
retries: 3
@@ -81,4 +81,4 @@ services:
8181

8282
volumes:
8383
config: {}
84-
mysql: {}
84+
mariadb: {}

0 commit comments

Comments
 (0)