From b12a8a58deeecfd7492a492166bed22fed933466 Mon Sep 17 00:00:00 2001 From: Faustin Lammler Date: Sat, 25 Jul 2026 18:24:17 +0200 Subject: [PATCH 1/2] The docker container image is MariaDB not MySQL Using MYSQL_ ENV variables might be confusing since compose file use mariadb container. MariaDB and MySQL are different projects, they have diverged in many aspects and it is possible that ENV variables of the container images will not use both naming in the future (probably a distant one though). Disclamer, I work for the MariaDB Foundation. --- examples/compose/.env | 6 ++--- examples/compose/compose.yml | 30 +++++++++++----------- examples/pwd/librenms.yml | 36 +++++++++++++-------------- examples/rrdcached-server/.env | 6 ++--- examples/rrdcached-server/compose.yml | 30 +++++++++++----------- examples/traefik/.env | 6 ++--- examples/traefik/compose.yml | 30 +++++++++++----------- test/.env | 6 ++--- test/compose.yml | 30 +++++++++++----------- 9 files changed, 90 insertions(+), 90 deletions(-) diff --git a/examples/compose/.env b/examples/compose/.env index d6c0aedd..661b9611 100644 --- a/examples/compose/.env +++ b/examples/compose/.env @@ -2,6 +2,6 @@ TZ=Europe/Paris PUID=1000 PGID=1000 -MYSQL_DATABASE=librenms -MYSQL_USER=librenms -MYSQL_PASSWORD=asupersecretpassword +MARIADB_DATABASE=librenms +MARIADB_USER=librenms +MARIADB_PASSWORD=asupersecretpassword diff --git a/examples/compose/compose.yml b/examples/compose/compose.yml index c090df46..14a73bec 100644 --- a/examples/compose/compose.yml +++ b/examples/compose/compose.yml @@ -15,9 +15,9 @@ services: environment: - "TZ=${TZ}" - "MARIADB_RANDOM_ROOT_PASSWORD=yes" - - "MYSQL_DATABASE=${MYSQL_DATABASE}" - - "MYSQL_USER=${MYSQL_USER}" - - "MYSQL_PASSWORD=${MYSQL_PASSWORD}" + - "MARIADB_DATABASE=${MARIADB_DATABASE}" + - "MARIADB_USER=${MARIADB_USER}" + - "MARIADB_PASSWORD=${MARIADB_PASSWORD}" restart: always redis: @@ -58,9 +58,9 @@ services: - "PUID=${PUID}" - "PGID=${PGID}" - "DB_HOST=db" - - "DB_NAME=${MYSQL_DATABASE}" - - "DB_USER=${MYSQL_USER}" - - "DB_PASSWORD=${MYSQL_PASSWORD}" + - "DB_NAME=${MARIADB_DATABASE}" + - "DB_USER=${MARIADB_USER}" + - "DB_PASSWORD=${MARIADB_PASSWORD}" - "DB_TIMEOUT=60" restart: always @@ -83,9 +83,9 @@ services: - "PUID=${PUID}" - "PGID=${PGID}" - "DB_HOST=db" - - "DB_NAME=${MYSQL_DATABASE}" - - "DB_USER=${MYSQL_USER}" - - "DB_PASSWORD=${MYSQL_PASSWORD}" + - "DB_NAME=${MARIADB_DATABASE}" + - "DB_USER=${MARIADB_USER}" + - "DB_PASSWORD=${MARIADB_PASSWORD}" - "DB_TIMEOUT=60" - "DISPATCHER_NODE_ID=dispatcher1" - "SIDECAR_DISPATCHER=1" @@ -117,9 +117,9 @@ services: - "PUID=${PUID}" - "PGID=${PGID}" - "DB_HOST=db" - - "DB_NAME=${MYSQL_DATABASE}" - - "DB_USER=${MYSQL_USER}" - - "DB_PASSWORD=${MYSQL_PASSWORD}" + - "DB_NAME=${MARIADB_DATABASE}" + - "DB_USER=${MARIADB_USER}" + - "DB_PASSWORD=${MARIADB_PASSWORD}" - "DB_TIMEOUT=60" - "SIDECAR_SYSLOGNG=1" restart: always @@ -150,9 +150,9 @@ services: - "PUID=${PUID}" - "PGID=${PGID}" - "DB_HOST=db" - - "DB_NAME=${MYSQL_DATABASE}" - - "DB_USER=${MYSQL_USER}" - - "DB_PASSWORD=${MYSQL_PASSWORD}" + - "DB_NAME=${MARIADB_DATABASE}" + - "DB_USER=${MARIADB_USER}" + - "DB_PASSWORD=${MARIADB_PASSWORD}" - "DB_TIMEOUT=60" - "SIDECAR_SNMPTRAPD=1" restart: always diff --git a/examples/pwd/librenms.yml b/examples/pwd/librenms.yml index 07abe406..c00f23c3 100644 --- a/examples/pwd/librenms.yml +++ b/examples/pwd/librenms.yml @@ -1,9 +1,9 @@ version: "3.5" x-env-global: &env-global - - &MYSQL_DATABASE "librenms" - - &MYSQL_USER "librenms" - - &MYSQL_PASSWORD "asupersecretpassword" + - &MARIADB_DATABASE "librenms" + - &MARIADB_USER "librenms" + - &MARIADB_PASSWORD "asupersecretpassword" - &TZ "UTC" - &PUID "1000" - &PGID "1000" @@ -37,9 +37,9 @@ services: environment: TZ: *TZ MARIADB_RANDOM_ROOT_PASSWORD: "yes" - MYSQL_DATABASE: *MYSQL_DATABASE - MYSQL_USER: *MYSQL_USER - MYSQL_PASSWORD: *MYSQL_PASSWORD + MARIADB_DATABASE: *MARIADB_DATABASE + MARIADB_USER: *MARIADB_USER + MARIADB_PASSWORD: *MARIADB_PASSWORD restart: always redis: @@ -67,9 +67,9 @@ services: PUID: *PUID PGID: *PGID DB_HOST: "db" - DB_NAME: *MYSQL_DATABASE - DB_USER: *MYSQL_USER - DB_PASSWORD: *MYSQL_PASSWORD + DB_NAME: *MARIADB_DATABASE + DB_USER: *MARIADB_USER + DB_PASSWORD: *MARIADB_PASSWORD DB_TIMEOUT: "60" restart: always @@ -90,9 +90,9 @@ services: PUID: *PUID PGID: *PGID DB_HOST: "db" - DB_NAME: *MYSQL_DATABASE - DB_USER: *MYSQL_USER - DB_PASSWORD: *MYSQL_PASSWORD + DB_NAME: *MARIADB_DATABASE + DB_USER: *MARIADB_USER + DB_PASSWORD: *MARIADB_PASSWORD DB_TIMEOUT: "60" DISPATCHER_NODE_ID: "dispatcher1234" SIDECAR_DISPATCHER: "1" @@ -115,9 +115,9 @@ services: PUID: *PUID PGID: *PGID DB_HOST: "db" - DB_NAME: *MYSQL_DATABASE - DB_USER: *MYSQL_USER - DB_PASSWORD: *MYSQL_PASSWORD + DB_NAME: *MARIADB_DATABASE + DB_USER: *MARIADB_USER + DB_PASSWORD: *MARIADB_PASSWORD DB_TIMEOUT: "60" DISPATCHER_NODE_ID: "dispatcher5678" SIDECAR_DISPATCHER: "1" @@ -140,9 +140,9 @@ services: PUID: *PUID PGID: *PGID DB_HOST: "db" - DB_NAME: *MYSQL_DATABASE - DB_USER: *MYSQL_USER - DB_PASSWORD: *MYSQL_PASSWORD + DB_NAME: *MARIADB_DATABASE + DB_USER: *MARIADB_USER + DB_PASSWORD: *MARIADB_PASSWORD DB_TIMEOUT: "60" SIDECAR_SYSLOGNG: "1" restart: always diff --git a/examples/rrdcached-server/.env b/examples/rrdcached-server/.env index d6c0aedd..661b9611 100644 --- a/examples/rrdcached-server/.env +++ b/examples/rrdcached-server/.env @@ -2,6 +2,6 @@ TZ=Europe/Paris PUID=1000 PGID=1000 -MYSQL_DATABASE=librenms -MYSQL_USER=librenms -MYSQL_PASSWORD=asupersecretpassword +MARIADB_DATABASE=librenms +MARIADB_USER=librenms +MARIADB_PASSWORD=asupersecretpassword diff --git a/examples/rrdcached-server/compose.yml b/examples/rrdcached-server/compose.yml index dc8891a0..508efb3c 100644 --- a/examples/rrdcached-server/compose.yml +++ b/examples/rrdcached-server/compose.yml @@ -15,9 +15,9 @@ services: environment: - "TZ=${TZ}" - "MARIADB_RANDOM_ROOT_PASSWORD=yes" - - "MYSQL_DATABASE=${MYSQL_DATABASE}" - - "MYSQL_USER=${MYSQL_USER}" - - "MYSQL_PASSWORD=${MYSQL_PASSWORD}" + - "MARIADB_DATABASE=${MARIADB_DATABASE}" + - "MARIADB_USER=${MARIADB_USER}" + - "MARIADB_PASSWORD=${MARIADB_PASSWORD}" restart: always redis: @@ -76,9 +76,9 @@ services: - "PUID=${PUID}" - "PGID=${PGID}" - "DB_HOST=db" - - "DB_NAME=${MYSQL_DATABASE}" - - "DB_USER=${MYSQL_USER}" - - "DB_PASSWORD=${MYSQL_PASSWORD}" + - "DB_NAME=${MARIADB_DATABASE}" + - "DB_USER=${MARIADB_USER}" + - "DB_PASSWORD=${MARIADB_PASSWORD}" - "DB_TIMEOUT=60" restart: always @@ -101,9 +101,9 @@ services: - "PUID=${PUID}" - "PGID=${PGID}" - "DB_HOST=db" - - "DB_NAME=${MYSQL_DATABASE}" - - "DB_USER=${MYSQL_USER}" - - "DB_PASSWORD=${MYSQL_PASSWORD}" + - "DB_NAME=${MARIADB_DATABASE}" + - "DB_USER=${MARIADB_USER}" + - "DB_PASSWORD=${MARIADB_PASSWORD}" - "DB_TIMEOUT=60" - "DISPATCHER_NODE_ID=dispatcher1" - "SIDECAR_DISPATCHER=1" @@ -135,9 +135,9 @@ services: - "PUID=${PUID}" - "PGID=${PGID}" - "DB_HOST=db" - - "DB_NAME=${MYSQL_DATABASE}" - - "DB_USER=${MYSQL_USER}" - - "DB_PASSWORD=${MYSQL_PASSWORD}" + - "DB_NAME=${MARIADB_DATABASE}" + - "DB_USER=${MARIADB_USER}" + - "DB_PASSWORD=${MARIADB_PASSWORD}" - "DB_TIMEOUT=60" - "SIDECAR_SYSLOGNG=1" restart: always @@ -168,9 +168,9 @@ services: - "PUID=${PUID}" - "PGID=${PGID}" - "DB_HOST=db" - - "DB_NAME=${MYSQL_DATABASE}" - - "DB_USER=${MYSQL_USER}" - - "DB_PASSWORD=${MYSQL_PASSWORD}" + - "DB_NAME=${MARIADB_DATABASE}" + - "DB_USER=${MARIADB_USER}" + - "DB_PASSWORD=${MARIADB_PASSWORD}" - "DB_TIMEOUT=60" - "SIDECAR_SNMPTRAPD=1" restart: always diff --git a/examples/traefik/.env b/examples/traefik/.env index d6c0aedd..661b9611 100644 --- a/examples/traefik/.env +++ b/examples/traefik/.env @@ -2,6 +2,6 @@ TZ=Europe/Paris PUID=1000 PGID=1000 -MYSQL_DATABASE=librenms -MYSQL_USER=librenms -MYSQL_PASSWORD=asupersecretpassword +MARIADB_DATABASE=librenms +MARIADB_USER=librenms +MARIADB_PASSWORD=asupersecretpassword diff --git a/examples/traefik/compose.yml b/examples/traefik/compose.yml index 3b3a4fc8..e5c15e77 100644 --- a/examples/traefik/compose.yml +++ b/examples/traefik/compose.yml @@ -49,9 +49,9 @@ services: environment: - "TZ=${TZ}" - "MARIADB_RANDOM_ROOT_PASSWORD=yes" - - "MYSQL_DATABASE=${MYSQL_DATABASE}" - - "MYSQL_USER=${MYSQL_USER}" - - "MYSQL_PASSWORD=${MYSQL_PASSWORD}" + - "MARIADB_DATABASE=${MARIADB_DATABASE}" + - "MARIADB_USER=${MARIADB_USER}" + - "MARIADB_PASSWORD=${MARIADB_PASSWORD}" restart: always redis: @@ -93,9 +93,9 @@ services: - "PUID=${PUID}" - "PGID=${PGID}" - "DB_HOST=db" - - "DB_NAME=${MYSQL_DATABASE}" - - "DB_USER=${MYSQL_USER}" - - "DB_PASSWORD=${MYSQL_PASSWORD}" + - "DB_NAME=${MARIADB_DATABASE}" + - "DB_USER=${MARIADB_USER}" + - "DB_PASSWORD=${MARIADB_PASSWORD}" - "DB_TIMEOUT=60" restart: always @@ -115,9 +115,9 @@ services: - "PUID=${PUID}" - "PGID=${PGID}" - "DB_HOST=db" - - "DB_NAME=${MYSQL_DATABASE}" - - "DB_USER=${MYSQL_USER}" - - "DB_PASSWORD=${MYSQL_PASSWORD}" + - "DB_NAME=${MARIADB_DATABASE}" + - "DB_USER=${MARIADB_USER}" + - "DB_PASSWORD=${MARIADB_PASSWORD}" - "DB_TIMEOUT=60" - "DISPATCHER_NODE_ID=dispatcher1" - "SIDECAR_DISPATCHER=1" @@ -146,9 +146,9 @@ services: - "PUID=${PUID}" - "PGID=${PGID}" - "DB_HOST=db" - - "DB_NAME=${MYSQL_DATABASE}" - - "DB_USER=${MYSQL_USER}" - - "DB_PASSWORD=${MYSQL_PASSWORD}" + - "DB_NAME=${MARIADB_DATABASE}" + - "DB_USER=${MARIADB_USER}" + - "DB_PASSWORD=${MARIADB_PASSWORD}" - "DB_TIMEOUT=60" - "SIDECAR_SYSLOGNG=1" restart: always @@ -176,9 +176,9 @@ services: - "PUID=${PUID}" - "PGID=${PGID}" - "DB_HOST=db" - - "DB_NAME=${MYSQL_DATABASE}" - - "DB_USER=${MYSQL_USER}" - - "DB_PASSWORD=${MYSQL_PASSWORD}" + - "DB_NAME=${MARIADB_DATABASE}" + - "DB_USER=${MARIADB_USER}" + - "DB_PASSWORD=${MARIADB_PASSWORD}" - "DB_TIMEOUT=60" - "SIDECAR_SNMPTRAPD=1" restart: always diff --git a/test/.env b/test/.env index d6c0aedd..661b9611 100644 --- a/test/.env +++ b/test/.env @@ -2,6 +2,6 @@ TZ=Europe/Paris PUID=1000 PGID=1000 -MYSQL_DATABASE=librenms -MYSQL_USER=librenms -MYSQL_PASSWORD=asupersecretpassword +MARIADB_DATABASE=librenms +MARIADB_USER=librenms +MARIADB_PASSWORD=asupersecretpassword diff --git a/test/compose.yml b/test/compose.yml index c63305f2..bffee6fe 100644 --- a/test/compose.yml +++ b/test/compose.yml @@ -15,9 +15,9 @@ services: environment: - "TZ=${TZ}" - "MARIADB_RANDOM_ROOT_PASSWORD=yes" - - "MYSQL_DATABASE=${MYSQL_DATABASE}" - - "MYSQL_USER=${MYSQL_USER}" - - "MYSQL_PASSWORD=${MYSQL_PASSWORD}" + - "MARIADB_DATABASE=${MARIADB_DATABASE}" + - "MARIADB_USER=${MARIADB_USER}" + - "MARIADB_PASSWORD=${MARIADB_PASSWORD}" restart: always redis: @@ -50,9 +50,9 @@ services: - "PUID=${PUID}" - "PGID=${PGID}" - "DB_HOST=db" - - "DB_NAME=${MYSQL_DATABASE}" - - "DB_USER=${MYSQL_USER}" - - "DB_PASSWORD=${MYSQL_PASSWORD}" + - "DB_NAME=${MARIADB_DATABASE}" + - "DB_USER=${MARIADB_USER}" + - "DB_PASSWORD=${MARIADB_PASSWORD}" - "DB_TIMEOUT=60" restart: always @@ -75,9 +75,9 @@ services: - "PUID=${PUID}" - "PGID=${PGID}" - "DB_HOST=db" - - "DB_NAME=${MYSQL_DATABASE}" - - "DB_USER=${MYSQL_USER}" - - "DB_PASSWORD=${MYSQL_PASSWORD}" + - "DB_NAME=${MARIADB_DATABASE}" + - "DB_USER=${MARIADB_USER}" + - "DB_PASSWORD=${MARIADB_PASSWORD}" - "DB_TIMEOUT=60" - "DISPATCHER_NODE_ID=dispatcher1" - "SIDECAR_DISPATCHER=1" @@ -109,9 +109,9 @@ services: - "PUID=${PUID}" - "PGID=${PGID}" - "DB_HOST=db" - - "DB_NAME=${MYSQL_DATABASE}" - - "DB_USER=${MYSQL_USER}" - - "DB_PASSWORD=${MYSQL_PASSWORD}" + - "DB_NAME=${MARIADB_DATABASE}" + - "DB_USER=${MARIADB_USER}" + - "DB_PASSWORD=${MARIADB_PASSWORD}" - "DB_TIMEOUT=60" - "SIDECAR_SYSLOGNG=1" restart: always @@ -142,9 +142,9 @@ services: - "PUID=${PUID}" - "PGID=${PGID}" - "DB_HOST=db" - - "DB_NAME=${MYSQL_DATABASE}" - - "DB_USER=${MYSQL_USER}" - - "DB_PASSWORD=${MYSQL_PASSWORD}" + - "DB_NAME=${MARIADB_DATABASE}" + - "DB_USER=${MARIADB_USER}" + - "DB_PASSWORD=${MARIADB_PASSWORD}" - "DB_TIMEOUT=60" - "SIDECAR_SNMPTRAPD=1" restart: always From a1366b321bed38d4a771ccb90fd64096423004b3 Mon Sep 17 00:00:00 2001 From: Faustin Lammler Date: Sat, 25 Jul 2026 18:30:51 +0200 Subject: [PATCH 2/2] mysqld is a symlink to mariadbd ATM `mariadb:10` is MariaDB 10.11 and mysqld is a symlink to mariadbd. --- examples/compose/compose.yml | 2 +- examples/pwd/librenms.yml | 2 +- examples/rrdcached-server/compose.yml | 2 +- examples/traefik/compose.yml | 2 +- test/compose.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/compose/compose.yml b/examples/compose/compose.yml index 14a73bec..566cc493 100644 --- a/examples/compose/compose.yml +++ b/examples/compose/compose.yml @@ -5,7 +5,7 @@ services: image: mariadb:10 container_name: librenms_db command: - - "mysqld" + - "mariadbd" - "--innodb-file-per-table=1" - "--lower-case-table-names=0" - "--character-set-server=utf8mb4" diff --git a/examples/pwd/librenms.yml b/examples/pwd/librenms.yml index c00f23c3..a2374af2 100644 --- a/examples/pwd/librenms.yml +++ b/examples/pwd/librenms.yml @@ -27,7 +27,7 @@ services: db: image: mariadb:10.11 command: - - "mysqld" + - "mariadbd" - "--innodb-file-per-table=1" - "--lower-case-table-names=0" - "--character-set-server=utf8mb4" diff --git a/examples/rrdcached-server/compose.yml b/examples/rrdcached-server/compose.yml index 508efb3c..e327164f 100644 --- a/examples/rrdcached-server/compose.yml +++ b/examples/rrdcached-server/compose.yml @@ -5,7 +5,7 @@ services: image: mariadb:10 container_name: librenms_db command: - - "mysqld" + - "mariadbd" - "--innodb-file-per-table=1" - "--lower-case-table-names=0" - "--character-set-server=utf8mb4" diff --git a/examples/traefik/compose.yml b/examples/traefik/compose.yml index e5c15e77..c30bf41f 100644 --- a/examples/traefik/compose.yml +++ b/examples/traefik/compose.yml @@ -39,7 +39,7 @@ services: image: mariadb:10 container_name: librenms_db command: - - "mysqld" + - "mariadbd" - "--innodb-file-per-table=1" - "--lower-case-table-names=0" - "--character-set-server=utf8mb4" diff --git a/test/compose.yml b/test/compose.yml index bffee6fe..30908168 100644 --- a/test/compose.yml +++ b/test/compose.yml @@ -5,7 +5,7 @@ services: image: mariadb:10 container_name: librenms_db command: - - "mysqld" + - "mariadbd" - "--innodb-file-per-table=1" - "--lower-case-table-names=0" - "--character-set-server=utf8mb4"