diff options
| author | Jan-Hendrik Willms <tleilax+studip@gmail.com> | 2025-04-02 16:54:30 +0000 |
|---|---|---|
| committer | Jan-Hendrik Willms <tleilax+studip@gmail.com> | 2025-04-02 16:54:30 +0000 |
| commit | 78431c8837ee065897e043590f7b814ca79ff6c0 (patch) | |
| tree | a5ddfe98db711a46fcc552417c1cb0f6969a41c0 | |
| parent | df61e200d72e0fc3cf4ad1313fb4e9fe1c0432e0 (diff) | |
update mariadb in docker file and prevent warnings, fixes #5443
Closes #5443
Merge request studip/studip!4091
| -rw-r--r-- | docker-compose.yml | 5 | ||||
| -rw-r--r-- | docker/studip/Dockerfile | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index 8a2f010..3ecc7d8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,6 @@ -version: "3" 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 @@ -32,7 +31,7 @@ services: MYSQL_PASSWORD: studip_password MYSQL_HOST: db STUDIP_MAIL_TRANSPORT: debug - STUDIP_NAME: ${STUDIP_NAME} + STUDIP_NAME: ${STUDIP_NAME:-Stud.IP Testsystem} # Use automigrate to migrate your instance on startup AUTO_MIGRATE: 1 diff --git a/docker/studip/Dockerfile b/docker/studip/Dockerfile index daa52e6..1a40408 100644 --- a/docker/studip/Dockerfile +++ b/docker/studip/Dockerfile @@ -1,5 +1,5 @@ # Setup php, apache and stud.ip -FROM php:8.1-apache as base +FROM php:8.1-apache AS base # Install system requirements RUN apt update && apt install -y --no-install-recommends \ @@ -26,14 +26,14 @@ RUN sed -i -e 's/# en_GB.UTF-8 UTF-8/en_GB.UTF-8 UTF-8/' /etc/locale.gen \ RUN docker-php-ext-configure gd --with-jpeg --with-webp RUN docker-php-ext-install gettext gd zip pdo_mysql mysqli intl -FROM node:18 as nodejs +FROM node:18 AS nodejs # Install node modules COPY . /studip WORKDIR /studip RUN make webpack-prod -FROM base as build +FROM base AS build # Install composer COPY --from=composer /usr/bin/composer /usr/bin/composer |