extern/2FAuth
1
0
Fork 0
mirror of https://github.com/Bubka/2FAuth.git synced 2025-04-18 14:38:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Drop PHP7.3 support

Browse Source
This commit is contained in:
Bubka 2021-11-11 21:32:16 +01:00
parent 76f768d239
commit 26b5a74d59
6 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -1,7 +1,6 @@
language: php language: php
php: php:
- 7.3
- 7.4 - 7.4
before_script: before_script:

2
Dockerfile
View File

@ -1,7 +1,7 @@
ARG BUILDPLATFORM=linux/amd64 ARG BUILDPLATFORM=linux/amd64
ARG TARGETPLATFORM ARG TARGETPLATFORM
ARG ALPINE_VERSION=3.14 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 COMPOSER_VERSION=2.1
ARG SUPERVISORD_VERSION=v0.7.3 ARG SUPERVISORD_VERSION=v0.7.3

2
README.md
View File

@ -60,7 +60,7 @@ ### RFC compliance
## Requirements ## 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) * 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) * Any database [supported by Laravel](https://laravel.com/docs/7.x/database)

2
composer.json
View File

@ -8,7 +8,7 @@
], ],
"license": "MIT", "license": "MIT",
"require": { "require": {
"php": "^7.3", "php": "^7.4",
"appstract/laravel-options": "^4.1.1", "appstract/laravel-options": "^4.1.1",
"chillerlan/php-qrcode": "3.3", "chillerlan/php-qrcode": "3.3",
"doctrine/dbal": "^2.10", "doctrine/dbal": "^2.10",

2
docker/README.md
View File

@ -101,7 +101,7 @@ ### Build the image with build arguments
| `UID` | 1000 | The UID of the user to run the container as | | `UID` | 1000 | The UID of the user to run the container as |
| `GID` | 1000 | The GID 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 | | `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 | | `COMPOSER_VERSION` | `2.1` | The version of composer to use |
| `SUPERVISORD_VERSION` | `v0.7.3` | The version of supervisord to use | | `SUPERVISORD_VERSION` | `v0.7.3` | The version of supervisord to use |
| `VERSION` | `unknown` | The version of the image | | `VERSION` | `unknown` | The version of the image |

20
docs/debian-setup.md
View File

@ -4,7 +4,7 @@ # Debian Setup
## What we will do ## 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 use version v2.1.0 of 2fauth
- We will setup to use an Sqlite database - We will setup to use an Sqlite database
- We will use Nginx and PHP-FPM to serve our site on port `8000` - We will use Nginx and PHP-FPM to serve our site on port `8000`
@ -22,11 +22,11 @@ ## Install dependencies
```bash ```bash
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
php7.3 \ php7.4 \
php7.3-sqlite3 php7.3-mysql \ php7.4-sqlite3 php7.4-mysql \
php-xml php7.3-gd php7.3-mbstring \ php-xml php7.4-gd php7.4-mbstring \
unzip wget ca-certificates \ unzip wget ca-certificates \
php7.3-fpm nginx php7.4-fpm nginx
``` ```
## Download the code ## Download the code
@ -71,7 +71,7 @@ ## Nginx configuration
error_page 404 /index.php; error_page 404 /index.php;
location ~ \.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; fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
include fastcgi_params; include fastcgi_params;
} }
@ -129,7 +129,7 @@ ## Install supervisord
startretries=0 startretries=0
[program:php-fpm] [program:php-fpm]
command=/usr/sbin/php-fpm7.3 -F command=/usr/sbin/php-fpm7.4 -F
[program:nginx] [program:nginx]
command=/usr/sbin/nginx -g 'daemon off;' command=/usr/sbin/nginx -g 'daemon off;'
@ -155,14 +155,14 @@ ## Fix ownership and permissions for `www-data`
```bash ```bash
mkdir -p /run/php /www/data/.composer 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 \ chown -R www-data \
/var/log/php7.3-fpm.log \ /var/log/php7.4-fpm.log \
/run/nginx.pid \ /run/nginx.pid \
/run/php \ /run/php \
/www/data/.composer /www/data/.composer
chmod 700 /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 ## Change user