Merge branch '134-upgrade-django' into 133-upgrade-bootstrap

Author: Mihai98924

.github/workflows/build_docker_image.yml

@@ -19,10 +19,10 @@ jobs:
         env:
           MARIADB_USER: alexia_test
           MARIADB_PASSWORD: alexia_test
-          MYSQL_DATABASE: alexia_test
-          MYSQL_ROOT_PASSWORD: alexia_test
+          MARIADB_DATABASE: alexia_test
+          MARIADB_ROOT_PASSWORD: alexia_test
         ports: ['3306:3306']
-        options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
+        options: --health-cmd="mariadb-admin ping" --health-interval=5s --health-timeout=2s --health-retries=3
 
     steps:
       - name: Checkout repository

docker-compose.yml

@@ -29,20 +29,20 @@ services:
   nginx:
     image: nginx:latest
   db:
-    image: mysql:9
+    image: mariadb:10.11
     environment:
-      - MYSQL_DATABASE=alexia
-      - MYSQL_USER=alexia
-      - MYSQL_PASSWORD=alexia
-      - MYSQL_RANDOM_ROOT_PASSWORD=yes
+      - MARIADB_DATABASE=alexia
+      - MARIADB_USER=alexia
+      - MARIADB_PASSWORD=alexia
+      - MARIADB_RANDOM_ROOT_PASSWORD=yes
     healthcheck:
-      test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
+      test: ["CMD", "mariadb-admin", "ping", "-h", "localhost"]
       interval: 5s
       timeout: 5s
       retries: 10
     volumes:
       - db_data:/var/lib/mysql
-      - ./docker/mysql-init:/docker-entrypoint-initdb.d:ro
+      - ./docker/mariadb-init:/docker-entrypoint-initdb.d:ro
 volumes:
   db_data:
   app_venv:

docker/mysql-init/01-grant-test-db.sql docker/mariadb-init/01-grant-test-db.sqldocker/mysql-init/01-grant-test-db.sql renamed to docker/mariadb-init/01-grant-test-db.sql

@@ -1,4 +1,4 @@
--- The official mysql image only grants MYSQL_USER privileges on MYSQL_DATABASE.
+-- The official mariadb image only grants MARIADB_USER privileges on MARIADB_DATABASE.
 -- Django's test runner needs to create/drop a separate test database, so grant that too.
 GRANT ALL PRIVILEGES ON `alexia_test`.* TO 'alexia'@'%';
 FLUSH PRIVILEGES;