aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
Diffstat (limited to 'docker')
-rwxr-xr-x[-rw-r--r--]docker/build_images.sh1
-rw-r--r--docker/tests/php74/Dockerfile3
-rw-r--r--docker/tests/php82/Dockerfile3
-rw-r--r--docker/tests/php83/Dockerfile24
4 files changed, 29 insertions, 2 deletions
diff --git a/docker/build_images.sh b/docker/build_images.sh
index f8feb9f..c5f32f4 100644..100755
--- a/docker/build_images.sh
+++ b/docker/build_images.sh
@@ -9,6 +9,7 @@ build_image () {
fi
}
+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 release-cli release-cli &
diff --git a/docker/tests/php74/Dockerfile b/docker/tests/php74/Dockerfile
index 49149a9..b982414 100644
--- a/docker/tests/php74/Dockerfile
+++ b/docker/tests/php74/Dockerfile
@@ -7,10 +7,11 @@ 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
diff --git a/docker/tests/php82/Dockerfile b/docker/tests/php82/Dockerfile
index f1a5793..27ffb64 100644
--- a/docker/tests/php82/Dockerfile
+++ b/docker/tests/php82/Dockerfile
@@ -7,10 +7,11 @@ 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=/usr/include/
+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
# Install npm using nvm
diff --git a/docker/tests/php83/Dockerfile b/docker/tests/php83/Dockerfile
new file mode 100644
index 0000000..a25e830
--- /dev/null
+++ b/docker/tests/php83/Dockerfile
@@ -0,0 +1,24 @@
+# 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 libcurl4-openssl-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) pdo gettext curl gd mbstring zip pdo pdo_mysql mysqli intl
+
+# 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 composer
+COPY --from=composer /usr/bin/composer /usr/bin/composer