diff options
| author | Jan-Hendrik Willms <tleilax+studip@gmail.com> | 2024-01-05 09:17:55 +0000 |
|---|---|---|
| committer | Jan-Hendrik Willms <tleilax+studip@gmail.com> | 2024-01-05 09:17:55 +0000 |
| commit | 1eb58c143460343ec2a5cda7ef11d8cc39c07529 (patch) | |
| tree | 07337ae554c522ab5cf24b5f14fcf6def30966fc /docker | |
| parent | 4a2977016d1a589c9f05ce0721afc6dd433a9454 (diff) | |
use php 7.4 as minimum version and adjust system accordingly, fixes #3123
Closes #3123
Merge request studip/studip!2110
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/build_images.sh | 6 | ||||
| -rw-r--r-- | docker/tests/php82/Dockerfile (renamed from docker/tests/php72/Dockerfile) | 7 |
2 files changed, 6 insertions, 7 deletions
diff --git a/docker/build_images.sh b/docker/build_images.sh index 1fb09f6..f8feb9f 100644 --- a/docker/build_images.sh +++ b/docker/build_images.sh @@ -9,9 +9,9 @@ build_image () { fi } -build_image tests/php72 studip:tests-php7.2 & -build_image tests/php74 studip:tests & +build_image tests/php82 studip:tests-php8.2 & +build_image tests/php74 studip:tests-php7.4 & build_image release-cli release-cli & wait -echo "Images built"
\ No newline at end of file +echo "Images built" diff --git a/docker/tests/php72/Dockerfile b/docker/tests/php82/Dockerfile index b8b277b..f1a5793 100644 --- a/docker/tests/php72/Dockerfile +++ b/docker/tests/php82/Dockerfile @@ -1,5 +1,5 @@ # Setup php, apache and stud.ip -FROM php:7.2-cli +FROM php:8.2-cli # Install system requirements RUN apt update && apt install -y --no-install-recommends \ @@ -10,9 +10,8 @@ RUN apt update && apt install -y --no-install-recommends \ && rm -rf /var/lib/apt/lists/* # Install php extensions -RUN docker-php-ext-configure gd --with-png-dir=/usr/include/ \ - --with-jpeg-dir=/usr/include/ -RUN docker-php-ext-install pdo gettext curl gd mbstring zip pdo pdo_mysql mysqli intl json +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 # Install npm using nvm RUN curl -sL https://deb.nodesource.com/setup_16.x | bash - |