From 3f6081d7095d8ef84d2ec52f088d7841b121e934 Mon Sep 17 00:00:00 2001 From: Christian Elberfeld <6413499+elberfeld@users.noreply.github.com> Date: Sat, 1 Jun 2024 23:36:49 +0200 Subject: [PATCH] autoupgrade bei allen mariadb instanzen --- testserver/docker_hackmd/templates/docker-compose.yml | 1 + testserver/docker_icinga/templates/docker-compose.yml | 1 + testserver/docker_mail/templates/docker-compose.yml | 1 + testserver/docker_uffd/templates/docker-compose.yml | 2 +- testserver/docker_wordpress/templates/docker-compose.yml | 1 + verwaltung/docker_mysql/templates/docker-compose.yml | 1 + webserver/docker_hackmd/templates/docker-compose.yml | 1 + webserver/docker_icinga/templates/docker-compose.yml | 3 ++- webserver/docker_mail/templates/docker-compose.yml | 5 ++--- webserver/docker_uffd/templates/docker-compose.yml | 3 ++- webserver/docker_wordpress/templates/docker-compose.yml | 1 + 11 files changed, 14 insertions(+), 6 deletions(-) diff --git a/testserver/docker_hackmd/templates/docker-compose.yml b/testserver/docker_hackmd/templates/docker-compose.yml index 0c44787d..3eb21555 100644 --- a/testserver/docker_hackmd/templates/docker-compose.yml +++ b/testserver/docker_hackmd/templates/docker-compose.yml @@ -46,6 +46,7 @@ services: MYSQL_PASSWORD: "{{ mysql_user_pass }}" MYSQL_DATABASE: "hackmd" MYSQL_USER: "hackmd" + MARIADB_AUTO_UPGRADE: "1" networks: - default diff --git a/testserver/docker_icinga/templates/docker-compose.yml b/testserver/docker_icinga/templates/docker-compose.yml index 190eefdf..6accf07e 100644 --- a/testserver/docker_icinga/templates/docker-compose.yml +++ b/testserver/docker_icinga/templates/docker-compose.yml @@ -84,6 +84,7 @@ services: MYSQL_PASSWORD: "{{ mysql_user_pass }}" MYSQL_DATABASE: icinga MYSQL_USER: icinga + MARIADB_AUTO_UPGRADE: "1" networks: - default diff --git a/testserver/docker_mail/templates/docker-compose.yml b/testserver/docker_mail/templates/docker-compose.yml index 9ee707e2..38fec493 100644 --- a/testserver/docker_mail/templates/docker-compose.yml +++ b/testserver/docker_mail/templates/docker-compose.yml @@ -151,6 +151,7 @@ services: - MYSQL_USER=mailu - MYSQL_PASSWORD={{ mailu_db_pass }} - MYSQL_ROOT_PASSWORD={{ mysql_root_pass }} + - MARIADB_AUTO_UPGRADE=1 # Optional mailu services: Webmail webmail: diff --git a/testserver/docker_uffd/templates/docker-compose.yml b/testserver/docker_uffd/templates/docker-compose.yml index fd4b853c..27ab8da4 100644 --- a/testserver/docker_uffd/templates/docker-compose.yml +++ b/testserver/docker_uffd/templates/docker-compose.yml @@ -1,6 +1,6 @@ services: db: - image: mariadb:11.2.2 + image: mariadb:11 restart: always command: ['mariadbd', '--character-set-server=utf8mb4', '--collation-server=utf8mb4_nopad_bin'] volumes: diff --git a/testserver/docker_wordpress/templates/docker-compose.yml b/testserver/docker_wordpress/templates/docker-compose.yml index e0c093ac..94f264a3 100644 --- a/testserver/docker_wordpress/templates/docker-compose.yml +++ b/testserver/docker_wordpress/templates/docker-compose.yml @@ -11,6 +11,7 @@ services: MYSQL_PASSWORD: "{{ mysql_user_pass }}" MYSQL_DATABASE: wordpress MYSQL_USER: wordpress + MARIADB_AUTO_UPGRADE: "1" networks: - default diff --git a/verwaltung/docker_mysql/templates/docker-compose.yml b/verwaltung/docker_mysql/templates/docker-compose.yml index 90261a81..ff4d29cc 100644 --- a/verwaltung/docker_mysql/templates/docker-compose.yml +++ b/verwaltung/docker_mysql/templates/docker-compose.yml @@ -15,4 +15,5 @@ services: MYSQL_PASSWORD: "{{ mysql_user_pw }}" MYSQL_DATABASE: dummy MYSQL_USER: vorstand + MARIADB_AUTO_UPGRADE: "1" diff --git a/webserver/docker_hackmd/templates/docker-compose.yml b/webserver/docker_hackmd/templates/docker-compose.yml index d9fe915a..95eebbc5 100644 --- a/webserver/docker_hackmd/templates/docker-compose.yml +++ b/webserver/docker_hackmd/templates/docker-compose.yml @@ -44,6 +44,7 @@ services: MYSQL_PASSWORD: "{{ mysql_user_pass }}" MYSQL_DATABASE: "hackmd" MYSQL_USER: "hackmd" + MARIADB_AUTO_UPGRADE: "1" networks: - default diff --git a/webserver/docker_icinga/templates/docker-compose.yml b/webserver/docker_icinga/templates/docker-compose.yml index f4e0ced2..c6f8aa15 100644 --- a/webserver/docker_icinga/templates/docker-compose.yml +++ b/webserver/docker_icinga/templates/docker-compose.yml @@ -48,7 +48,7 @@ services: db: - image: mariadb:11.2.2 + image: mariadb:11 restart: always ports: - "{{ int_ip4 }}:{{mysql_port}}:3306" @@ -59,6 +59,7 @@ services: MYSQL_PASSWORD: "{{ mysql_user_pass }}" MYSQL_DATABASE: icinga MYSQL_USER: icinga + MARIADB_AUTO_UPGRADE: "1" networks: - default diff --git a/webserver/docker_mail/templates/docker-compose.yml b/webserver/docker_mail/templates/docker-compose.yml index 669042ea..8f128a52 100644 --- a/webserver/docker_mail/templates/docker-compose.yml +++ b/webserver/docker_mail/templates/docker-compose.yml @@ -140,7 +140,7 @@ services: # Optional mailu services: Database db: - image: mariadb:11.2 + image: mariadb:11 command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci restart: always volumes: @@ -151,8 +151,7 @@ services: - MYSQL_USER=mailu - MYSQL_PASSWORD={{ mailu_db_pass }} - MYSQL_ROOT_PASSWORD={{ mysql_root_pass }} - - MARIADB_AUTO_UPGRADE="1" - + - MARIADB_AUTO_UPGRADE=1 # Optional mailu services: Webmail webmail: diff --git a/webserver/docker_uffd/templates/docker-compose.yml b/webserver/docker_uffd/templates/docker-compose.yml index cabfdd80..be7ae812 100644 --- a/webserver/docker_uffd/templates/docker-compose.yml +++ b/webserver/docker_uffd/templates/docker-compose.yml @@ -1,6 +1,6 @@ services: db: - image: mariadb:11.2.2 + image: mariadb:11 restart: always command: ['mariadbd', '--character-set-server=utf8mb4', '--collation-server=utf8mb4_nopad_bin'] volumes: @@ -10,6 +10,7 @@ services: MYSQL_PASSWORD: "{{ mysql_user_pass }}" MYSQL_DATABASE: "uffd" MYSQL_USER: "uffd" + MARIADB_AUTO_UPGRADE: "1" networks: - default app: diff --git a/webserver/docker_wordpress/templates/docker-compose.yml b/webserver/docker_wordpress/templates/docker-compose.yml index e0c093ac..94f264a3 100644 --- a/webserver/docker_wordpress/templates/docker-compose.yml +++ b/webserver/docker_wordpress/templates/docker-compose.yml @@ -11,6 +11,7 @@ services: MYSQL_PASSWORD: "{{ mysql_user_pass }}" MYSQL_DATABASE: wordpress MYSQL_USER: wordpress + MARIADB_AUTO_UPGRADE: "1" networks: - default -- GitLab