From 26b5a74d59e39b2ed7a7822b24ccc86a589068d1 Mon Sep 17 00:00:00 2001 From: Bubka <858858+Bubka@users.noreply.github.com> Date: Thu, 11 Nov 2021 21:32:16 +0100 Subject: [PATCH] Drop PHP7.3 support --- .travis.yml | 1 - Dockerfile | 2 +- README.md | 2 +- composer.json | 2 +- docker/README.md | 2 +- docs/debian-setup.md | 20 ++++++++++---------- 6 files changed, 14 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index a9ec6d9c..8bd3906e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ language: php php: - - 7.3 - 7.4 before_script: diff --git a/Dockerfile b/Dockerfile index fe1e7f50..eee90e87 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ARG BUILDPLATFORM=linux/amd64 ARG TARGETPLATFORM ARG ALPINE_VERSION=3.14 -ARG PHP_VERSION=7.3-alpine${ALPINE_VERSION} +ARG PHP_VERSION=7.4-alpine${ALPINE_VERSION} ARG COMPOSER_VERSION=2.1 ARG SUPERVISORD_VERSION=v0.7.3 diff --git a/README.md b/README.md index b9d7e73e..9948e5e6 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ ### RFC compliance ## Requirements -* [![Requires PHP7](https://img.shields.io/badge/php-7.3.*-red.svg?style=flat-square)](https://secure.php.net/downloads.php) +* [![Requires PHP7](https://img.shields.io/badge/php-7.4.*-red.svg?style=flat-square)](https://secure.php.net/downloads.php) * See [Laravel server requirements](https://laravel.com/docs/7.x/installation#server-requirements) * Any database [supported by Laravel](https://laravel.com/docs/7.x/database) diff --git a/composer.json b/composer.json index 4f0595ba..800f0f8c 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,7 @@ ], "license": "MIT", "require": { - "php": "^7.3", + "php": "^7.4", "appstract/laravel-options": "^4.1.1", "chillerlan/php-qrcode": "3.3", "doctrine/dbal": "^2.10", diff --git a/docker/README.md b/docker/README.md index df16ac28..75b299ab 100644 --- a/docker/README.md +++ b/docker/README.md @@ -101,7 +101,7 @@ ### Build the image with build arguments | `UID` | 1000 | The UID of the user to run the container as | | `GID` | 1000 | The GID of the user to run the container as | | `DEBIAN_VERSION` | `buster-slim` | The Debian version to use | -| `PHP_VERSION` | `7.3-buster` | The PHP version to use to get composer dependencies | +| `PHP_VERSION` | `7.4-buster` | The PHP version to use to get composer dependencies | | `COMPOSER_VERSION` | `2.1` | The version of composer to use | | `SUPERVISORD_VERSION` | `v0.7.3` | The version of supervisord to use | | `VERSION` | `unknown` | The version of the image | diff --git a/docs/debian-setup.md b/docs/debian-setup.md index 9136353a..c9a5898c 100644 --- a/docs/debian-setup.md +++ b/docs/debian-setup.md @@ -4,7 +4,7 @@ # Debian Setup ## What we will do -- We will use PHP 7.3 +- We will use PHP 7.4 - We will use version v2.1.0 of 2fauth - We will setup to use an Sqlite database - We will use Nginx and PHP-FPM to serve our site on port `8000` @@ -22,11 +22,11 @@ ## Install dependencies ```bash apt-get install -y --no-install-recommends \ - php7.3 \ - php7.3-sqlite3 php7.3-mysql \ - php-xml php7.3-gd php7.3-mbstring \ + php7.4 \ + php7.4-sqlite3 php7.4-mysql \ + php-xml php7.4-gd php7.4-mbstring \ unzip wget ca-certificates \ - php7.3-fpm nginx + php7.4-fpm nginx ``` ## Download the code @@ -71,7 +71,7 @@ ## Nginx configuration error_page 404 /index.php; location ~ \.php$ { - fastcgi_pass unix:/var/run/php/php7.3-fpm.sock; + fastcgi_pass unix:/var/run/php/php7.4-fpm.sock; fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name; include fastcgi_params; } @@ -129,7 +129,7 @@ ## Install supervisord startretries=0 [program:php-fpm] - command=/usr/sbin/php-fpm7.3 -F + command=/usr/sbin/php-fpm7.4 -F [program:nginx] command=/usr/sbin/nginx -g 'daemon off;' @@ -155,14 +155,14 @@ ## Fix ownership and permissions for `www-data` ```bash mkdir -p /run/php /www/data/.composer - touch /run/nginx.pid /var/log/php7.3-fpm.log + touch /run/nginx.pid /var/log/php7.4-fpm.log chown -R www-data \ - /var/log/php7.3-fpm.log \ + /var/log/php7.4-fpm.log \ /run/nginx.pid \ /run/php \ /www/data/.composer chmod 700 /run/php /www/data/.composer - chmod 600 /var/log/php7.3-fpm.log + chmod 600 /var/log/php7.4-fpm.log ``` ## Change user