diff --git a/src/Dockerfile b/src/Dockerfile index 6ffe00d..90431ac 100644 --- a/src/Dockerfile +++ b/src/Dockerfile @@ -5,14 +5,17 @@ ARG GLPI_VERSION RUN \ mkdir -p /logs /config /files /marketplace && \ apk -U upgrade && \ - apk add --no-cache curl nginx php84 php84-bz2 php84-ctype php84-curl php84-dom php84-exif \ - php84-fileinfo php84-fpm php84-gd php84-iconv php84-intl php84-ldap php84-mysqli \ - php84-opcache php84-openssl php84-pecl-apcu php84-pecl-redis php84-phar php84-session \ - php84-simplexml php84-sodium php84-tokenizer php84-xml php84-zip php84-xmlreader php84-xmlwriter && \ + apk add --no-cache curl nginx php83 php83-bz2 php83-ctype php83-curl php83-dom php83-exif \ + php83-fileinfo php83-fpm php83-gd php83-iconv php83-intl php83-ldap php83-mysqli \ + php83-opcache php83-openssl php83-pecl-apcu php83-pecl-redis php83-phar php83-session \ + php83-simplexml php83-sodium php83-tokenizer php83-xml php83-zip php83-xmlreader php83-xmlwriter && \ wget -O /usr/local/bin/composer https://getcomposer.org/download/2.5.8/composer.phar && \ chmod +x /usr/local/bin/composer && \ wget -O - https://github.com/glpi-project/glpi/releases/download/${GLPI_VERSION}/glpi-${GLPI_VERSION}.tgz | tar xz -C /var/www +# GLPI 10.x will work only with PHP up to 8.3. +# do not trust README.md from glpi github (it says it works with 8.4, but it dies if >=8.4.0) + # this are needed if you want to manually install GLPI from git # RUN \ # apk add patch npm gettext diff --git a/src/rootfs/etc/php84/conf.d/php.ini b/src/rootfs/etc/php83/conf.d/php.ini similarity index 100% rename from src/rootfs/etc/php84/conf.d/php.ini rename to src/rootfs/etc/php83/conf.d/php.ini diff --git a/src/rootfs/etc/php84/php-fpm.d/www.conf b/src/rootfs/etc/php83/php-fpm.d/www.conf similarity index 100% rename from src/rootfs/etc/php84/php-fpm.d/www.conf rename to src/rootfs/etc/php83/php-fpm.d/www.conf