diff --git a/Dockerfile b/Dockerfile index 7ed796f..72b9d5c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,19 +1,19 @@ FROM alpine:3.13 LABEL Maintainer="Tim de Pater " \ - Description="Lightweight container with Nginx 1.18 & PHP 7.4 based on Alpine Linux." + Description="Lightweight container with Nginx 1.18 & PHP 8.0 based on Alpine Linux." # Install packages and remove default server definition -RUN apk --no-cache add php7 php7-fpm php7-opcache php7-mysqli php7-json php7-openssl php7-curl \ - php7-zlib php7-xml php7-phar php7-intl php7-dom php7-xmlreader php7-ctype php7-session \ - php7-mbstring php7-gd nginx supervisor curl && \ +RUN apk --no-cache add php8 php8-fpm php8-opcache php8-mysqli php8-json php8-openssl php8-curl \ + php8-zlib php8-xml php8-phar php8-intl php8-dom php8-xmlreader php8-ctype php8-session \ + php8-mbstring php8-gd nginx supervisor curl && \ rm /etc/nginx/conf.d/default.conf # Configure nginx COPY config/nginx.conf /etc/nginx/nginx.conf # Configure PHP-FPM -COPY config/fpm-pool.conf /etc/php7/php-fpm.d/www.conf -COPY config/php.ini /etc/php7/conf.d/custom.ini +COPY config/fpm-pool.conf /etc/php8/php-fpm.d/www.conf +COPY config/php.ini /etc/php8/conf.d/custom.ini # Configure supervisord COPY config/supervisord.conf /etc/supervisor/conf.d/supervisord.conf diff --git a/README.md b/README.md index 602233e..9d47e3f 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -# Docker PHP-FPM 7.4 & Nginx 1.18 on Alpine Linux -Example PHP-FPM 7.4 & Nginx 1.18 setup for Docker, build on [Alpine Linux](https://www.alpinelinux.org/). +# Docker PHP-FPM 8.0 & Nginx 1.18 on Alpine Linux +Example PHP-FPM 8.0 & Nginx 1.18 setup for Docker, build on [Alpine Linux](https://www.alpinelinux.org/). The image is only +/- 35MB large. Repository: https://github.com/TrafeX/docker-php-nginx @@ -7,7 +7,7 @@ Repository: https://github.com/TrafeX/docker-php-nginx * Built on the lightweight and secure Alpine Linux distribution * Very small Docker image size (+/-35MB) -* Uses PHP 7.4 for better performance, lower CPU usage & memory footprint +* Uses PHP 8.0 for better performance, lower CPU usage & memory footprint * Optimized for 100 concurrent users * Optimized to only use resources when there's traffic (by using PHP-FPM's on-demand PM) * The servers Nginx, PHP-FPM and supervisord run under a non-privileged user (nobody) to make it more secure @@ -18,7 +18,7 @@ Repository: https://github.com/TrafeX/docker-php-nginx [![Docker Pulls](https://img.shields.io/docker/pulls/trafex/alpine-nginx-php7.svg)](https://hub.docker.com/r/trafex/alpine-nginx-php7/) [![Docker image layers](https://images.microbadger.com/badges/image/trafex/alpine-nginx-php7.svg)](https://microbadger.com/images/trafex/alpine-nginx-php7) ![nginx 1.18.0](https://img.shields.io/badge/nginx-1.18-brightgreen.svg) -![php 7.4](https://img.shields.io/badge/php-7.4-brightgreen.svg) +![php 8.0](https://img.shields.io/badge/php-8.0-brightgreen.svg) ![License MIT](https://img.shields.io/badge/license-MIT-blue.svg) ### Breaking changes (26/01/2019) diff --git a/config/supervisord.conf b/config/supervisord.conf index edd5207..216a387 100644 --- a/config/supervisord.conf +++ b/config/supervisord.conf @@ -5,7 +5,7 @@ logfile_maxbytes=0 pidfile=/run/supervisord.pid [program:php-fpm] -command=php-fpm7 -F +command=php-fpm8 -F stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 stderr_logfile=/dev/stderr diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 7793511..bc43092 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -3,7 +3,7 @@ services: app: build: . sut: - image: alpine:3.12 + image: alpine:3.13 depends_on: - app command: /tmp/run_tests.sh diff --git a/run_tests.sh b/run_tests.sh index 7132ac2..189ceba 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -1,3 +1,3 @@ #!/usr/bin/env sh apk --no-cache add curl -curl --silent --fail http://app:8080 | grep 'PHP 7.4' +curl --silent --fail http://app:8080 | grep 'PHP 8.0'