diff --git a/Dockerfile b/Dockerfile index f784d7aa3..95d4a3f95 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,12 +9,13 @@ EXPOSE 80 443 ARG VERSION RUN apk --no-cache --update add \ - tzdata openssl unzip nginx bash ca-certificates s6 curl ssmtp mailx php8 php8-phar php8-curl \ - php8-fpm php8-json php8-zlib php8-xml php8-dom php8-ctype php8-opcache php8-zip php8-iconv \ - php8-pdo php8-pdo_mysql php8-pdo_sqlite php8-pdo_pgsql php8-mbstring php8-session php8-bcmath \ - php8-gd php8-openssl php8-sockets php8-posix php8-ldap php8-simplexml && \ + tzdata openssl unzip nginx bash ca-certificates s6 curl ssmtp mailx php81 php81-phar php81-curl \ + php81-fpm php81-json php81-zlib php81-xml php81-dom php81-ctype php81-opcache php81-zip php81-iconv \ + php81-pdo php81-pdo_mysql php81-pdo_sqlite php81-pdo_pgsql php81-mbstring php81-session php81-bcmath \ + php81-gd php81-openssl php81-sockets php81-posix php81-ldap php81-simplexml && \ rm -rf /var/www/localhost && \ - rm -f /etc/php8/php-fpm.d/www.conf + rm -f /etc/php81/php-fpm.d/www.conf && \ + ln -s /usr/bin/php81 /usr/bin/php ADD . /var/www/app ADD docker/ / diff --git a/docker/etc/php8/conf.d/local.ini b/docker/etc/php81/conf.d/local.ini similarity index 100% rename from docker/etc/php8/conf.d/local.ini rename to docker/etc/php81/conf.d/local.ini diff --git a/docker/etc/php8/php-fpm.conf b/docker/etc/php81/php-fpm.conf similarity index 89% rename from docker/etc/php8/php-fpm.conf rename to docker/etc/php81/php-fpm.conf index 33b0f176a..edc022382 100644 --- a/docker/etc/php8/php-fpm.conf +++ b/docker/etc/php81/php-fpm.conf @@ -16,4 +16,4 @@ pm.start_servers = 1 pm.min_spare_servers = 1 pm.max_spare_servers = 3 pm.max_requests = 2048 -include = /etc/php8/php-fpm.d/env.conf \ No newline at end of file +include = /etc/php81/php-fpm.d/env.conf \ No newline at end of file diff --git a/docker/etc/php8/php-fpm.d/env.conf b/docker/etc/php81/php-fpm.d/env.conf similarity index 100% rename from docker/etc/php8/php-fpm.d/env.conf rename to docker/etc/php81/php-fpm.d/env.conf diff --git a/docker/etc/services.d/php/run b/docker/etc/services.d/php/run index 4a29e084a..171ad5fb0 100755 --- a/docker/etc/services.d/php/run +++ b/docker/etc/services.d/php/run @@ -1,2 +1,2 @@ #!/bin/execlineb -P -php-fpm8 -F \ No newline at end of file +php-fpm81 -F \ No newline at end of file