Merge pull request #155 from crazy-max/compose-update

examples: generate random password for db root
crazy-max · May 26, 2024 · af02702 · af02702
2 parents f43005b + a622c22
commit af02702
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/examples/compose/compose.yml b/examples/compose/compose.yml
@@ -2,7 +2,7 @@ name: matomo
 
 services:
   db:
-    image: mariadb:10.5
+    image: mariadb:10
     command:
       - "--character-set-server=utf8mb4"
       - "--collation-server=utf8mb4_unicode_ci"
@@ -11,7 +11,7 @@ services:
       - "db:/var/lib/mysql"
     environment:
       - "TZ"
-      - "MYSQL_ALLOW_EMPTY_PASSWORD=yes"
+      - "MARIADB_RANDOM_ROOT_PASSWORD=yes"
       - "MYSQL_DATABASE"
       - "MYSQL_USER"
       - "MYSQL_PASSWORD"

diff --git a/examples/swarm/.env b/examples/swarm/.env
@@ -4,15 +4,14 @@ TZ=Europe/Paris
 
 MATOMO_VERSION=latest
 TRAEFIK_VERSION=2.3
-MARIADB_VERSION=10.2
+MARIADB_VERSION=10
 REDIS_VERSION=4.0-alpine
 GEOIP_UPDATER_VERSION=latest
 MSMTPD_VERSION=latest
 SWARM_CRONJOB_VERSION=latest
 
 TRAEFIK_LOG_LEVEL=INFO
 
-MYSQL_ROOT_PASSWORD=
 MYSQL_DATABASE=matomo
 MYSQL_USER=matomo
 MYSQL_PASSWORD=

diff --git a/examples/swarm/compose.yml b/examples/swarm/compose.yml
@@ -53,7 +53,7 @@ services:
       - "${ROOT_DIR}/db:/var/lib/mysql"
     environment:
       - "TZ"
-      - "MYSQL_ROOT_PASSWORD"
+      - "MARIADB_RANDOM_ROOT_PASSWORD=yes"
       - "MYSQL_DATABASE"
       - "MYSQL_USER"
       - "MYSQL_PASSWORD"

diff --git a/examples/traefik/compose.yml b/examples/traefik/compose.yml
@@ -35,7 +35,7 @@ services:
     restart: always
 
   db:
-    image: mariadb:10.5
+    image: mariadb:10
     command:
       - "--character-set-server=utf8mb4"
       - "--collation-server=utf8mb4_unicode_ci"
@@ -44,7 +44,7 @@ services:
       - "db:/var/lib/mysql"
     environment:
       - "TZ"
-      - "MYSQL_ALLOW_EMPTY_PASSWORD=yes"
+      - "MARIADB_RANDOM_ROOT_PASSWORD=yes"
       - "MYSQL_DATABASE"
       - "MYSQL_USER"
       - "MYSQL_PASSWORD"

diff --git a/test/compose.yml b/test/compose.yml
@@ -2,7 +2,7 @@ name: matomo
 
 services:
   db:
-    image: mariadb:10.5
+    image: mariadb:10
     container_name: matomo_db
     command:
       - "--character-set-server=utf8mb4"
@@ -14,7 +14,7 @@ services:
       - "db:/var/lib/mysql"
     environment:
       - "TZ"
-      - "MYSQL_ALLOW_EMPTY_PASSWORD=yes"
+      - "MARIADB_RANDOM_ROOT_PASSWORD=yes"
       - "MYSQL_DATABASE"
       - "MYSQL_USER"
       - "MYSQL_PASSWORD"