diff --git a/Dockerfile b/Dockerfile index b95df03..829ecea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,44 +1,42 @@ FROM alpine AS base -ENV PHP_VER="php83" \ - PHPFPM_VER="php-fpm81" \ +ENV PHP_VER="83" \ NODE_OPTIONS=--openssl-legacy-provider RUN apk --no-cache add \ bash \ curl \ nginx \ - ${PHP_VER} \ - ${PHP_VER}-bcmath \ - ${PHP_VER}-common \ - ${PHP_VER}-ctype \ - ${PHP_VER}-dom \ - ${PHP_VER}-fileinfo \ - ${PHP_VER}-fpm \ - ${PHP_VER}-gd \ - ${PHP_VER}-mbstring \ - ${PHP_VER}-pecl-memcached \ - ${PHP_VER}-openssl \ - ${PHP_VER}-pdo \ - ${PHP_VER}-pdo_mysql \ - ${PHP_VER}-phar \ - ${PHP_VER}-posix \ - ${PHP_VER}-json \ - ${PHP_VER}-session \ - ${PHP_VER}-simplexml \ - ${PHP_VER}-sodium \ - ${PHP_VER}-tokenizer \ - ${PHP_VER}-xmlwriter \ - ${PHP_VER}-zip \ - ${PHP_VER}-zlib \ + php${PHP_VER} \ + php${PHP_VER}-bcmath \ + php${PHP_VER}-common \ + php${PHP_VER}-ctype \ + php${PHP_VER}-dom \ + php${PHP_VER}-fileinfo \ + php${PHP_VER}-fpm \ + php${PHP_VER}-gd \ + php${PHP_VER}-mbstring \ + php${PHP_VER}-pecl-memcached \ + php${PHP_VER}-openssl \ + php${PHP_VER}-pdo \ + php${PHP_VER}-pdo_mysql \ + php${PHP_VER}-phar \ + php${PHP_VER}-posix \ + php${PHP_VER}-json \ + php${PHP_VER}-session \ + php${PHP_VER}-simplexml \ + php${PHP_VER}-sodium \ + php${PHP_VER}-tokenizer \ + php${PHP_VER}-xmlwriter \ + php${PHP_VER}-zip \ + php${PHP_VER}-zlib \ shadow && \ mkdir -p \ /app \ /run/nginx \ /run/php-fpm && \ - ln -s /etc/${PHP_VER} /etc/php && \ - # ln -s /usr/bin/${PHP_VER} /usr/bin/php && \ - ln -s /usr/sbin/${PHPFPM_VER} /usr/sbin/php-fpm + ln -s /etc/php${PHP_VER} /etc/php && \ + ln -s /usr/sbin/php-fpm${PHP_VER} /usr/sbin/php-fpm FROM base AS build WORKDIR /app @@ -88,7 +86,7 @@ RUN chmod u+x /usr/local/bin/wait-for-it /etc/s6-overlay/scripts/initializer && rm -rf \ /tmp/* \ /etc/nginx/http.d/default.conf \ - /etc/${PHP_VER}/php-fpm.d/www.conf && \ + /etc/php${PHP_VER}/php-fpm.d/www.conf && \ # Symlink storage and conf file ln -s /config/storage storage && \ ln -s /config/pterodactyl.conf .env diff --git a/root/etc/php81/php-fpm.conf b/root/etc/php83/php-fpm.conf similarity index 100% rename from root/etc/php81/php-fpm.conf rename to root/etc/php83/php-fpm.conf diff --git a/root/etc/php81/php-fpm.d/nginx.conf b/root/etc/php83/php-fpm.d/nginx.conf similarity index 100% rename from root/etc/php81/php-fpm.d/nginx.conf rename to root/etc/php83/php-fpm.d/nginx.conf