Merge branch 'docker-improvements' into 'master'

chore: update docker environment to debian bookworm and php 8.2

See merge request fronk/thetool!2101
This commit is contained in:
Luca Haid
2026-02-27 09:55:43 +00:00
2 changed files with 8 additions and 6 deletions

View File

@@ -1,5 +1,6 @@
services: services:
php: php:
platform: linux/amd64
build: build:
context: . context: .
dockerfile: ./docker/php/Dockerfile dockerfile: ./docker/php/Dockerfile
@@ -15,7 +16,7 @@ services:
- db - db
db: db:
image: mariadb image: mariadb:10.11
environment: environment:
- MYSQL_ROOT_PASSWORD=junghan5 - MYSQL_ROOT_PASSWORD=junghan5
- MYSQL_DATABASE=thetool - MYSQL_DATABASE=thetool
@@ -44,6 +45,7 @@ services:
- db - db
db-downloader: db-downloader:
platform: linux/amd64
build: build:
context: ./docker/db-downloader context: ./docker/db-downloader
dockerfile: Dockerfile dockerfile: Dockerfile

View File

@@ -1,7 +1,7 @@
# Use Debian 13Trixie” as base image # Use Debian 12Bookworm” as base image
FROM debian:trixie FROM debian:bookworm
# Install ALL native packages from Debian 13 first # Install ALL native packages from Debian 12 first
RUN apt update && \ RUN apt update && \
apt install -y \ apt install -y \
# wkhtmltopdf prerequisites # wkhtmltopdf prerequisites
@@ -9,7 +9,7 @@ RUN apt update && \
\ \
# Apache + PHP + Utils # Apache + PHP + Utils
poppler-utils apache2 curl cron unzip \ poppler-utils apache2 curl cron unzip \
php8.4 php8.4-curl php8.4-cli php8.4-mysqli php8.4-gd php8.4-zip php8.4-dom php8.4-mbstring && \ php8.2 php8.2-curl php8.2-cli php8.2-mysqli php8.2-gd php8.2-zip php8.2-dom php8.2-mbstring && \
\ \
# Install Composer # Install Composer
curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer && \ curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer && \
@@ -30,7 +30,7 @@ RUN wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkh
dpkg --force-all -i wkhtmltox_0.12.6-1.stretch_amd64.deb dpkg --force-all -i wkhtmltox_0.12.6-1.stretch_amd64.deb
# Enable PHP in Apache2 and enable rewrite # Enable PHP in Apache2 and enable rewrite
RUN a2enmod php8.4 \ RUN a2enmod php8.2 \
&& a2enmod rewrite && a2enmod rewrite
# Set working directory and copy composer.json, then run composer install # Set working directory and copy composer.json, then run composer install