disable ssl for docker image, fixes #5808

Closes #5808

Merge request studip/studip!4476

4 files changed, 5 insertions, 3 deletions

diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
index 6e74c71..61b5734 100644
--- a/docker-compose-dev.yml
+++ b/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 
 services:
   db:
-    image: mariadb:10.4
+    image: mariadb:10.5
     volumes:
       - db_data:/var/lib/mysql
       - ./docker/studip/my.cnf:/etc/mysql/conf.d/my.cnf:ro
@@ -24,6 +24,7 @@ services:
       - db
     volumes:
       - .:/var/www/studip:rw
+      - ./docker/studip/my.cnf:/etc/mysql/conf.d/my.cnf:ro
 
     # Use port to redirect port
     ports:
@@ -48,5 +49,4 @@ services:
       DEMO_DATA: 1
 
 volumes:
-  web_data: {}
   db_data: {}
diff --git a/docker-compose.yml b/docker-compose.yml
index 3ecc7d8..c71864e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,6 +19,7 @@ services:
       - db
     volumes:
       - web_data:/var/www/studip/data
+      - ./docker/studip/my.cnf:/etc/mysql/conf.d/my.cnf:ro
 
     # Use port to redirect port
     ports:
diff --git a/docker/studip/Dockerfile-Dev b/docker/studip/Dockerfile-Dev
index 28e112b..9b59aa9 100644
--- a/docker/studip/Dockerfile-Dev
+++ b/docker/studip/Dockerfile-Dev
@@ -1,5 +1,5 @@
 # Setup php, apache and stud.ip
-FROM php:7.4-apache as base
+FROM php:8.1-apache as base
 
 # Install system requirements
 RUN apt update && apt install -y --no-install-recommends \
diff --git a/docker/studip/my.cnf b/docker/studip/my.cnf
index c5607a4..c3a1693 100644
--- a/docker/studip/my.cnf
+++ b/docker/studip/my.cnf
@@ -1,5 +1,6 @@
 [client]
 default-character-set = utf8mb4
+skip-ssl = true
 
 [mysql]
 default-character-set = utf8mb4