diff --git a/Dockerfile b/Dockerfile index ddd375f09..d2d133741 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ -FROM alpine:3.13 +FROM alpine:3.14 LABEL Maintainer="Tim de Pater " -LABEL Description="Lightweight container with Nginx 1.18 & PHP 8.0 based on Alpine Linux." +LABEL Description="Lightweight container with Nginx 1.20 & PHP 8.0 based on Alpine Linux." # Install packages and remove default server definition RUN apk --no-cache add \ @@ -23,8 +23,7 @@ RUN apk --no-cache add \ php8-xml \ php8-xmlreader \ php8-zlib \ - supervisor \ - && rm /etc/nginx/conf.d/default.conf + supervisor # Create symlink so programs depending on `php` still function RUN ln -s /usr/bin/php8 /usr/bin/php diff --git a/README.md b/README.md index 158c27256..1d039c5d8 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -# 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/). +# Docker PHP-FPM 8.0 & Nginx 1.20 on Alpine Linux +Example PHP-FPM 8.0 & Nginx 1.20 setup for Docker, build on [Alpine Linux](https://www.alpinelinux.org/). The image is only +/- 40MB large. Repository: https://github.com/TrafeX/docker-php-nginx @@ -16,7 +16,7 @@ Repository: https://github.com/TrafeX/docker-php-nginx [![Docker Pulls](https://img.shields.io/docker/pulls/trafex/php-nginx.svg)](https://hub.docker.com/r/trafex/php-nginx/) -![nginx 1.18.0](https://img.shields.io/badge/nginx-1.18-brightgreen.svg) +![nginx 1.18.0](https://img.shields.io/badge/nginx-1.20-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)