feat(v2): migrate Debian base from bookworm to trixie with backward-compatible tags

KingPin · KingPin · commit 4936ac9d7aa6 · 2025-10-21T20:32:38.000-04:00
- Update Dockerfile.v2 to use Debian trixie as base OS
- Update library packages for trixie (including t64 time64 transition libs)
- Support both trixie and bookworm BASEOS values for smooth transition
- Update docker-ci.yml and docker-image.v2.yml matrices to build v2 on trixie
- v1 images remain on bookworm (no change)
- Add automatic bookworm tag aliasing for v2 trixie-built images
- Also add bullseye compatibility tags for maximum backward compatibility

This provides users pulling :bookworm tags with the latest trixie-built
images while maintaining tag continuity. The same digest is served for
both :trixie and :bookworm tags on v2 images.
diff --git a/.github/workflows/docker-ci.yml b/.github/workflows/docker-ci.yml
@@ -42,6 +42,35 @@ jobs:
         exclude:
           - php-type: apache
             php-base: alpine
+          # v2 uses trixie as the Debian base; bookworm retained for v1
+          - variant: v2
+            php-base: bookworm
+        include:
+          # v2 builds on trixie for Debian images
+          - variant: v2
+            php-version: '8.4'
+            php-type: fpm
+            php-base: trixie
+          - variant: v2
+            php-version: '8.4'
+            php-type: cli
+            php-base: trixie
+          - variant: v2
+            php-version: '8.3'
+            php-type: fpm
+            php-base: trixie
+          - variant: v2
+            php-version: '8.3'
+            php-type: cli
+            php-base: trixie
+          - variant: v2
+            php-version: '8.2'
+            php-type: fpm
+            php-base: trixie
+          - variant: v2
+            php-version: '8.2'
+            php-type: cli
+            php-base: trixie
     
     name: ${{ matrix.variant }}-${{ matrix.php-version }}-${{ matrix.php-type }}-${{ matrix.php-base }}
     
@@ -244,6 +273,47 @@ jobs:
         exclude:
           - php-type: apache
             php-base: alpine
+          # v2 uses trixie as the Debian base; bookworm retained for v1
+          - variant: v2
+            php-base: bookworm
+        include:
+          # v2 builds on trixie for Debian images
+          - variant: v2
+            php-version: '8.4'
+            php-type: fpm
+            php-base: trixie
+          - variant: v2
+            php-version: '8.4'
+            php-type: cli
+            php-base: trixie
+          - variant: v2
+            php-version: '8.4'
+            php-type: apache
+            php-base: trixie
+          - variant: v2
+            php-version: '8.3'
+            php-type: fpm
+            php-base: trixie
+          - variant: v2
+            php-version: '8.3'
+            php-type: cli
+            php-base: trixie
+          - variant: v2
+            php-version: '8.3'
+            php-type: apache
+            php-base: trixie
+          - variant: v2
+            php-version: '8.2'
+            php-type: fpm
+            php-base: trixie
+          - variant: v2
+            php-version: '8.2'
+            php-type: cli
+            php-base: trixie
+          - variant: v2
+            php-version: '8.2'
+            php-type: apache
+            php-base: trixie
     
     name: publish-${{ matrix.variant }}-${{ matrix.php-version }}-${{ matrix.php-type }}-${{ matrix.php-base }}
     
@@ -318,6 +388,30 @@ jobs:
             ${{ steps.vars.outputs.GHCR_TAG }}
             ${{ steps.vars.outputs.QUAY_TAG }}
 
+      - name: Create bookworm compatibility tag for v2 trixie images
+        if: matrix.variant == 'v2' && matrix.php-base == 'trixie'
+        run: |
+          echo "::group::Creating bookworm compatibility tags for trixie-built v2 image"
+          
+          # Replace 'trixie' with 'bookworm' in tag names to maintain backward compatibility
+          BOOKWORM_VERSION="${{ matrix.php-version }}-${{ matrix.php-type }}-bookworm"
+          
+          # Create manifest aliases pointing trixie-built images to bookworm tags
+          docker buildx imagetools create -t \
+            docker.io/${{ secrets.DOCKERHUB_USERNAME }}/php-docker:${BOOKWORM_VERSION}-v2 \
+            ${{ steps.vars.outputs.DOCKERHUB_TAG }}
+          
+          docker buildx imagetools create -t \
+            ghcr.io/kingpin/php-docker:${BOOKWORM_VERSION}-v2 \
+            ${{ steps.vars.outputs.GHCR_TAG }}
+          
+          docker buildx imagetools create -t \
+            quay.io/kingpinx1/php-docker:${BOOKWORM_VERSION}-v2 \
+            ${{ steps.vars.outputs.QUAY_TAG }}
+          
+          echo "✅ Created bookworm compatibility tags pointing to trixie image"
+          echo "::endgroup::"
+
       - name: Run Trivy vulnerability scanner
         uses: aquasecurity/trivy-action@master
         with:
diff --git a/.github/workflows/docker-image.v2.yml b/.github/workflows/docker-image.v2.yml
@@ -41,7 +41,7 @@ jobs:
           echo '{
             "php-version": ["8.1", "8.2", "8.3", "8.4"],
             "php-type": ["cli", "fpm", "apache"],
-            "php-base-os": ["bookworm", "alpine"],
+            "php-base-os": ["trixie", "alpine"],
             "exclude": [
               {"php-type": "apache", "php-base-os": "alpine"}
             ]
@@ -135,8 +135,10 @@ jobs:
             # Regular version tags 
             ADDITIONAL_TAGS="${MAJOR_VERSION}-${{ matrix.php-type }}-${{ matrix.php-base-os }},${MINOR_VERSION}-${{ matrix.php-type }}-${{ matrix.php-base-os }}"
             
-            # Add bullseye-compatible tags for bookworm images
-            if [[ "${{ matrix.php-base-os }}" == "bookworm" ]]; then
+            # Add bookworm compatibility tags for trixie images (backward compatibility)
+            # Also add bullseye tags for transition compatibility
+            if [[ "${{ matrix.php-base-os }}" == "trixie" ]]; then
+              ADDITIONAL_TAGS="${ADDITIONAL_TAGS},${{ matrix.php-version }}-${{ matrix.php-type }}-bookworm,${MAJOR_VERSION}-${{ matrix.php-type }}-bookworm,${MINOR_VERSION}-${{ matrix.php-type }}-bookworm"
               ADDITIONAL_TAGS="${ADDITIONAL_TAGS},${{ matrix.php-version }}-${{ matrix.php-type }}-bullseye,${MAJOR_VERSION}-${{ matrix.php-type }}-bullseye,${MINOR_VERSION}-${{ matrix.php-type }}-bullseye"
             fi
             
diff --git a/Dockerfile.v2 b/Dockerfile.v2
@@ -11,8 +11,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 # Install dependencies based on the base OS with BuildKit cache mounts
 RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
     --mount=type=cache,target=/var/lib/apt,sharing=locked \
-    if [ "$BASEOS" = "bookworm" ]; then \
-        echo 'deb http://deb.debian.org/debian bookworm main' > /etc/apt/sources.list && \
+    if [ "$BASEOS" = "trixie" ] || [ "$BASEOS" = "bookworm" ]; then \
         apt-get update && \
         apt-get -y upgrade && \
         apt-get install -y --no-install-recommends \
@@ -86,7 +85,7 @@ ARG TARGETARCH
 COPY --from=builder /usr/local/ /usr/local/
 
 # Install S6 Overlay init system
-RUN if [ "$BASEOS" = "bookworm" ]; then \
+RUN if [ "$BASEOS" = "trixie" ] || [ "$BASEOS" = "bookworm" ]; then \
         apt-get update && \
         apt-get install -y --no-install-recommends \
             xz-utils \
@@ -122,26 +121,26 @@ RUN if [ "$BASEOS" = "bookworm" ]; then \
     fi
 
 # Install required system libraries based on OS
-RUN if [ "$BASEOS" = "bookworm" ]; then \
+RUN if [ "$BASEOS" = "trixie" ] || [ "$BASEOS" = "bookworm" ]; then \
         apt-get update && \
         apt-get install -y --no-install-recommends \
             librabbitmq4 \
-            libpng16-16 \
-            libmagickwand-6.q16-6 \
+            libpng16-16t64 \
+            libmagickwand-6.q16-7t64 \
             libc-client2007e \
             libsnappy1v5 \
             libpq5 \
-            libsnmp40 \
+            libsnmp40t64 \
             libtidy5deb1 \
-            libvips42 \
+            libvips42t64 \
             libxslt1.1 \
             libyaml-0-2 \
             libzip4 \
-            libmemcached11 \
+            libmemcached11t64 \
             ghostscript \
             imagemagick \
             libwebp7 \
-            libavif15 \
+            libavif16t64 \
             libicu72 \
             libldap-2.5-0 \
             libuuid1 \
@@ -221,7 +220,7 @@ RUN chmod -R 755 /etc/cont-init.d /etc/services.d && \
     mkdir -p /var/run/s6 && \
     chmod -R 755 /var/run/s6 && \
     # Make sure scripts are executable and have correct line endings
-    if [ "$BASEOS" = "bookworm" ]; then \
+    if [ "$BASEOS" = "trixie" ] || [ "$BASEOS" = "bookworm" ]; then \
         apt-get update && \
         apt-get install -y --no-install-recommends dos2unix && \
         dos2unix /etc/cont-init.d/* /etc/services.d/php/* && \
