diff --git a/Dockerfile b/Dockerfile index bab6d467..85d9da12 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ ARG GEOIP2_PHPEXT_VERSION=1.3.1 ARG RUTORRENT_VERSION=e7c81203eff5d43f6f2757ba4b05573d22f11e35 ARG GEOIP2_RUTORRENT_VERSION=4ff2bde530bb8eef13af84e4413cedea97eda148 -ARG ALPINE_VERSION=3.18 +ARG ALPINE_VERSION=3.19 ARG ALPINE_S6_VERSION=${ALPINE_VERSION}-2.2.0.3 FROM --platform=${BUILDPLATFORM} alpine:${ALPINE_VERSION} AS src @@ -92,8 +92,8 @@ RUN apk --update --no-cache add \ openssl-dev \ patch \ pcre-dev \ - php81-dev \ - php81-pear \ + php82-dev \ + php82-pear \ tar \ tree \ xz \ @@ -171,13 +171,13 @@ WORKDIR /usr/local/src/geoip2-phpext COPY --from=src-geoip2-phpext /src . RUN < /etc/php81/php-fpm.d/www.conf + /tpls/etc/php82/php-fpm.d/www.conf > /etc/php82/php-fpm.d/www.conf echo "Setting PHP INI configuration..." -sed -i "s|memory_limit.*|memory_limit = ${MEMORY_LIMIT}|g" /etc/php81/php.ini -sed -i "s|;date\.timezone.*|date\.timezone = ${TZ}|g" /etc/php81/php.ini -sed -i "s|max_file_uploads.*|max_file_uploads = ${MAX_FILE_UPLOADS}|g" /etc/php81/php.ini +sed -i "s|memory_limit.*|memory_limit = ${MEMORY_LIMIT}|g" /etc/php82/php.ini +sed -i "s|;date\.timezone.*|date\.timezone = ${TZ}|g" /etc/php82/php.ini +sed -i "s|max_file_uploads.*|max_file_uploads = ${MAX_FILE_UPLOADS}|g" /etc/php82/php.ini # OpCache echo "Setting OpCache configuration..." sed -e "s/@OPCACHE_MEM_SIZE@/$OPCACHE_MEM_SIZE/g" \ - /tpls/etc/php81/conf.d/opcache.ini > /etc/php81/conf.d/opcache.ini + /tpls/etc/php82/conf.d/opcache.ini > /etc/php82/conf.d/opcache.ini # Nginx echo "Setting Nginx configuration..." diff --git a/rootfs/etc/cont-init.d/04-create-services.sh b/rootfs/etc/cont-init.d/04-create-services.sh index 26ebcc7c..f00c3e0c 100644 --- a/rootfs/etc/cont-init.d/04-create-services.sh +++ b/rootfs/etc/cont-init.d/04-create-services.sh @@ -15,7 +15,7 @@ cat > /etc/services.d/php-fpm/run <