Merge branch 'main' into issue-3911issue-3911

4 files changed, 61 insertions, 8 deletions

diff --git a/docker/tests/php74/Dockerfile b/docker/tests/php74/Dockerfile
index 49149a9..17d404a 100644
--- a/docker/tests/php74/Dockerfile
+++ b/docker/tests/php74/Dockerfile
@@ -7,14 +7,15 @@ RUN apt update && apt install -y  --no-install-recommends \
     lsb-release \
     zip \
     tar \
+    libwebp-dev \
     && rm -rf /var/lib/apt/lists/*
 
 # Install php extensions
-RUN docker-php-ext-configure gd --with-jpeg
+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
 
-# Install npm using nvm
-RUN curl -sL https://deb.nodesource.com/setup_16.x | bash -
+# Install node
+RUN curl -sL https://deb.nodesource.com/setup_18.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/*
diff --git a/docker/tests/php81/Dockerfile b/docker/tests/php81/Dockerfile
new file mode 100644
index 0000000..bcd805a
--- /dev/null
+++ b/docker/tests/php81/Dockerfile
@@ -0,0 +1,25 @@
+# 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
+RUN curl -sL https://deb.nodesource.com/setup_18.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 composer
+COPY --from=composer /usr/bin/composer /usr/bin/composer
diff --git a/docker/tests/php82/Dockerfile b/docker/tests/php82/Dockerfile
index f1a5793..7f18e4e 100644
--- a/docker/tests/php82/Dockerfile
+++ b/docker/tests/php82/Dockerfile
@@ -3,18 +3,20 @@ 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 \
+    libwebp-dev \
     && rm -rf /var/lib/apt/lists/*
 
 # Install php extensions
-RUN docker-php-ext-configure gd --with-jpeg=/usr/include/
-RUN docker-php-ext-install -j$(nproc) pdo gettext curl gd mbstring zip pdo pdo_mysql mysqli intl
+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 npm using nvm
-RUN curl -sL https://deb.nodesource.com/setup_16.x | bash -
+# Install node/npm
+RUN curl -sL https://deb.nodesource.com/setup_18.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/*
diff --git a/docker/tests/php83/Dockerfile b/docker/tests/php83/Dockerfile
new file mode 100644
index 0000000..54bb541
--- /dev/null
+++ b/docker/tests/php83/Dockerfile
@@ -0,0 +1,25 @@
+# Setup php, apache and stud.ip
+FROM php:8.3-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_mysql zip
+
+# Install node/npm
+RUN curl -sL https://deb.nodesource.com/setup_18.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 composer
+COPY --from=composer /usr/bin/composer /usr/bin/composer