From fe7b5e0909b661c7382d9bf48f29a5b945d5464c Mon Sep 17 00:00:00 2001 From: Matt Burchett Date: Sat, 21 Jan 2023 04:03:15 +0000 Subject: [PATCH] docker: bump to alpine 3.17.1 and update scripts for compatibility with php81 --- docker/Dockerfile | 4 ++-- docker/entrypoint.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) mode change 100644 => 100755 docker/entrypoint.sh diff --git a/docker/Dockerfile b/docker/Dockerfile index 67db36b..7c6fd51 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17.1 -RUN apk add --no-cache gettext curl nginx php8 php8-fpm php8-opcache php8-pdo php8-pdo_sqlite php8-openssl && \ +RUN apk add --no-cache gettext curl nginx php81 php81-fpm php81-opcache php81-pdo php81-pdo_sqlite php81-openssl && \ mkdir /var/www/html COPY . /var/www/html @@ -8,7 +8,7 @@ COPY . /var/www/html RUN chmod -R 775 /var/www/html && \ chown -R nginx:nginx /var/www/html -COPY docker/php-fpm.conf /etc/php8/php-fpm.conf +COPY docker/php-fpm.conf /etc/php81/php-fpm.conf COPY docker/nginx.conf /etc/nginx/nginx.conf COPY docker/entrypoint.sh /entrypoint.sh diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh old mode 100644 new mode 100755 index 8e6a29b..467581b --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -28,7 +28,7 @@ rm -rf /var/www/html/docker # Start php-fpm and nginx chown -R nginx: /var/www/html/data/ touch /var/www/html/data/index.php -php-fpm8 +php-fpm81 nginx -c /etc/nginx/nginx.conf # Ready to serve? @@ -44,4 +44,4 @@ for i in 1 2 3; do done echo "Access logging is disabled for production use. Tailing error logs..." -tail -f /var/log/nginx/error.log /var/log/php8/error.log +tail -f /var/log/nginx/error.log /var/log/php81/error.log