Update PHP to 7.4.8;

Update nginx to 1.19.1;
Update composer to 1.10.9

CHANGELOG.md

@@ -1,3 +1,8 @@
+## [0.6.3] - 18-07-2020
+- nginx version 1.19.1 - [http://nginx.org/en/CHANGES](http://nginx.org/en/CHANGES)
+- php version 7.4.8 - [https://secure.php.net/ChangeLog-7.php](https://secure.php.net/ChangeLog-7.php)
+- composer version 1.10.9 [https://getcomposer.org/download/](https://getcomposer.org/download/)
+
 ## [0.6.2] - 11-03-2020
 - nginx version 1.17.9 - [http://nginx.org/en/CHANGES](http://nginx.org/en/CHANGES)
 - php version 7.4.3 - [https://secure.php.net/ChangeLog-7.php](https://secure.php.net/ChangeLog-7.php)

Dockerfile

@@ -4,10 +4,10 @@ LABEL maintainer="Colin Wilson [email protected]"
 
 # Let the container know that there is no tty
 ENV DEBIAN_FRONTEND noninteractive
-ENV NGINX_VERSION 1.17.9-1~buster
+ENV NGINX_VERSION 1.19.1-1~buster
 ENV php_conf /etc/php/7.4/fpm/php.ini
 ENV fpm_conf /etc/php/7.4/fpm/pool.d/www.conf
-ENV COMPOSER_VERSION 1.9.3
+ENV COMPOSER_VERSION 1.10.9
 
 # Install Basic Requirements
 RUN buildDeps='curl gcc make autoconf libc-dev zlib1g-dev pkg-config' \
@@ -88,17 +88,19 @@ RUN buildDeps='curl gcc make autoconf libc-dev zlib1g-dev pkg-config' \
     && ln -sf /etc/php/7.4/mods-available/memcached.ini /etc/php/7.4/fpm/conf.d/20-memcached.ini \
     && ln -sf /etc/php/7.4/mods-available/memcached.ini /etc/php/7.4/cli/conf.d/20-memcached.ini \
     && ln -sf /etc/php/7.4/mods-available/imagick.ini /etc/php/7.4/fpm/conf.d/20-imagick.ini \
-    && ln -sf /etc/php/7.4/mods-available/imagick.ini /etc/php/7.4/cli/conf.d/20-imagick.ini
-
-RUN curl -o /tmp/composer-setup.php https://getcomposer.org/installer \
-  && curl -o /tmp/composer-setup.sig https://composer.github.io/installer.sig \
-  && php -r "if (hash('SHA384', file_get_contents('/tmp/composer-setup.php')) !== trim(file_get_contents('/tmp/composer-setup.sig'))) { unlink('/tmp/composer-setup.php'); echo 'Invalid installer' . PHP_EOL; exit(1); }" \
-  && php /tmp/composer-setup.php --no-ansi --install-dir=/usr/local/bin --filename=composer --version=${COMPOSER_VERSION} && rm -rf /tmp/composer-setup.php
-
-# Clean up
-RUN rm -rf /tmp/pear \
+    && ln -sf /etc/php/7.4/mods-available/imagick.ini /etc/php/7.4/cli/conf.d/20-imagick.ini \
+    # Install Composer
+    && curl -o /tmp/composer-setup.php https://getcomposer.org/installer \
+    && curl -o /tmp/composer-setup.sig https://composer.github.io/installer.sig \
+    && php -r "if (hash('SHA384', file_get_contents('/tmp/composer-setup.php')) !== trim(file_get_contents('/tmp/composer-setup.sig'))) { unlink('/tmp/composer-setup.php'); echo 'Invalid installer' . PHP_EOL; exit(1); }" \
+    && php /tmp/composer-setup.php --no-ansi --install-dir=/usr/local/bin --filename=composer --version=${COMPOSER_VERSION} \
+    && rm -rf /tmp/composer-setup.php \
+    # Clean up
+    && rm -rf /tmp/pear \
     && apt-get purge -y --auto-remove $buildDeps \
-    && apt-get clean && rm -rf /var/lib/apt/lists/*
+    && apt-get clean \
+    && apt-get autoremove \
+    && rm -rf /var/lib/apt/lists/*
 
 # Supervisor config
 ADD ./supervisord.conf /etc/supervisord.conf

README.md

@@ -1,17 +1,17 @@
-[![Docker Hub; wyveo/nginx-php-fpm](https://img.shields.io/badge/docker%20hub-wyveo%2Fnginx--php--fpm-blue.svg?&logo=docker&style=for-the-badge)](https://hub.docker.com/r/wyveo/nginx-php-fpm/) [![](https://img.shields.io/microbadger/image-size/wyveo/nginx-php-fpm/latest.svg?&style=for-the-badge)](https://microbadger.com/images/wyveo/nginx-php-fpm) [![](https://img.shields.io/microbadger/layers/wyveo/nginx-php-fpm/latest.svg?&style=for-the-badge)](https://microbadger.com/images/wyveo/nginx-php-fpm) [![nginx 1.17.9](https://img.shields.io/badge/nginx-1.17.9-brightgreen.svg?&logo=nginx&logoColor=white&style=for-the-badge)](https://nginx.org/en/CHANGES) [![php 7.4.3](https://img.shields.io/badge/php--fpm-7.4.3-blue.svg?&logo=php&logoColor=white&style=for-the-badge)](https://secure.php.net/releases/7_4_3.php) [![License MIT](https://img.shields.io/badge/license-MIT-blue.svg?&style=for-the-badge)](https://github.com/wyveo/nginx-php-fpm/blob/master/LICENSE)
+[![Docker Hub; wyveo/nginx-php-fpm](https://img.shields.io/badge/docker%20hub-wyveo%2Fnginx--php--fpm-blue.svg?&logo=docker&style=for-the-badge)](https://hub.docker.com/r/wyveo/nginx-php-fpm/) [![](https://img.shields.io/microbadger/image-size/wyveo/nginx-php-fpm/latest.svg?&style=for-the-badge)](https://microbadger.com/images/wyveo/nginx-php-fpm) [![](https://img.shields.io/microbadger/layers/wyveo/nginx-php-fpm/latest.svg?&style=for-the-badge)](https://microbadger.com/images/wyveo/nginx-php-fpm) [![nginx 1.19.1](https://img.shields.io/badge/nginx-1.19.1-brightgreen.svg?&logo=nginx&logoColor=white&style=for-the-badge)](https://nginx.org/en/CHANGES) [![php 7.4.8](https://img.shields.io/badge/php--fpm-7.4.8-blue.svg?&logo=php&logoColor=white&style=for-the-badge)](https://secure.php.net/releases/7_4_8.php) [![License MIT](https://img.shields.io/badge/license-MIT-blue.svg?&style=for-the-badge)](https://github.com/wyveo/nginx-php-fpm/blob/master/LICENSE)
 
 ## Introduction
 This is a Dockerfile to build a debian based container image running nginx and php-fpm 7.4.x / 7.3.x / 7.2.x / 7.1.x / 7.0.x & Composer.
 
 ### Versioning
 | Docker Tag | GitHub Release | Nginx Version | PHP Version | Debian Version |
 |-----|-------|-----|--------|--------|
-| latest | master Branch |1.17.9 | 7.4.3 | buster |
-| php74 | php74 Branch |1.17.9 | 7.4.3 | buster |
-| php73 | php73 Branch |1.17.9 | 7.3.15 | buster |
-| php72 | php72 Branch |1.17.9 | 7.2.28 | buster |
-| php71 | php71 Branch |1.17.9 | 7.1.33 | buster |
-| php70 | php70 Branch |1.17.9 | 7.0.33 | buster |
+| latest | master Branch |1.19.1 | 7.4.8 | buster |
+| php74 | php74 Branch |1.19.1 | 7.4.8 | buster |
+| php73 | php73 Branch |1.19.1 | 7.3.20 | buster |
+| php72 | php72 Branch |1.19.1 | 7.2.32 | buster |
+| php71 | php71 Branch |1.19.1 | 7.1.33 | buster |
+| php70 | php70 Branch |1.19.1 | 7.0.33 | buster |
 
 ## Building from source
 To build from source you need to clone the git repo and run docker build:

default.conf

@@ -27,8 +27,8 @@ server {
 
     location / {
         # First attempt to serve request as file, then
-        # as directory, then fall back to index.html
-        try_files $uri $uri/ =404;
+        # as directory, then fall back to index.php
+        try_files $uri $uri/ /index.php?$query_string $uri/index.html;
     }
 
     # redirect server error pages to the static page /50x.html
@@ -41,7 +41,7 @@ server {
     # pass the PHP scripts to FastCGI server listening on socket
     #
     location ~ \.php$ {
-        try_files $uri =404;
+        try_files $uri $uri/ /index.php?$query_string;
         fastcgi_split_path_info ^(.+\.php)(/.+)$;
         fastcgi_pass unix:/run/php/php7.4-fpm.sock;
         fastcgi_index index.php;

html/index.php

@@ -34,7 +34,7 @@
   <div class="container">
     <div class="row">
       <div class="one-half column" style="margin-top: 25%">
-        <img height="45px" src="data:image/svg+xml;base64,PHN2ZyBpZD0iYjg0MWFkOGYtNjg3Yy00NTBkLWJkZWYtYTMyMmFkOTAzZjYzIiBkYXRhLW5hbWU9IkxheWVyIDIiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHZpZXdCb3g9IjAgMCAzMzEgMTk2Ij48ZGVmcz48c3R5bGU+LmViMTllYTgyLThhODQtNDA3Ni04ZWRiLWQ3M2JiODg2MWY1N3tmaWxsOnVybCgjYjIwNzk2M2UtZDQ2My00MDZlLTkxZTktZWQ1NDVjNWVlZGQ3KTt9PC9zdHlsZT48bGluZWFyR3JhZGllbnQgaWQ9ImIyMDc5NjNlLWQ0NjMtNDA2ZS05MWU5LWVkNTQ1YzVlZWRkNyIgeDE9IjE5My4wOCIgeTE9IjEwMC4yNSIgeDI9IjM0NS45MiIgeTI9IjM2NC45OCIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPjxzdG9wIG9mZnNldD0iMCIgc3RvcC1jb2xvcj0iI2E2MjA2YSIvPjxzdG9wIG9mZnNldD0iMC4yNSIgc3RvcC1jb2xvcj0iI2VjMWM0YiIvPjxzdG9wIG9mZnNldD0iMC41IiBzdG9wLWNvbG9yPSIjZjE2YTQzIi8+PHN0b3Agb2Zmc2V0PSIwLjc1IiBzdG9wLWNvbG9yPSIjZjdkOTQ5Ii8+PHN0b3Agb2Zmc2V0PSIxIiBzdG9wLWNvbG9yPSIjMmY5Mzk1Ii8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHBhdGggY2xhc3M9ImViMTllYTgyLThhODQtNDA3Ni04ZWRiLWQ3M2JiODg2MWY1NyIgZD0iTTE3NSwxNjVIOTRhMy41LDMuNSwwLDAsMSwwLTdoODFhMy41LDMuNSwwLDAsMSwwLDdabTMwLjUsMTg1LjVBMy41LDMuNSwwLDAsMCwyMDIsMzQ3SDE0OGEzLjUsMy41LDAsMCwwLDAsN2g1NEEzLjUsMy41LDAsMCwwLDIwNS41LDM1MC41Wm04MS0xMzVBMy41LDMuNSwwLDAsMCwyODMsMjEySDIyOWEzLjUsMy41LDAsMCwwLDAsN2g1NEEzLjUsMy41LDAsMCwwLDI4Ni41LDIxNS41Wm04MSwxMzVBMy41LDMuNSwwLDAsMCwzNjQsMzQ3SDMxMGEzLjUsMy41LDAsMCwwLDAsN2g1NEEzLjUsMy41LDAsMCwwLDM2Ny41LDM1MC41Wm01NC0xODlBMy41LDMuNSwwLDAsMCw0MTgsMTU4SDMzN2EzLjUsMy41LDAsMCwwLDAsN2g4MUEzLjUsMy41LDAsMCwwLDQyMS41LDE2MS41Wk0xODIuNzYsMTc0LjI4YTMuNSwzLjUsMCwwLDAtMy41LTMuNUg5Ny42NWEzLjUsMy41LDAsMCwwLDAsN2g4MS42MUEzLjUsMy41LDAsMCwwLDE4Mi43NiwxNzQuMjhaTTE4Ny4zNCwxODhhMy41LDMuNSwwLDAsMC0zLjUtMy41SDEwMS41OGEzLjUsMy41LDAsMCwwLDAsN2g4Mi4yNkEzLjUsMy41LDAsMCwwLDE4Ny4zNCwxODhabTQuNzcsMTQuMjlhMy41LDMuNSwwLDAsMC0zLjUtMy41aC04M2EzLjUsMy41LDAsMCwwLDAsN2g4M0EzLjUsMy41LDAsMCwwLDE5Mi4xMSwyMDIuMzJabTQuMzMsMTNhMy41LDMuNSwwLDAsMC0zLjUtMy41SDEwOS4zOGEzLjUsMy41LDAsMCwwLDAsN2g4My41NkEzLjQ5LDMuNDksMCwwLDAsMTk2LjQ0LDIxNS4zM1ptNC42MywxMy44N2EzLjUsMy41LDAsMCwwLTMuNS0zLjVIMTEzLjM0YTMuNSwzLjUsMCwxLDAsMCw3aDg0LjIzQTMuNSwzLjUsMCwwLDAsMjAxLjA3LDIyOS4yWm0xOTcuMjksMTMuM2EzLjUsMy41LDAsMCwwLTMuNS0zLjVIMTE3LjE0YTMuNSwzLjUsMCwxLDAsMCw3SDM5NC44NkEzLjUsMy41LDAsMCwwLDM5OC4zNiwyNDIuNVpNMzAwLjIsMjI5LjJhMy41LDMuNSwwLDAsMC0zLjUtMy41SDIxNS4zYTMuNSwzLjUsMCwwLDAsMCw3aDgxLjRBMy40OSwzLjQ5LDAsMCwwLDMwMC4yLDIyOS4yWk0zOTQuNSwyNTZhMy41LDMuNSwwLDAsMC0zLjUtMy41SDEyMWEzLjUsMy41LDAsMCwwLDAsN0gzOTFBMy41LDMuNSwwLDAsMCwzOTQuNSwyNTZabS0zLjgzLDEzLjQyYTMuNSwzLjUsMCwwLDAtMy41LTMuNWwtMjYyLjM2LS4wN2gwYTMuNSwzLjUsMCwwLDAsMCw3bDI2Mi4zNS4wN2gwQTMuNSwzLjUsMCwwLDAsMzkwLjY3LDI2OS40MlptLTcuMzMsMTYuODlhMy41LDMuNSwwLDAsMCwwLTdsLTI1NC42NywwYTMuNSwzLjUsMCwxLDAsMCw3Wm0tMy44MywxMy4zOWEzLjUsMy41LDAsMCwwLDAtN2wtMjQ3LDBhMy41LDMuNSwwLDAsMCwwLDdabS0xMzMsOS43OUEzLjUsMy41LDAsMCwwLDI0MywzMDZIMTM2LjI4YTMuNSwzLjUsMCwxLDAsMCw3SDI0M0EzLjUsMy41LDAsMCwwLDI0Ni41MSwzMDkuNDlabS0xNCwxNEEzLjUsMy41LDAsMCwwLDIyOSwzMjBIMTQwLjI3YTMuNSwzLjUsMCwwLDAsMCw3SDIyOUEzLjUsMy41LDAsMCwwLDIzMi41NCwzMjMuNDZaTTIxOS4yLDMzNi44YTMuNSwzLjUsMCwwLDAtMy41LTMuNUgxNDQuMDlhMy41LDMuNSwwLDEsMCwwLDdIMjE1LjdBMy41LDMuNSwwLDAsMCwyMTkuMiwzMzYuOFpNNDE3Ljg1LDE3NC4yOGEzLjUsMy41LDAsMCwwLTMuNS0zLjVIMzMyLjc0YTMuNSwzLjUsMCwwLDAsMCw3aDgxLjYxQTMuNSwzLjUsMCwwLDAsNDE3Ljg1LDE3NC4yOFpNNDEzLjkyLDE4OGEzLjUsMy41LDAsMCwwLTMuNS0zLjVIMzI4LjE2YTMuNSwzLjUsMCwwLDAsMCw3aDgyLjI2QTMuNSwzLjUsMCwwLDAsNDEzLjkyLDE4OFptLTQuMDgsMTQuMjlhMy41LDMuNSwwLDAsMC0zLjUtMy41SDMyMy4zOWEzLjUsMy41LDAsMCwwLDAsN2g4Mi45NUEzLjUsMy41LDAsMCwwLDQwOS44NCwyMDIuMzJabS0zLjcyLDEzYTMuNSwzLjUsMCwwLDAtMy41LTMuNUgzMTkuMDZhMy41LDMuNSwwLDAsMCwwLDdoODMuNTZBMy41LDMuNSwwLDAsMCw0MDYuMTIsMjE1LjMzWm0tNCwxMy44N2EzLjUsMy41LDAsMCwwLTMuNS0zLjVIMzE0LjQzYTMuNSwzLjUsMCwwLDAsMCw3aDg0LjIzQTMuNSwzLjUsMCwwLDAsNDAyLjE2LDIyOS4yWm0tMjEuOSw4MC41MWEzLjUsMy41LDAsMCwwLTMuNS0zLjVIMjcwYTMuNSwzLjUsMCwwLDAsMCw3SDM3Ni43NkEzLjUsMy41LDAsMCwwLDM4MC4yNiwzMDkuNzFabS00LDE0YTMuNSwzLjUsMCwwLDAtMy41LTMuNUgyODRhMy41LDMuNSwwLDAsMCwwLDdoODguNzdBMy41LDMuNSwwLDAsMCwzNzYuMjcsMzIzLjY4Wk0zNzIuNDUsMzM3YTMuNSwzLjUsMCwwLDAtMy41LTMuNUgyOTcuMzRhMy41LDMuNSwwLDEsMCwwLDdIMzY5QTMuNSwzLjUsMCwwLDAsMzcyLjQ1LDMzN1oiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC05MC41IC0xNTgpIi8+PC9zdmc+">
+        <img height="45px" src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGRhdGEtbmFtZT0iTGF5ZXIgMSIgdmlld0JveD0iMCAwIDYyOS4yMiA2OTkuNSI+PHBhdGggZmlsbD0iI2ZmZiIgZD0iTTM0OS4yNSAxOS43NWMtMTkuMDUtMTEtNTAuMjMtMTEtNjkuMjggMGwtMjMzLjgzIDEzNWMtMTkgMTEtMzQuNjQgMzgtMzQuNjQgNjB2MjcwYzAgMjIgMTUuNTkgNDkgMzQuNjQgNjBsMjMzLjg2IDEzNWMxOSAxMSA1MC4yMyAxMSA2OS4yOCAwbDIzMy44My0xMzVjMTktMTEgMzQuNjQtMzggMzQuNjQtNjB2LTI3MGMwLTIyLTE1LjU5LTQ5LTM0LjY0LTYweiIvPjxwYXRoIGZpbGw9Im5vbmUiIHN0cm9rZT0iIzFmMWYxZiIgc3Ryb2tlLW1pdGVybGltaXQ9IjEwIiBzdHJva2Utd2lkdGg9IjIzIiBkPSJNMzQ5LjI1IDE5Ljc1Yy0xOS4wNS0xMS01MC4yMy0xMS02OS4yOCAwbC0yMzMuODMgMTM1Yy0xOSAxMS0zNC42NCAzOC0zNC42NCA2MHYyNzBjMCAyMiAxNS41OSA0OSAzNC42NCA2MGwyMzMuODYgMTM1YzE5IDExIDUwLjIzIDExIDY5LjI4IDBsMjMzLjgzLTEzNWMxOS0xMSAzNC42NC0zOCAzNC42NC02MHYtMjcwYzAtMjItMTUuNTktNDktMzQuNjQtNjB6Ii8+PHBhdGggZD0iTTE1Ni40MSAyNzIuNzJjLTIuOTQtMTYuMzItNy41MS0zNCAxNi0zNGgyMi41M2MyMi44NCAwIDI1Ljc4IDE3LjYzIDI2Ljc2IDI1Ljc5bDI0LjE1IDE0NC42aDJjMy45Mi0zNS4yNiAxOS4yNi0xMzMuNSAyMS4yMi0xNDQgMi4yOC0xNS42NyAzLjkyLTI2LjQ0IDI0LjgxLTI2LjQ0SDMzNWMyMC41NyAwIDIzLjUgMTggMjQuNDggMjYuNDQgMy4yNyAyNS40NiAxOCAxMjAuMTIgMjIuNTIgMTQ0LjI3aDJjMy41OS0zNC42IDE4LjI4LTEzNC40OCAxOS45MS0xNDQuNiAyLjYxLTE2IDMuOTItMjYuMTEgMjQuODEtMjYuMTFoMzJjMTYuMzIgMCAxNiAxNy42MyAxMy4wNSAzMi04LjE2IDM5LjE3LTMxLjY2IDEzOC43Mi0zNC45MiAxNTIuNDMtMy4yNiAxNi01Ljg4IDM3LjU0LTMzLjYyIDM3LjU0aC00MC41OGMtMTQuMzYgMC0yNi40My01Ljg4LTI4LjA2LTI0LjE2LTItMTctMTcuMzEtMTE1Ljg3LTIxLjg3LTE0MWgtMmMtNC4yNSAzNS45LTE3Ljk1IDEyMC4xMS0yMC44OSAxNDEuNjYtMi4yOSAxOC4yNy0xMy4wNiAyMy41LTI4LjA3IDIzLjVoLTQyLjA3Yy0yNC40OCAwLTI4LjcyLTE5LjU5LTMyLjMxLTMzLTMuOTItMTYuODUtMjguMzgtMTMxLjA5LTMyLjk3LTE1NC45MnoiLz48L3N2Zz4=">
         <h4>Congratulations!</h4>
         <p>You have successfully deployed a <strong>docker</strong> container running our <strong>NGINX</strong> with <strong>PHP-FPM 7.x</strong> image</p>
         <p><strong>NGINX: </strong>v<?php echo $_ENV['NGINX_VERSION'] ?><br><strong>PHP-FPM: </strong>v<?php echo phpversion(); ?><br><strong>HOSTNAME: </strong><?php echo gethostname(); ?><br><strong>WEB ROOT: </strong><?php echo $_ENV['DOCUMENT_ROOT'] ?></p>

start.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Update nginx to match worker_processes to no. of cpu's
-procs=$(cat /proc/cpuinfo |grep processor | wc -l)
+procs=$(cat /proc/cpuinfo | grep processor | wc -l)
 sed -i -e "s/worker_processes  1/worker_processes $procs/" /etc/nginx/nginx.conf
 
 # Always chown webroot for better mounting