Merge pull request #417 from sigwinhq/feat/8.3

feat: PHP 8.3
jakzal · Nov 29, 2023 · a9a2eed · a9a2eed
2 parents f0b81f7 + 3ee8a3f
commit a9a2eed
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 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: ['8.0', '8.1', '8.2']
+                php: ['8.1', '8.2', '8.3']
         outputs:
             push: ${{ steps.version.outputs.push }}
         steps:
@@ -28,10 +28,10 @@ jobs:
                 run: |
                     DOCKER_IMAGE=jakzal/phpqa
                     VERSION=master
-                    LATEST_PHP_VERSION="8.2"
+                    LATEST_PHP_VERSION="8.3"
                     LATEST_FLAVOUR="debian"
 
-                    # jakzal/phpqa:php8.2-debian, jakzal/phpqa:php8.2
+                    # jakzal/phpqa:phpX.X-debian, jakzal/phpqa:phpX.X
                     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.2, jakzal/phpqa:1.55-php8.2
+                    # jakzal/phpqa:1.55.1-phpX.X, jakzal/phpqa:1.55-phpX.X
                     # jakzal/phpqa:1.55.1-alpine, jakzal/phpqa:1.55-alpine
-                    # jakzal/phpqa:1.55.1-php8.2-alpine, jakzal/phpqa:1.55-php8.2-alpine
+                    # jakzal/phpqa:1.55.1-phpX.X-alpine, jakzal/phpqa:1.55-phpX.X-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: ['8.0', '8.1', '8.2']
+                php: ['8.1', '8.2', '8.3']
                 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.2']
+                php: ['8.3']
         steps:
             -   uses: actions/checkout@v3
             -   run: make build-nightly-${{matrix.flavour}}

diff --git a/Dockerfile b/Dockerfile
@@ -1,13 +1,13 @@
 # syntax=docker/dockerfile:1.4
 
-ARG PHP_VERSION=8.2
+ARG PHP_VERSION=8.3
 ARG TOOLBOX_EXCLUDED_TAGS="exclude-php:${PHP_VERSION}"
-ARG TOOLBOX_VERSION="1.79.1"
+ARG TOOLBOX_VERSION="1.80.0"
 ARG FLAVOUR="alpine"
 
 
 # Debian PHP with dependencies needed for final image
-FROM php:${PHP_VERSION}-cli-buster AS php-base-debian
+FROM php:${PHP_VERSION}-cli AS php-base-debian
 ARG DEBIAN_LIB_DEPS="zlib1g-dev libzip-dev libbz2-dev libicu-dev"
 ARG DEBIAN_TOOL_DEPS="git graphviz make unzip gpg dirmngr gpg-agent openssh-client"
 ARG TARGETARCH

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