feat: enable PHP 8.1

jakzal · Feb 4, 2022 · dd141e8 · dd141e8
1 parent 34ac06e
commit dd141e8
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 14 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -17,7 +17,7 @@ jobs:
             fail-fast: false
             matrix:
                 flavour: [debian, alpine]
-                php: ['7.4', '8.0']
+                php: ['7.4', '8.0', '8.1']
         outputs:
             push: ${{ steps.version.outputs.push }}
         steps:
@@ -28,10 +28,10 @@ jobs:
                 run: |
                     DOCKER_IMAGE=jakzal/phpqa
                     VERSION=master
-                    LATEST_PHP_VERSION="8.0"
+                    LATEST_PHP_VERSION="8.1"
                     LATEST_FLAVOUR="debian"
 
-                    # jakzal/phpqa:php8.0-debian, jakzal/phpqa:php8.0
+                    # jakzal/phpqa:php8.1-debian, jakzal/phpqa:php8.1
                     TAGS="${DOCKER_IMAGE}:php${PHP_VERSION}-${IMAGE_FLAVOUR}"
                     if [[ $IMAGE_FLAVOUR == "$LATEST_FLAVOUR" ]]; then
                         TAGS="$TAGS,${DOCKER_IMAGE}:php${PHP_VERSION}"
@@ -46,9 +46,9 @@ jobs:
                     fi
 
                     # jakzal/phpqa:1.55.1, jakzal/phpqa:1.55
-                    # jakzal/phpqa:1.55.1-php8.0, jakzal/phpqa:1.55-php8.0
+                    # jakzal/phpqa:1.55.1-php8.1, jakzal/phpqa:1.55-php8.1
                     # jakzal/phpqa:1.55.1-alpine, jakzal/phpqa:1.55-alpine
-                    # jakzal/phpqa:1.55.1-php8.0-alpine, jakzal/phpqa:1.55-php8.0-alpine
+                    # jakzal/phpqa:1.55.1-php8.1-alpine, jakzal/phpqa:1.55-php8.1-alpine
                     if [[ $GITHUB_REF == refs/tags/* ]]; then
                         VERSION=${GITHUB_REF#refs/tags/v}
                         MINOR_VERSION=${VERSION%.*}
@@ -172,7 +172,7 @@ jobs:
             fail-fast: false
             matrix:
                 flavour: [debian, alpine]
-                php: ['7.4', '8.0']
+                php: ['7.4', '8.0', '8.1']
         steps:
             -   name: Test if pushed
                 run: |

diff --git a/.github/workflows/nightly-builds.yml b/.github/workflows/nightly-builds.yml
@@ -11,7 +11,7 @@ jobs:
         strategy:
             matrix:
                 flavour: [debian, alpine]
-                php: ['8.0']
+                php: ['8.1']
         steps:
             -   uses: actions/checkout@master
             -   run: make build-nightly-${{matrix.flavour}}

diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-PHP_VERSIONS := 7.4 8.0
+PHP_VERSIONS := 7.4 8.0 8.1
 PHP_VERSION ?= $(lastword $(sort $(PHP_VERSIONS)))
 
 default: build

diff --git a/README.md b/README.md
@@ -17,13 +17,15 @@ Nightly builds: https://hub.docker.com/r/jakzal/phpqa-nightly/
 * `1.65.3`, `1.65`, `1.65.3-debian`, `1.65-debian` ([debian/Dockerfile](https://github.com/jakzal/phpqa/blob/v1.65.3/debian/Dockerfile))
 * `1.65.3-php7.4`, `1.65-php7.4`, `php7.4-debian`, `php7.4` ([debian/Dockerfile](https://github.com/jakzal/phpqa/blob/v1.65.3/debian/Dockerfile))
 * `1.65.3-php8.0`, `1.65-php8.0`, `php8.0-debian`, `php8.0` ([debian/Dockerfile](https://github.com/jakzal/phpqa/blob/v1.65.3/debian/Dockerfile))
+* `1.65.3-php8.1`, `1.65-php8.1`, `php8.1-debian`, `php8.1` ([debian/Dockerfile](https://github.com/jakzal/phpqa/blob/v1.65.3/debian/Dockerfile))
 
 ### Alpine
 
 * `alpine` ([alpine/Dockerfile](https://github.com/jakzal/phpqa/blob/master/alpine/Dockerfile))
 * `1.65.3-alpine`, `1.65-alpine`, ([alpine/Dockerfile](https://github.com/jakzal/phpqa/blob/v1.65.3/alpine/Dockerfile))
 * `1.65.3-php7.4-alpine`, `1.65-php7.4-alpine`, `php7.4-alpine` ([alpine/Dockerfile](https://github.com/jakzal/phpqa/blob/v1.65.3/alpine/Dockerfile))
 * `1.65.3-php8.0-alpine`, `1.65-php8.0-alpine`, `php8.0-alpine` ([alpine/Dockerfile](https://github.com/jakzal/phpqa/blob/v1.65.3/alpine/Dockerfile))
+* `1.65.3-php8.1-alpine`, `1.65-php8.1-alpine`, `php8.1-alpine` ([alpine/Dockerfile](https://github.com/jakzal/phpqa/blob/v1.65.3/alpine/Dockerfile))
 
 ### Legacy
 
@@ -194,15 +196,15 @@ jobs:
     steps:
       - uses: actions/checkout@master
       - name: PHPStan
-        uses: docker://jakzal/phpqa:php8.0-alpine
+        uses: docker://jakzal/phpqa:php8.1-alpine
         with:
           args: phpstan analyze src/ -l 1
       - name: PHP-CS-Fixer
-        uses: docker://jakzal/phpqa:php8.0-alpine
+        uses: docker://jakzal/phpqa:php8.1-alpine
         with:
           args: php-cs-fixer --dry-run --allow-risky=yes --no-interaction --ansi fix
       - name: Deptrac
-        uses: docker://jakzal/phpqa:php8.0-alpine
+        uses: docker://jakzal/phpqa:php8.1-alpine
         with:
           args: deptrac --no-interaction --ansi --formatter-graphviz-display=0
 ```
@@ -213,7 +215,7 @@ Here is an example configuration of a bitbucket pipeline using the phpqa image:
 
 ```yaml
 # bitbucket-pipelines.yml
-image: jakzal/phpqa:php8.0-alpine
+image: jakzal/phpqa:php8.1-alpine
 pipelines:
   default:
     - step:

diff --git a/alpine/Dockerfile b/alpine/Dockerfile
@@ -1,4 +1,4 @@
-ARG PHP_VERSION=8.0
+ARG PHP_VERSION=8.1
 ARG BASE_IMAGE=php:${PHP_VERSION}-alpine
 ARG TOOLBOX_EXCLUDED_TAGS="exclude-php:${PHP_VERSION}"
 ARG TOOLBOX_VERSION="1.55.1"

diff --git a/debian/Dockerfile b/debian/Dockerfile
@@ -1,4 +1,4 @@
-ARG PHP_VERSION=8.0
+ARG PHP_VERSION=8.1
 ARG BASE_IMAGE=php:${PHP_VERSION}-cli
 ARG TOOLBOX_EXCLUDED_TAGS="exclude-php:${PHP_VERSION}"
 ARG TOOLBOX_VERSION="1.55.1"