Merge branch '2023.11' into 2024.11

tine-groupware · Feb 22, 2024 · acdf8f0 · acdf8f0
2 parents c83e513 + b964355
commit acdf8f0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/docs/operators/docker/docker-compose.yml b/docs/operators/docker/docker-compose.yml
@@ -9,6 +9,7 @@ services:
       MYSQL_DATABASE: &MYSQL_DATABASE tine
       MYSQL_USER: &MYSQL_USER tine
       MYSQL_PASSWORD: &MYSQL_PASSWORD tine
+      MARIADB_AUTO_UPGRADE: 1
     ### use volume for persistent DB
     volumes:
       - "tine_db:/var/lib/mysql"
@@ -37,6 +38,7 @@ services:
       TINE20_CREDENTIALCACHESHAREDKEY: change_me
       TINE20_SETUPUSER_USERNAME: tinesetup
       TINE20_SETUPUSER_PASSWORD: tinesetup
+      # TINE20_LOGGER_PRIORITY: "7"
       ### the url of you tine installation (should be adjusted)
       # TINE20_URL: http://localhost:4000
       ### install+update tine automatically

diff --git a/scripts/ansible/roles/tinedockercompose/templates/docker-compose.yml.j2 b/scripts/ansible/roles/tinedockercompose/templates/docker-compose.yml.j2
@@ -9,6 +9,7 @@ services:
       MYSQL_DATABASE: &MYSQL_DATABASE {{ tinedockercompose_db_name }}
       MYSQL_USER: &MYSQL_USER {{ tinedockercompose_db_user }}
       MYSQL_PASSWORD: &MYSQL_PASSWORD {{ tinedockercompose_db_password }}
+      MARIADB_AUTO_UPGRADE: 1
     ### use volume for persistent DB
     volumes:
       - "{{ tinedockercompose_db_path }}:/var/lib/mysql"