Update caddy Docker tag to v2.11.3

.gitea/workflows/build-and-push.yml

@@ -3,10 +3,10 @@ name: Build and Push Docker Images
 on:
   workflow_dispatch:
   push:
-    branches: [main]
+    branches: [ main ]
     paths:
-      - "caddy-*/**"
+      - 'caddy-*/**'
-      - ".gitea/workflows/build-and-push.yml"
+      - '.gitea/workflows/build-and-push.yml'
 
 jobs:
   build:
@@ -14,51 +14,67 @@ jobs:
     strategy:
       matrix:
         variant:
-          - name: "cloudflare"
+          - name: 'cloudflare'
-            dockerfile: "caddy-cloudflare/Dockerfile"
+            dockerfile: 'caddy-cloudflare/Dockerfile'
-            context: "caddy-cloudflare"
+            context: 'caddy-cloudflare'
-          - name: "cloudflare-crowdsec"
+          - name: 'cloudflare-crowdsec'
-            dockerfile: "caddy-cloudflare-crowdsec/Dockerfile"
+            dockerfile: 'caddy-cloudflare-crowdsec/Dockerfile'
-            context: "caddy-cloudflare-crowdsec"
+            context: 'caddy-cloudflare-crowdsec'
+          - name: 'cloudflare-ddns'
+            dockerfile: 'caddy-cloudflare-ddns/Dockerfile'
+            context: 'caddy-cloudflare-ddns'
+          - name: 'cloudflare-ddns-crowdsec'
+            dockerfile: 'caddy-cloudflare-ddns-crowdsec/Dockerfile'
+            context: 'caddy-cloudflare-ddns-crowdsec'
+          - name: 'crowdsec'
+            dockerfile: 'caddy-crowdsec/Dockerfile'
+            context: 'caddy-crowdsec'
       fail-fast: true
 
     steps:
-      - name: Checkout code
+      - 
-        uses: actions/checkout@v6.0.3
+        name: Checkout code
-      - name: Parse Caddy version
+        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@v4.1.0
+        name: Set up QEMU
-      - name: Set up Docker Buildx
+        uses: docker/setup-qemu-action@v4.0.0
-        uses: docker/setup-buildx-action@v4.1.0
+      - 
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v4.0.0
         with:
           driver-opts: image=moby/buildkit:v0.23.2@sha256:ddd1ca44b21eda906e81ab14a3d467fa6c39cd73b9a39df1196210edcb8db59e
-      - name: Login to GitHub Container Registry
+      - 
-        uses: docker/login-action@v4.2.0
+        name: Login to GitHub Container Registry
+        uses: docker/login-action@v4.0.0
         with:
           registry: ghcr.io
           username: ${{ vars.GH_USERNAME }}
           password: ${{ secrets.GH_TOKEN }}
-      - name: Login to Docker Hub
+      - 
-        uses: docker/login-action@v4.2.0
+        name: Login to Docker Hub
+        uses: docker/login-action@v4.0.0
         with:
           username: ${{ vars.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Extract metadata (tags, labels) for Docker
+      - 
+        name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v6.1.0
+        uses: docker/metadata-action@v6.0.0
         with:
           images: |
             ghcr.io/${{ vars.GH_USERNAME }}/caddy-${{ matrix.variant.name }}
@@ -69,8 +85,9 @@ jobs:
             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@v7.2.0
+        name: Build and push
+        uses: docker/build-push-action@v7.0.0
         with:
           context: ${{ matrix.variant.context }}
           file: ${{ matrix.variant.dockerfile }}

.gitea/workflows/build-test.yml

@@ -3,10 +3,10 @@ name: Build Test
 on:
   workflow_dispatch:
   pull_request:
-    branches: [main]
+    branches: [ main ]
     paths:
-      - "caddy-*/**"
+      - 'caddy-*/**'
-      - ".gitea/workflows/**"
+      - '.gitea/workflows/**'
 
 jobs:
   build:
@@ -14,37 +14,45 @@ jobs:
     strategy:
       matrix:
         variant:
-          - name: "cloudflare"
+          - name: 'cloudflare'
-            dockerfile: "caddy-cloudflare/Dockerfile"
+            dockerfile: 'caddy-cloudflare/Dockerfile'
-            context: "caddy-cloudflare"
+            context: 'caddy-cloudflare'
+          - name: 'crowdsec'
+            dockerfile: 'caddy-crowdsec/Dockerfile'
+            context: 'caddy-crowdsec'
       fail-fast: true
 
     steps:
-      - name: Checkout code
+      - 
-        uses: actions/checkout@v6.0.3
+        name: Checkout code
-      - name: Parse Caddy version
+        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@v4.1.0
+        name: Set up QEMU
-      - name: Set up Docker Buildx
+        uses: docker/setup-qemu-action@v4.0.0
-        uses: docker/setup-buildx-action@v4.1.0
+      - 
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v4.0.0
         with:
           driver-opts: image=moby/buildkit:v0.23.2@sha256:ddd1ca44b21eda906e81ab14a3d467fa6c39cd73b9a39df1196210edcb8db59e
-      - name: Extract metadata (tags, labels) for Docker
+      - 
+        name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v6.1.0
+        uses: docker/metadata-action@v6.0.0
         with:
           images: |
             ghcr.io/${{ vars.GH_USERNAME }}/caddy-${{ matrix.variant.name }}
@@ -55,8 +63,9 @@ jobs:
             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@v7.2.0
+        name: Build Test
+        uses: docker/build-push-action@v7.0.0
         with:
           context: ${{ matrix.variant.context }}
           file: ${{ matrix.variant.dockerfile }}

caddy-cloudflare-crowdsec/Dockerfile

@@ -1,12 +1,11 @@
-FROM caddy:2.11.4-builder@sha256:ea6e54f62d2033b80747b022923ae0dd4f817ec4eefa2ca3a34cbebf16b6468c AS builder
+FROM caddy:2.11.3-builder@sha256:f96a3b748f2ce4e5f6595453615da734b93993b231213fe35d0673893b5613ef AS builder
 
 RUN xcaddy build \
     --with github.com/caddy-dns/cloudflare \
-    --with github.com/mholt/caddy-l4/modules/l4proxy \
     --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.4@sha256:cb9d71ad83182011b79355cd57692686374bd78d6fe327efe0ff8507da03ab13
+FROM caddy:2.11.3@sha256:ec18ee54aab3315c22e25f3b2babda73ff8007d39b13b3bd1bfffa2f0444c7d9
 
 COPY --from=builder /usr/bin/caddy /usr/bin/caddy

caddy-cloudflare-ddns-crowdsec/Dockerfile

@@ -1,4 +1,4 @@
-FROM caddy:2.11.4-builder@sha256:ea6e54f62d2033b80747b022923ae0dd4f817ec4eefa2ca3a34cbebf16b6468c AS builder
+FROM caddy:2.11.3-builder@sha256:f96a3b748f2ce4e5f6595453615da734b93993b231213fe35d0673893b5613ef 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.4@sha256:cb9d71ad83182011b79355cd57692686374bd78d6fe327efe0ff8507da03ab13
+FROM caddy:2.11.3@sha256:ec18ee54aab3315c22e25f3b2babda73ff8007d39b13b3bd1bfffa2f0444c7d9
 
 COPY --from=builder /usr/bin/caddy /usr/bin/caddy

caddy-cloudflare-ddns/Dockerfile

@@ -1,9 +1,9 @@
-FROM caddy:2.11.4-builder@sha256:ea6e54f62d2033b80747b022923ae0dd4f817ec4eefa2ca3a34cbebf16b6468c AS builder
+FROM caddy:2.11.3-builder@sha256:f96a3b748f2ce4e5f6595453615da734b93993b231213fe35d0673893b5613ef AS builder
 
 RUN xcaddy build \
     --with github.com/caddy-dns/cloudflare \
     --with github.com/mholt/caddy-dynamicdns
 
-FROM caddy:2.11.4@sha256:cb9d71ad83182011b79355cd57692686374bd78d6fe327efe0ff8507da03ab13
+FROM caddy:2.11.3@sha256:ec18ee54aab3315c22e25f3b2babda73ff8007d39b13b3bd1bfffa2f0444c7d9
 
 COPY --from=builder /usr/bin/caddy /usr/bin/caddy

caddy-cloudflare/Dockerfile

@@ -1,9 +1,8 @@
-FROM caddy:2.11.4-builder@sha256:ea6e54f62d2033b80747b022923ae0dd4f817ec4eefa2ca3a34cbebf16b6468c AS builder
+FROM caddy:2.11.3-builder@sha256:f96a3b748f2ce4e5f6595453615da734b93993b231213fe35d0673893b5613ef AS builder
 
 RUN xcaddy build \
-    --with github.com/caddy-dns/cloudflare \
+    --with github.com/caddy-dns/cloudflare
-    --with github.com/mholt/caddy-l4/modules/l4proxy
 
-FROM caddy:2.11.4@sha256:cb9d71ad83182011b79355cd57692686374bd78d6fe327efe0ff8507da03ab13
+FROM caddy:2.11.3@sha256:ec18ee54aab3315c22e25f3b2babda73ff8007d39b13b3bd1bfffa2f0444c7d9
 
 COPY --from=builder /usr/bin/caddy /usr/bin/caddy

caddy-crowdsec/Dockerfile

@@ -1,10 +1,10 @@
-FROM caddy:2.11.4-builder@sha256:ea6e54f62d2033b80747b022923ae0dd4f817ec4eefa2ca3a34cbebf16b6468c AS builder
+FROM caddy:2.11.3-builder@sha256:f96a3b748f2ce4e5f6595453615da734b93993b231213fe35d0673893b5613ef 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.4@sha256:cb9d71ad83182011b79355cd57692686374bd78d6fe327efe0ff8507da03ab13
+FROM caddy:2.11.3@sha256:ec18ee54aab3315c22e25f3b2babda73ff8007d39b13b3bd1bfffa2f0444c7d9
 
 COPY --from=builder /usr/bin/caddy /usr/bin/caddy