Merge pull request #391 from jakzal/toolbox-update

Update toolbox 1.67.1 -> 1.68.1 with PHP 8.2 support
jakzal · Dec 12, 2022 · 6292972 · 6292972
2 parents ab9362f + a3c00f6
commit 6292972
Show file tree

Hide file tree

Showing 8 changed files with 99 additions and 97 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', '8.1']
+                php: ['7.4', '8.0', '8.1', '8.2']
         outputs:
             push: ${{ steps.version.outputs.push }}
         steps:
@@ -28,10 +28,10 @@ jobs:
                 run: |
                     DOCKER_IMAGE=jakzal/phpqa
                     VERSION=master
-                    LATEST_PHP_VERSION="8.1"
+                    LATEST_PHP_VERSION="8.2"
                     LATEST_FLAVOUR="debian"
 
-                    # jakzal/phpqa:php8.1-debian, jakzal/phpqa:php8.1
+                    # jakzal/phpqa:php8.2-debian, jakzal/phpqa:php8.2
                     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.1, jakzal/phpqa:1.55-php8.1
+                    # jakzal/phpqa:1.55.1-php8.2, jakzal/phpqa:1.55-php8.2
                     # jakzal/phpqa:1.55.1-alpine, jakzal/phpqa:1.55-alpine
-                    # jakzal/phpqa:1.55.1-php8.1-alpine, jakzal/phpqa:1.55-php8.1-alpine
+                    # jakzal/phpqa:1.55.1-php8.2-alpine, jakzal/phpqa:1.55-php8.2-alpine
                     if [[ $GITHUB_REF == refs/tags/* ]]; then
                         VERSION=${GITHUB_REF#refs/tags/v}
                         MINOR_VERSION=${VERSION%.*}
@@ -170,7 +170,7 @@ jobs:
             fail-fast: false
             matrix:
                 flavour: [debian, alpine]
-                php: ['7.4', '8.0', '8.1']
+                php: ['7.4', '8.0', '8.1', '8.2']
                 platform: ['linux/arm64','linux/amd64']
                 include:
                     - platform: 'linux/arm64'

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.1']
+                php: ['8.2']
         steps:
             -   uses: actions/checkout@v3
             -   run: make build-nightly-${{matrix.flavour}}

diff --git a/Dockerfile b/Dockerfile
@@ -1,8 +1,8 @@
 # syntax=docker/dockerfile:1.4
 
-ARG PHP_VERSION=8.1
+ARG PHP_VERSION=8.2
 ARG TOOLBOX_EXCLUDED_TAGS="exclude-php:${PHP_VERSION}"
-ARG TOOLBOX_VERSION="1.67.1"
+ARG TOOLBOX_VERSION="1.68.1"
 ARG FLAVOUR="alpine"
 
 

diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-PHP_VERSIONS := 7.4 8.0 8.1
+PHP_VERSIONS := 7.4 8.0 8.1 8.2
 PHP_VERSION ?= $(lastword $(sort $(PHP_VERSIONS)))
 COMPOSER_AUTHDIR ?= $(shell composer config --global home)
 ifneq ("", "$(COMPOSER_AUTHDIR)")

diff --git a/README.md b/README.md
diff --git a/docs/cookbook/bitbucket-pipelines.md b/docs/cookbook/bitbucket-pipelines.md
@@ -6,7 +6,7 @@ Here is an example configuration of a bitbucket pipeline using the phpqa image:
 
 ```yaml
 # bitbucket-pipelines.yml
-image: jakzal/phpqa:php8.1-alpine
+image: jakzal/phpqa:php8.2-alpine
 pipelines:
   default:
     - step:

diff --git a/docs/cookbook/github-actions.md b/docs/cookbook/github-actions.md
@@ -17,15 +17,15 @@ jobs:
     steps:
       - uses: actions/checkout@master
       - name: PHPStan
-        uses: docker://jakzal/phpqa:php8.1-alpine
+        uses: docker://jakzal/phpqa:php8.2-alpine
         with:
           args: phpstan analyze src/ -l 1
       - name: PHP-CS-Fixer
-        uses: docker://jakzal/phpqa:php8.1-alpine
+        uses: docker://jakzal/phpqa:php8.2-alpine
         with:
           args: php-cs-fixer --dry-run --allow-risky=yes --no-interaction --ansi fix
       - name: Deptrac
-        uses: docker://jakzal/phpqa:php8.1-alpine
+        uses: docker://jakzal/phpqa:php8.2-alpine
         with:
           args: deptrac --no-interaction --ansi --formatter-graphviz-display=0
 ```
diff --git a/docs/cookbook/gitlab-ci.md b/docs/cookbook/gitlab-ci.md
@@ -6,20 +6,20 @@ The example below demonstrates how phpqa can be used in the Gitlab CI.
 
 ```yaml
 # .gitlab-ci.yml
-image: php:8.1-fpm-alpine3.15
+image: php:8.2-fpm-alpine3.15
 
 stages:
     - style
 
 php-cs-fixer:
     stage: style
-    image: jakzal/phpqa:php8.1-alpine
+    image: jakzal/phpqa:php8.2-alpine
     script:
         - php-cs-fixer fix --dry-run --stop-on-violation
 
 phpstan:
     stage: style
-    image: jakzal/phpqa:php8.1-alpine
+    image: jakzal/phpqa:php8.2-alpine
     script:
       - phpstan analyze
 ```