Merge pull request #128 from FREVA-CLINT/add-mysql-version

Add mysql version

Author: antarcticrainforest

assets/share/freva/deployment/playbooks/db-server-compose-template.yml

@@ -2,7 +2,7 @@ version: '3'
 services:
   {{db_name}}:
     user: {{uid}}:{{gid}}
-    image: mariadb:latest
+    image: mariadb:{{db_version}}
     hostname: {{db_name}}
 {% if debug %}
     network_mode: host
@@ -28,6 +28,7 @@ services:
     tty: true
     ports:
       - {{db_port}}:3306
+    command: mariadbd-safe --skip-grant-tables
   {{vault_name}}:
     user: {{uid}}:{{gid}}
     image: ghcr.io/freva-clint/freva-vault:{{vault_version}}

assets/share/freva/deployment/playbooks/db-server-playbook.yml

@@ -24,7 +24,7 @@
         -v '{{db_data_path|regex_replace("^~", ansible_env.HOME)}}/freva-service-config/mysql/daily_backup.sh:/usr/local/bin/daily_backup:z'
         --rm
         --name {{db_name}}
-        -t docker.io/mariadb:latest
+        -t docker.io/mariadb:{{ db_version }}
     skip_tables_cmd: >
         --network {{ project_name }} -v
         '{{db_data_path|regex_replace("^~", ansible_env.HOME)}}/{{project_name}}/db_service:/var/lib/mysql:z'
@@ -36,7 +36,7 @@
         -v '{{db_data_path|regex_replace("^~", ansible_env.HOME)}}/freva-service-config/mysql/create_tables.sql:/docker-entrypoint-initdb.d/002_create_tables.sql:z'
         -v '{{db_data_path|regex_replace("^~", ansible_env.HOME)}}/freva-service-config/mysql/daily_backup.sh:/usr/local/bin/daily_backup:z'
         -v /tmp/reset_root_pw.sh:/tmp/reset_root_pw.sh:z
-        -t docker.io/mariadb:latest mariadbd-safe --skip-grant-tables
+        -t docker.io/mariadb:{{ db_version }} mariadbd-safe --skip-grant-tables
     continer_name: "{{ db_name }}"
     vault_name: "{{project_name}}-vault"
   tasks:
@@ -98,7 +98,7 @@
     - name: Pulling container
       shell: /tmp/docker-or-podman pull {{item}}
       with_items:
-        - "docker.io/mariadb:latest"
+        - "docker.io/mariadb:{{db_version}}"
         - "ghcr.io/freva-clint/freva-vault:{{vault_version}}"
     - name: Creating docker network
       shell: >
@@ -149,13 +149,13 @@
         owner: "{{uid}}"
         group: "{{gid}}"
     - name: Preparing the root password reset I
-      shell: /tmp/docker-or-podman run --user {{uid}}:{{gid}} -d {{docker_cmd}}
+      shell: /tmp/docker-or-podman run -d {{docker_cmd}}
     - pause: seconds=5
     - name: Preparing the root password reset II
       shell: /tmp/docker-or-podman rm -f {{db_name}}
     - name: Resetting the root password
       shell: |
-        /tmp/docker-or-podman run --user {{uid}}:{{gid}} -d {{skip_tables_cmd}}
+        /tmp/docker-or-podman run -d {{skip_tables_cmd}}
         sleep 5
         /tmp/docker-or-podman exec {{db_name}} bash /tmp/reset_root_pw.sh
         /tmp/docker-or-podman exec {{db_name}} /bin/sh -c 'mariadb -u root {{db}} < /docker-entrypoint-initdb.d/002_create_tables.sql'

docs/whatsnew.rst

@@ -7,6 +7,10 @@ What's new
    :maxdepth: 0
    :titlesonly:
 
+v2406.0.1
+~~~~~~~~~
+* Keep track of mariadb version
+
 v2406.0.0
 ~~~~~~~~~
 * Add info panel (access via CTRL+f) for further information on config items.

src/freva_deployment/__init__.py

@@ -1,7 +1,7 @@
 import argparse
 from urllib.request import urlretrieve
 
-__version__ = "2406.0.0"
+__version__ = "2406.0.1"
 
 FREVA_PYTHON_VERSION = "3.11"
 AVAILABLE_PYTHON_VERSIONS = ["3.8", "3.9", "3.10", "3.11", "3.12"]

src/freva_deployment/versions.json

@@ -2,6 +2,7 @@
    "vault": "2405.1.0",
    "freva_rest": "2403.0.3",
    "solr": "9.6.0",
-   "core": "2406.0.0",
-   "web": "2405.0.1"
+   "core": "2406.0.1",
+   "web": "2405.0.0",
+   "db": "11.1"
 }