Merge branch 'master' of gitlab.com:allianceauth/allianceauth into v5.x

docker/.env.example

@@ -1,7 +1,7 @@
 PROTOCOL=https://
 AUTH_SUBDOMAIN=%AUTH_SUBDOMAIN%
 DOMAIN=%DOMAIN%
-AA_DOCKER_TAG=registry.gitlab.com/allianceauth/allianceauth/auth:v4.3.1
+AA_DOCKER_TAG=registry.gitlab.com/allianceauth/allianceauth/auth:v4.6.4
 
 # Nginx Proxy Manager
 PROXY_HTTP_PORT=80

docker/Dockerfile

@@ -1,5 +1,5 @@
 FROM python:3.12-slim
-ARG AUTH_VERSION=v4.3.1
+ARG AUTH_VERSION=v4.6.4
 ARG AUTH_PACKAGE=allianceauth==${AUTH_VERSION}
 ENV AUTH_USER=allianceauth
 ENV AUTH_GROUP=allianceauth

docker/conf/aa_mariadb.cnf

@@ -0,0 +1,6 @@
+[mariadb]
+# Provided as an Example
+# AA Doesnt use Aria or MyISAM, So these are worth Considering
+
+# aria_pagecache_buffer_size = 16M
+# key_buffer_size = 16M

docker/docker-compose.yml

@@ -43,6 +43,7 @@ services:
     volumes:
       - ./mysql-data:/var/lib/mysql
       - ./setup.sql:/docker-entrypoint-initdb.d/setup.sql
+      - ./conf/aa_mariadb.cnf:/etc/mysql/conf.d/aa_mariadb.cnf
     environment:
       - MYSQL_ROOT_PASSWORD=${AA_DB_ROOT_PASSWORD?err}
       - MARIADB_MYSQL_LOCALHOST_USER=1
@@ -77,7 +78,7 @@ services:
       - "redis-data:/data"
       - ./conf/redis_healthcheck.sh:/usr/local/bin/redis_healthcheck.sh
     healthcheck:
-      test: ["CMD", "bash", "/usr/local/bin/redis_healthcheck.sh"]
+      test: ["CMD", "/usr/local/bin/redis_healthcheck.sh"]
     logging:
       driver: "json-file"
       options:

docker/scripts/download.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
 git clone https://gitlab.com/allianceauth/allianceauth.git aa-git
 cp -R aa-git/docker ./aa-docker
+chmod +x aa-docker/conf/memory_check.sh
+chmod +x aa-docker/conf/redis_healthcheck.sh
 rm -rf aa-git

docker/setup.base.sql

@@ -1,6 +1,6 @@
 CREATE USER 'aauth'@'%' IDENTIFIED BY 'authpass';
 CREATE USER 'grafana'@'%' IDENTIFIED BY 'grafanapass';
-CREATE DATABASE alliance_auth CHARACTER SET utf8mb4;
+CREATE DATABASE alliance_auth CHARACTER SET utf8mb4 DEFAULT COLLATE utf8mb4_unicode_ci;
 GRANT ALL PRIVILEGES ON alliance_auth.* TO 'aauth'@'%';
 GRANT
 SELECT,