Update caddy:2.10.2-builder Docker digest to fbcbf6e

2026-02-08 09:30:11 +00:00
7 changed files with 21 additions and 107 deletions
--- a/.gitea/workflows/build-test.yml
+++ b/.gitea/workflows/build-test.yml
@@ -1,78 +0,0 @@
-name: Build Test
-
-on:
-  workflow_dispatch:
-  pull_request:
-    branches: [ main ]
-    paths:
-      - 'caddy-*/**'
-      - '.gitea/workflows/**'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        variant:
-          - name: 'cloudflare'
-            dockerfile: 'caddy-cloudflare/Dockerfile'
-            context: 'caddy-cloudflare'
-          - name: 'crowdsec'
-            dockerfile: 'caddy-crowdsec/Dockerfile'
-            context: 'caddy-crowdsec'
-      fail-fast: true
-
-    steps:
-      - 
-        name: Checkout code
-        uses: actions/checkout@v6.0.2
-      - 
-        name: Parse Caddy version
-        id: version
-        run: |
-          VERSION=$(grep -m 1 -Eo 'caddy:[0-9]+\.[0-9]+\.[0-9]' caddy-cloudflare/Dockerfile | cut -d ':' -f2)
-          echo "version=$VERSION" >> $GITHUB_OUTPUT
-          echo "Version from file: $VERSION"
-        
-          # Extract semantic version parts
-          MAJOR=$(echo $VERSION | cut -d. -f1)
-          MINOR=$(echo $VERSION | cut -d. -f1-2)
-          
-          echo "major_version=$MAJOR" >> $GITHUB_OUTPUT
-          echo "minor_version=$MINOR" >> $GITHUB_OUTPUT
-          echo "Major: $MAJOR, Minor: $MINOR"
-      - 
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.7.0
-      - 
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.12.0
-        with:
-          driver-opts: image=moby/buildkit:v0.23.2@sha256:ddd1ca44b21eda906e81ab14a3d467fa6c39cd73b9a39df1196210edcb8db59e
-      - 
-        name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v5.10.0
-        with:
-          images: |
-            ghcr.io/${{ vars.GH_USERNAME }}/caddy-${{ matrix.variant.name }}
-            ${{ vars.DOCKERHUB_USERNAME }}/caddy-${{ matrix.variant.name }}
-          tags: |
-            type=sha,format=long,prefix=sha-
-            type=raw,value=latest
-            type=raw,value=${{ steps.version.outputs.major_version }}
-            type=raw,value=${{ steps.version.outputs.minor_version }}
-            type=raw,value=${{ steps.version.outputs.version }},priority=1000
-      - 
-        name: Build Test
-        uses: docker/build-push-action@v6.19.2
-        with:
-          context: ${{ matrix.variant.context }}
-          file: ${{ matrix.variant.dockerfile }}
-          push: false
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-          build-args: |
-            BUILDKIT_INLINE_CACHE=1
--- a/.github/workflows/build-and-push.yml
+++ b/.github/workflows/build-and-push.yml
@@ -6,7 +6,12 @@ on:
    branches: [ main ]
    paths:
      - 'caddy-*/**'
-      - '.gitea/workflows/build-and-push.yml'
+      - '.github/workflows/**'
+  pull_request:
+    branches: [ main ]
+    paths:
+      - 'caddy-*/**'
+      - '.github/workflows/**'

 jobs:
  build:
@@ -29,7 +34,7 @@ jobs:
          - name: 'crowdsec'
            dockerfile: 'caddy-crowdsec/Dockerfile'
            context: 'caddy-crowdsec'
-      fail-fast: true
+      fail-fast: false

    steps:
      - 
@@ -38,18 +43,7 @@ jobs:
      - 
        name: Parse Caddy version
        id: version
-        run: |
-          VERSION=$(grep -m 1 -Eo 'caddy:[0-9]+\.[0-9]+\.[0-9]' caddy-cloudflare/Dockerfile | cut -d ':' -f2)
-          echo "version=$VERSION" >> $GITHUB_OUTPUT
-          echo "Version from file: $VERSION"
-        
-          # Extract semantic version parts
-          MAJOR=$(echo $VERSION | cut -d. -f1)
-          MINOR=$(echo $VERSION | cut -d. -f1-2)
-          
-          echo "major_version=$MAJOR" >> $GITHUB_OUTPUT
-          echo "minor_version=$MINOR" >> $GITHUB_OUTPUT
-          echo "Major: $MAJOR, Minor: $MINOR"
+        run: echo "version=$(grep -oP '(?<=FROM caddy:)[0-9]+\.[0-9]+\.[0-9]+' ${{ matrix.variant.dockerfile }} | head -n 1)" >> $GITHUB_OUTPUT
      - 
        name: Set up QEMU
        uses: docker/setup-qemu-action@v3.7.0
@@ -80,18 +74,16 @@ jobs:
            ghcr.io/${{ vars.GH_USERNAME }}/caddy-${{ matrix.variant.name }}
            ${{ vars.DOCKERHUB_USERNAME }}/caddy-${{ matrix.variant.name }}
          tags: |
+            type=raw,value=${{ steps.version.outputs.version }}
            type=sha,format=long,prefix=sha-
            type=raw,value=latest
-            type=raw,value=${{ steps.version.outputs.major_version }}
-            type=raw,value=${{ steps.version.outputs.minor_version }}
-            type=raw,value=${{ steps.version.outputs.version }},priority=1000
      - 
        name: Build and push
-        uses: docker/build-push-action@v6.19.2
+        uses: docker/build-push-action@v6.18.0
        with:
          context: ${{ matrix.variant.context }}
          file: ${{ matrix.variant.dockerfile }}
-          push: true
+          push: ${{ github.event_name != 'pull_request' }}
          tags: ${{ steps.meta.outputs.tags }}
          labels: ${{ steps.meta.outputs.labels }}
          platforms: linux/amd64,linux/arm64,linux/arm/v7
--- a/caddy-cloudflare-crowdsec/Dockerfile
+++ b/caddy-cloudflare-crowdsec/Dockerfile
@@ -1,4 +1,4 @@
-FROM caddy:2.11.1-builder@sha256:4f2f7dc18c7451f8b560dde511f76bf69d3db63350485f919616c8f4397497d0 AS builder
+FROM caddy:2.10.2-builder@sha256:fbcbf6ec1f6d94bc85be547a4d46ac32d0d8119baeaffc383dee068ba332cb50 AS builder

 RUN xcaddy build \
    --with github.com/caddy-dns/cloudflare \
@@ -6,6 +6,6 @@ RUN xcaddy build \
    --with github.com/hslatman/caddy-crowdsec-bouncer/layer4 \
    --with github.com/hslatman/caddy-crowdsec-bouncer/appsec

-FROM caddy:2.11.1@sha256:01511babb51d90619d4a9919206d45b3e7fef645ba1ca9ff0fc298b4c80fac16
+FROM caddy:2.10.2@sha256:f20f80e1fb627294fb84b8515b7593aff8018c840f1396dc942a50ed0c2db648

 COPY --from=builder /usr/bin/caddy /usr/bin/caddy
--- a/caddy-cloudflare-ddns-crowdsec/Dockerfile
+++ b/caddy-cloudflare-ddns-crowdsec/Dockerfile
@@ -1,4 +1,4 @@
-FROM caddy:2.11.1-builder@sha256:4f2f7dc18c7451f8b560dde511f76bf69d3db63350485f919616c8f4397497d0 AS builder
+FROM caddy:2.10.2-builder@sha256:fbcbf6ec1f6d94bc85be547a4d46ac32d0d8119baeaffc383dee068ba332cb50 AS builder

 RUN xcaddy build \
    --with github.com/caddy-dns/cloudflare \
@@ -7,6 +7,6 @@ RUN xcaddy build \
    --with github.com/hslatman/caddy-crowdsec-bouncer/layer4 \
    --with github.com/hslatman/caddy-crowdsec-bouncer/appsec

-FROM caddy:2.11.1@sha256:01511babb51d90619d4a9919206d45b3e7fef645ba1ca9ff0fc298b4c80fac16
+FROM caddy:2.10.2@sha256:f20f80e1fb627294fb84b8515b7593aff8018c840f1396dc942a50ed0c2db648

 COPY --from=builder /usr/bin/caddy /usr/bin/caddy
--- a/caddy-cloudflare-ddns/Dockerfile
+++ b/caddy-cloudflare-ddns/Dockerfile
@@ -1,9 +1,9 @@
-FROM caddy:2.11.1-builder@sha256:4f2f7dc18c7451f8b560dde511f76bf69d3db63350485f919616c8f4397497d0 AS builder
+FROM caddy:2.10.2-builder@sha256:fbcbf6ec1f6d94bc85be547a4d46ac32d0d8119baeaffc383dee068ba332cb50 AS builder

 RUN xcaddy build \
    --with github.com/caddy-dns/cloudflare \
    --with github.com/mholt/caddy-dynamicdns

-FROM caddy:2.11.1@sha256:01511babb51d90619d4a9919206d45b3e7fef645ba1ca9ff0fc298b4c80fac16
+FROM caddy:2.10.2@sha256:f20f80e1fb627294fb84b8515b7593aff8018c840f1396dc942a50ed0c2db648

 COPY --from=builder /usr/bin/caddy /usr/bin/caddy
--- a/caddy-cloudflare/Dockerfile
+++ b/caddy-cloudflare/Dockerfile
@@ -1,8 +1,8 @@
-FROM caddy:2.11.1-builder@sha256:4f2f7dc18c7451f8b560dde511f76bf69d3db63350485f919616c8f4397497d0 AS builder
+FROM caddy:2.10.2-builder@sha256:fbcbf6ec1f6d94bc85be547a4d46ac32d0d8119baeaffc383dee068ba332cb50 AS builder

 RUN xcaddy build \
    --with github.com/caddy-dns/cloudflare

-FROM caddy:2.11.1@sha256:01511babb51d90619d4a9919206d45b3e7fef645ba1ca9ff0fc298b4c80fac16
+FROM caddy:2.10.2@sha256:f20f80e1fb627294fb84b8515b7593aff8018c840f1396dc942a50ed0c2db648

 COPY --from=builder /usr/bin/caddy /usr/bin/caddy
--- a/caddy-crowdsec/Dockerfile
+++ b/caddy-crowdsec/Dockerfile
@@ -1,10 +1,10 @@
-FROM caddy:2.11.1-builder@sha256:4f2f7dc18c7451f8b560dde511f76bf69d3db63350485f919616c8f4397497d0 AS builder
+FROM caddy:2.10.2-builder@sha256:fbcbf6ec1f6d94bc85be547a4d46ac32d0d8119baeaffc383dee068ba332cb50 AS builder

 RUN xcaddy build \
    --with github.com/hslatman/caddy-crowdsec-bouncer/http \
    --with github.com/hslatman/caddy-crowdsec-bouncer/layer4 \
    --with github.com/hslatman/caddy-crowdsec-bouncer/appsec

-FROM caddy:2.11.1@sha256:01511babb51d90619d4a9919206d45b3e7fef645ba1ca9ff0fc298b4c80fac16
+FROM caddy:2.10.2@sha256:f20f80e1fb627294fb84b8515b7593aff8018c840f1396dc942a50ed0c2db648

 COPY --from=builder /usr/bin/caddy /usr/bin/caddy