Update docker/login-action action to v4.4.0

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

@@ -10,7 +10,7 @@ on:
 
 jobs:
   build:
-    runs-on: temp
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         variant:
@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v7.0.0
+        uses: actions/checkout@v6.0.3
       - name: Parse Caddy version
         id: version
         run: |
@@ -40,9 +40,9 @@ jobs:
           echo "minor_version=$MINOR" >> $GITHUB_OUTPUT
           echo "Major: $MAJOR, Minor: $MINOR"
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v4.2.0
+        uses: docker/setup-qemu-action@v4.1.0
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v4.2.0
+        uses: docker/setup-buildx-action@v4.1.0
         with:
           driver-opts: image=moby/buildkit:v0.23.2@sha256:ddd1ca44b21eda906e81ab14a3d467fa6c39cd73b9a39df1196210edcb8db59e
       - name: Login to GitHub Container Registry
@@ -58,7 +58,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v6.2.0
+        uses: docker/metadata-action@v6.1.0
         with:
           images: |
             ghcr.io/${{ vars.GH_USERNAME }}/caddy-${{ matrix.variant.name }}
@@ -70,11 +70,15 @@ jobs:
             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.3.0
+        uses: docker/build-push-action@v7.2.0
         with:
           context: ${{ matrix.variant.context }}
           file: ${{ matrix.variant.dockerfile }}
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          build-args: |
+            BUILDKIT_INLINE_CACHE=1

.gitea/workflows/build-test.yml

@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v7.0.0
+        uses: actions/checkout@v6.0.3
       - name: Parse Caddy version
         id: version
         run: |
@@ -37,14 +37,14 @@ jobs:
           echo "minor_version=$MINOR" >> $GITHUB_OUTPUT
           echo "Major: $MAJOR, Minor: $MINOR"
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v4.2.0
+        uses: docker/setup-qemu-action@v4.1.0
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v4.2.0
+        uses: docker/setup-buildx-action@v4.1.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@v6.2.0
+        uses: docker/metadata-action@v6.1.0
         with:
           images: |
             ghcr.io/${{ vars.GH_USERNAME }}/caddy-${{ matrix.variant.name }}
@@ -56,7 +56,7 @@ jobs:
             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.3.0
+        uses: docker/build-push-action@v7.2.0
         with:
           context: ${{ matrix.variant.context }}
           file: ${{ matrix.variant.dockerfile }}

.gitea/workflows/test.yml

@@ -1,80 +0,0 @@
-name: Build and Push Docker Images
-
-on:
-  workflow_dispatch:
-  push:
-    branches: [main]
-    paths:
-      - ".gitea/workflows/test.yml"
-
-jobs:
-  build:
-    runs-on: temp
-    strategy:
-      matrix:
-        variant:
-          - name: "cloudflare"
-            dockerfile: "caddy-cloudflare/Dockerfile"
-            context: "caddy-cloudflare"
-      fail-fast: true
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v7.0.0
-      - 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.2.0
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v4.2.0
-        with:
-          driver-opts: image=moby/buildkit:v0.23.2@sha256:ddd1ca44b21eda906e81ab14a3d467fa6c39cd73b9a39df1196210edcb8db59e
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v4.4.0
-        with:
-          registry: ghcr.io
-          username: ${{ vars.GH_USERNAME }}
-          password: ${{ secrets.GH_TOKEN }}
-      - name: Login to Docker Hub
-        uses: docker/login-action@v4.4.0
-        with:
-          username: ${{ vars.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v6.2.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 and push
-        uses: docker/build-push-action@v7.3.0
-        with:
-          context: ${{ matrix.variant.context }}
-          file: ${{ matrix.variant.dockerfile }}
-          push: false
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          # platforms: linux/amd64,linux/arm64
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-          build-args: |
-            BUILDKIT_INLINE_CACHE=1

caddy-cloudflare-crowdsec/Dockerfile

@@ -1,4 +1,4 @@
-FROM caddy:2.11.4-builder@sha256:198d47eaee306d4d0c38a9960c89ff2c959aa29ad51d3e2dafa3e93ac961782a AS builder
+FROM caddy:2.11.4-builder@sha256:f2b98918658f949a3c533f2c73bd0806e3f2576ccf8eb182c8b1690c977007ea 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:af5fdcd76f2db5e4e974ee92f96ee8c0fc3edb55bd4ba5032547cbf3f65e486d
+FROM caddy:2.11.4@sha256:cb9d71ad83182011b79355cd57692686374bd78d6fe327efe0ff8507da03ab13
 
 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:198d47eaee306d4d0c38a9960c89ff2c959aa29ad51d3e2dafa3e93ac961782a AS builder
+FROM caddy:2.11.4-builder@sha256:f2b98918658f949a3c533f2c73bd0806e3f2576ccf8eb182c8b1690c977007ea 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:af5fdcd76f2db5e4e974ee92f96ee8c0fc3edb55bd4ba5032547cbf3f65e486d
+FROM caddy:2.11.4@sha256:cb9d71ad83182011b79355cd57692686374bd78d6fe327efe0ff8507da03ab13
 
 COPY --from=builder /usr/bin/caddy /usr/bin/caddy

caddy-cloudflare-ddns/Dockerfile

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

caddy-cloudflare/Dockerfile

@@ -1,9 +1,9 @@
-FROM caddy:2.11.4-builder@sha256:198d47eaee306d4d0c38a9960c89ff2c959aa29ad51d3e2dafa3e93ac961782a AS builder
+FROM caddy:2.11.4-builder@sha256:f2b98918658f949a3c533f2c73bd0806e3f2576ccf8eb182c8b1690c977007ea AS builder
 
 RUN xcaddy build \
     --with github.com/caddy-dns/cloudflare \
     --with github.com/mholt/caddy-l4/modules/l4proxy
 
-FROM caddy:2.11.4@sha256:af5fdcd76f2db5e4e974ee92f96ee8c0fc3edb55bd4ba5032547cbf3f65e486d
+FROM caddy:2.11.4@sha256:cb9d71ad83182011b79355cd57692686374bd78d6fe327efe0ff8507da03ab13
 
 COPY --from=builder /usr/bin/caddy /usr/bin/caddy

caddy-crowdsec/Dockerfile

@@ -1,10 +1,10 @@
-FROM caddy:2.11.4-builder@sha256:198d47eaee306d4d0c38a9960c89ff2c959aa29ad51d3e2dafa3e93ac961782a AS builder
+FROM caddy:2.11.4-builder@sha256:f2b98918658f949a3c533f2c73bd0806e3f2576ccf8eb182c8b1690c977007ea 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:af5fdcd76f2db5e4e974ee92f96ee8c0fc3edb55bd4ba5032547cbf3f65e486d
+FROM caddy:2.11.4@sha256:cb9d71ad83182011b79355cd57692686374bd78d6fe327efe0ff8507da03ab13
 
 COPY --from=builder /usr/bin/caddy /usr/bin/caddy