increase php minimal version to 8.1, fixes #3805

Closes #3805

Merge request studip/studip!2814

3 files changed, 32 insertions, 14 deletions

diff --git a/docker/tests/php81/Dockerfile b/docker/tests/php81/Dockerfile
new file mode 100644
index 0000000..7d0478e
--- /dev/null
+++ b/docker/tests/php81/Dockerfile
@@ -0,0 +1,22 @@
+# Setup php, apache and stud.ip
+FROM php:8.1-cli
+
+# Install system requirements
+RUN apt update && apt install -y  --no-install-recommends \
+    default-mysql-client default-libmysqlclient-dev \
+    zlib1g-dev libpng-dev libjpeg-dev libonig-dev libzip-dev libicu-dev \
+    lsb-release \
+    zip \
+    tar \
+    libwebp-dev \
+    && rm -rf /var/lib/apt/lists/*
+
+# Install php extensions
+RUN docker-php-ext-configure gd --with-jpeg=/usr/include/ --with-webp
+RUN docker-php-ext-install -j$(nproc) gd gettext intl mysqli pdo pdo_mysql zip
+
+# Install node/npm
+COPY --from=node:16-slim /usr/local/bin /usr/local/bin
+
+# Install composer
+COPY --from=composer /usr/bin/composer /usr/bin/composer
diff --git a/docker/tests/php82/Dockerfile b/docker/tests/php82/Dockerfile
index 27ffb64..c8abd9d 100644
--- a/docker/tests/php82/Dockerfile
+++ b/docker/tests/php82/Dockerfile
@@ -3,7 +3,8 @@ FROM php:8.2-cli
 
 # Install system requirements
 RUN apt update && apt install -y  --no-install-recommends \
-    default-mysql-client default-libmysqlclient-dev libcurl4-openssl-dev zlib1g-dev libpng-dev libjpeg-dev libonig-dev libzip-dev libicu-dev \
+    default-mysql-client default-libmysqlclient-dev \
+    zlib1g-dev libpng-dev libjpeg-dev libonig-dev libzip-dev libicu-dev \
     lsb-release \
     zip \
     tar \
@@ -12,13 +13,10 @@ RUN apt update && apt install -y  --no-install-recommends \
 
 # Install php extensions
 RUN docker-php-ext-configure gd --with-jpeg=/usr/include/ --with-webp
-RUN docker-php-ext-install -j$(nproc) pdo gettext curl gd mbstring zip pdo pdo_mysql mysqli intl
+RUN docker-php-ext-install -j$(nproc) gd gettext intl mysqli pdo pdo_mysql zip
 
-# Install npm using nvm
-RUN curl -sL https://deb.nodesource.com/setup_16.x | bash -
-RUN apt update && apt install -y --no-install-recommends nodejs \
-        curl apt-transport-https ca-certificates gnupg unzip git \
-    && rm -rf /var/lib/apt/lists/*
+# Install node/npm
+COPY --from=node:16-slim /usr/local/bin /usr/local/bin
 
 # Install composer
 COPY --from=composer /usr/bin/composer /usr/bin/composer
diff --git a/docker/tests/php83/Dockerfile b/docker/tests/php83/Dockerfile
index a25e830..68d1764 100644
--- a/docker/tests/php83/Dockerfile
+++ b/docker/tests/php83/Dockerfile
@@ -3,7 +3,8 @@ FROM php:8.3-cli
 
 # Install system requirements
 RUN apt update && apt install -y  --no-install-recommends \
-    default-mysql-client default-libmysqlclient-dev libcurl4-openssl-dev zlib1g-dev libpng-dev libjpeg-dev libonig-dev libzip-dev libicu-dev \
+    default-mysql-client default-libmysqlclient-dev \
+    zlib1g-dev libpng-dev libjpeg-dev libonig-dev libzip-dev libicu-dev \
     lsb-release \
     zip \
     tar \
@@ -12,13 +13,10 @@ RUN apt update && apt install -y  --no-install-recommends \
 
 # Install php extensions
 RUN docker-php-ext-configure gd --with-jpeg=/usr/include/ --with-webp
-RUN docker-php-ext-install -j$(nproc) pdo gettext curl gd mbstring zip pdo pdo_mysql mysqli intl
+RUN docker-php-ext-install -j$(nproc) gd gettext intl mysqli pdo_mysql zip
 
-# Install npm using nvm
-RUN curl -sL https://deb.nodesource.com/setup_16.x | bash -
-RUN apt update && apt install -y --no-install-recommends nodejs \
-        curl apt-transport-https ca-certificates gnupg unzip git \
-    && rm -rf /var/lib/apt/lists/*
+# Install node/npm
+COPY --from=node:16-slim /usr/local/bin /usr/local/bin
 
 # Install composer
 COPY --from=composer /usr/bin/composer /usr/bin/composer