5 files changed, 35 insertions, 17 deletions
diff --git a/docker/build_images.sh b/docker/build_images.sh
index c5f32f4..cc03883 100755
--- a/docker/build_images.sh
+++ b/docker/build_images.sh
@@ -11,7 +11,7 @@ build_image () {
 
 build_image tests/php83 studip:tests-php8.3 &
 build_image tests/php82 studip:tests-php8.2 &
-build_image tests/php74 studip:tests-php7.4 &
+build_image tests/php81 studip:tests-php8.1 &
 build_image release-cli release-cli &
 wait
 
diff --git a/docker/studip/Dockerfile b/docker/studip/Dockerfile
index 76fe2d9..0689c3a 100644
--- a/docker/studip/Dockerfile
+++ b/docker/studip/Dockerfile
@@ -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 \
@@ -17,7 +17,7 @@ RUN apt update && apt install -y --no-install-recommends \
 
 # Install php extensions
 RUN docker-php-ext-configure gd --with-jpeg --with-webp
-RUN docker-php-ext-install pdo gettext curl gd mbstring zip pdo pdo_mysql mysqli intl json
+RUN docker-php-ext-install gettext gd zip pdo_mysql mysqli intl
 
 FROM node:16 as nodejs
 
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