From c28b23bd5ad06fec12dc126f9380e30221165b38 Mon Sep 17 00:00:00 2001 From: Nick Schuch Date: Mon, 1 Dec 2025 16:37:43 +1000 Subject: [PATCH 1/4] Adds PHP8.5 --- .github/workflows/release-extension.yml | 5 ++++- extension/.devcontainer/Dockerfile | 7 ++++++- extension/Dockerfile | 11 +++++++---- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release-extension.yml b/.github/workflows/release-extension.yml index 8884817..01132d5 100644 --- a/.github/workflows/release-extension.yml +++ b/.github/workflows/release-extension.yml @@ -42,6 +42,7 @@ jobs: run: | IMAGE=${{ env.REGISTRY }}/${{ github.repository }}-extension:${{ github.ref_name }} cd extension + docker build --no-cache --build-arg=PHP_VERSION=8.5 -t ${IMAGE}-php8.5-${{ matrix.arch }} . docker build --no-cache --build-arg=PHP_VERSION=8.4 -t ${IMAGE}-php8.4-${{ matrix.arch }} . docker build --no-cache --build-arg=PHP_VERSION=8.3 -t ${IMAGE}-php8.3-${{ matrix.arch }} . docker build --no-cache --build-arg=PHP_VERSION=8.2 -t ${IMAGE}-php8.2-${{ matrix.arch }} . @@ -49,10 +50,10 @@ jobs: - name: ☁️ Push run: | IMAGE=${{ env.REGISTRY }}/${{ github.repository }}-extension:${{ github.ref_name }} + docker push ${IMAGE}-php8.5-${{matrix.arch}} docker push ${IMAGE}-php8.4-${{matrix.arch}} docker push ${IMAGE}-php8.3-${{matrix.arch}} docker push ${IMAGE}-php8.2-${{matrix.arch}} - manifest: name: Manifest runs-on: ubuntu-latest @@ -75,6 +76,8 @@ jobs: - name: ☁️ Push run: | IMAGE=${{ env.REGISTRY }}/${{ github.repository }}-extension:${{ github.ref_name }} + docker manifest create ${IMAGE}-php8.5 --amend ${IMAGE}-php8.5-arm64 --amend ${IMAGE}-php8.5-amd64 + docker manifest push ${IMAGE}-php8.5 docker manifest create ${IMAGE}-php8.4 --amend ${IMAGE}-php8.4-arm64 --amend ${IMAGE}-php8.4-amd64 docker manifest push ${IMAGE}-php8.4 docker manifest create ${IMAGE}-php8.3 --amend ${IMAGE}-php8.3-arm64 --amend ${IMAGE}-php8.3-amd64 diff --git a/extension/.devcontainer/Dockerfile b/extension/.devcontainer/Dockerfile index 12a86ab..7fb89eb 100644 --- a/extension/.devcontainer/Dockerfile +++ b/extension/.devcontainer/Dockerfile @@ -1,11 +1,16 @@ -FROM ghcr.io/skpr/php-cli:8.4-v2-stable +FROM alpine:3.21 USER root +RUN apk add --no-cache curl && \ + curl -sSL https://packages.skpr.io/php-alpine/skpr.rsa.pub -o /etc/apk/keys/skpr.rsa.pub && \ + echo "https://packages.skpr.io/php-alpine/3.21/php8.4" >> /etc/apk/repositories + RUN apk add alpine-sdk \ clang \ clang-dev \ git \ + php8.4 \ php8.4-dev ENV MISE_DATA_DIR="/mise" diff --git a/extension/Dockerfile b/extension/Dockerfile index 15a1801..d4f11c2 100644 --- a/extension/Dockerfile +++ b/extension/Dockerfile @@ -1,11 +1,14 @@ ARG PHP_VERSION=8.3 -FROM ghcr.io/skpr/php-cli:${PHP_VERSION}-v2-stable AS build - +FROM alpine:3.21 ARG PHP_VERSION=8.3 USER root -RUN apk add alpine-sdk clang clang-dev php${PHP_VERSION}-dev +RUN apk add --no-cache curl && \ + curl -sSL https://packages.skpr.io/php-alpine/skpr.rsa.pub -o /etc/apk/keys/skpr.rsa.pub && \ + echo "https://packages.skpr.io/php-alpine/3.21/php${PHP_VERSION}" >> /etc/apk/repositories + +RUN apk add alpine-sdk clang clang-dev php${PHP_VERSION} php${PHP_VERSION}-dev ENV MISE_DATA_DIR="/mise" ENV MISE_CONFIG_DIR="/mise" @@ -25,7 +28,7 @@ RUN mise run lint RUN mise run build RUN mise run validate -FROM ghcr.io/skpr/php-cli:${PHP_VERSION}-v2-stable +FROM scratch COPY compass.ini /etc/php/conf.d/00_compass.ini COPY --from=build /data/target/release/libcompass_extension.so /usr/lib/php/modules/compass.so From c9aa4c852d7353e645977aaca3beb9e58455f8a4 Mon Sep 17 00:00:00 2001 From: Nick Schuch Date: Mon, 1 Dec 2025 17:51:31 +1000 Subject: [PATCH 2/4] Fix build --- extension/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extension/Dockerfile b/extension/Dockerfile index d4f11c2..a9bc512 100644 --- a/extension/Dockerfile +++ b/extension/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION=8.3 -FROM alpine:3.21 +FROM alpine:3.21 as build ARG PHP_VERSION=8.3 USER root From bb0327698e54652a8f87d1c972bbaa773d19d54b Mon Sep 17 00:00:00 2001 From: Nick Schuch Date: Mon, 1 Dec 2025 17:54:10 +1000 Subject: [PATCH 3/4] Readd workdir --- extension/.devcontainer/Dockerfile | 3 +++ extension/Dockerfile | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/extension/.devcontainer/Dockerfile b/extension/.devcontainer/Dockerfile index 7fb89eb..04cc054 100644 --- a/extension/.devcontainer/Dockerfile +++ b/extension/.devcontainer/Dockerfile @@ -24,3 +24,6 @@ RUN curl https://mise.run | sh ENV RUSTFLAGS="-C target-feature=-crt-static" ENV RUST_BACKTRACE=full + +WORKDIR /data + diff --git a/extension/Dockerfile b/extension/Dockerfile index a9bc512..7c1b106 100644 --- a/extension/Dockerfile +++ b/extension/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION=8.3 -FROM alpine:3.21 as build +FROM alpine:3.21 AS build ARG PHP_VERSION=8.3 USER root @@ -21,6 +21,8 @@ RUN curl https://mise.run | sh ENV RUSTFLAGS="-C target-feature=-crt-static" ENV RUST_BACKTRACE=full +WORKDIR /data + ADD --chown=skpr:skpr . /data RUN mise trust . From 32ca575d6413e7c6ef2acaabc6c08036cdb9453f Mon Sep 17 00:00:00 2001 From: Nick Schuch Date: Mon, 1 Dec 2025 18:54:14 +1000 Subject: [PATCH 4/4] Rebuild