From 162f2d8e88d3b369514dc9f8b45fcf92fcb75b63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dalibor=20Karlovi=C4=87?= Date: Fri, 24 Nov 2023 10:03:02 +0100 Subject: [PATCH 1/3] feat: PHP 8.3 --- .github/workflows/build.yml | 10 +++++----- .github/workflows/nightly-builds.yml | 2 +- Dockerfile | 2 +- Makefile | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9348d42b..f9347761 100644 --- 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.0', '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%.*} diff --git a/.github/workflows/nightly-builds.yml b/.github/workflows/nightly-builds.yml index abe8f10e..267e1b51 100644 --- 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 index fa27c5dc..724ecf34 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # 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 FLAVOUR="alpine" diff --git a/Makefile b/Makefile index 512cce71..fb04f4cd 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -PHP_VERSIONS := 8.0 8.1 8.2 +PHP_VERSIONS := 8.0 8.1 8.2 8.3 PHP_VERSION ?= $(lastword $(sort $(PHP_VERSIONS))) COMPOSER_AUTHDIR ?= $(shell composer config --global home) ifneq ("", "$(COMPOSER_AUTHDIR)") From b4378802d883a58aafde2283c6c14d53754591d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dalibor=20Karlovi=C4=87?= Date: Wed, 29 Nov 2023 14:04:01 +0100 Subject: [PATCH 2/3] feat: PHP 8.3 on toolbox 1.80.0 --- .github/workflows/build.yml | 4 ++-- Dockerfile | 2 +- Makefile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f9347761..6e6db216 100644 --- 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', '8.3'] + php: ['8.1', '8.2', '8.3'] outputs: push: ${{ steps.version.outputs.push }} steps: @@ -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/Dockerfile b/Dockerfile index 724ecf34..39f4ed40 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ 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" diff --git a/Makefile b/Makefile index fb04f4cd..aeae7276 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -PHP_VERSIONS := 8.0 8.1 8.2 8.3 +PHP_VERSIONS := 8.1 8.2 8.3 PHP_VERSION ?= $(lastword $(sort $(PHP_VERSIONS))) COMPOSER_AUTHDIR ?= $(shell composer config --global home) ifneq ("", "$(COMPOSER_AUTHDIR)") From 3ee8a3fdbc5b301acdc74cae3bbcd31e12150f29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dalibor=20Karlovi=C4=87?= Date: Wed, 29 Nov 2023 14:14:09 +0100 Subject: [PATCH 3/3] fix: switch from buster to bookworm --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 39f4ed40..3cfadba4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ 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