19 Commits

Author SHA1 Message Date
renovate-bot 414fa9b388 Update caddy:2.11.4-builder Docker digest to ea6e54f
Build Test / build (map[context:caddy-cloudflare dockerfile:caddy-cloudflare/Dockerfile name:cloudflare]) (pull_request) Successful in 4m45s
2026-06-11 02:33:02 +00:00
ryuupendragon d339a1c66b Add layer 4 proxy module
Build and Push Docker Images / build (map[context:caddy-cloudflare dockerfile:caddy-cloudflare/Dockerfile name:cloudflare]) (push) Successful in 1h32m51s
Build and Push Docker Images / build (map[context:caddy-cloudflare-crowdsec dockerfile:caddy-cloudflare-crowdsec/Dockerfile name:cloudflare-crowdsec]) (push) Successful in 1h36m53s
2026-06-04 21:05:13 +05:30
ryuupendragon 52f1fcf266 Remove unneeded builds 2026-06-04 21:03:37 +05:30
ryuupendragon c25b716828 Squashed commit of the following:
commit 49b27383d3
Author: Renovate Bot <renovate@sh.ryuu.in>
Date:   Thu Jun 4 14:41:04 2026 +0000

    Update caddy Docker tag to v2.11.4
2026-06-04 21:00:58 +05:30
ryuupendragon e7f9281019 Squashed commit of the following:
commit 5e7fdb6333
Author: Renovate Bot <renovate@sh.ryuu.in>
Date:   Thu May 28 02:31:07 2026 +0000

    Update docker/setup-qemu-action action to v4.1.0
2026-06-04 21:00:19 +05:30
ryuupendragon 0dc98d67e8 Squashed commit of the following:
commit ded987322b
Author: Renovate Bot <renovate@sh.ryuu.in>
Date:   Wed Jun 3 13:52:58 2026 +0000

    Update actions/checkout action to v6.0.3
2026-06-04 20:59:29 +05:30
ryuupendragon 19348dc1cb Squashed commit of the following:
Build and Push Docker Images / build (map[context:caddy-cloudflare dockerfile:caddy-cloudflare/Dockerfile name:cloudflare]) (push) Successful in 1h26m48s
Build and Push Docker Images / build (map[context:caddy-cloudflare-crowdsec dockerfile:caddy-cloudflare-crowdsec/Dockerfile name:cloudflare-crowdsec]) (push) Successful in 1h35m37s
Build and Push Docker Images / build (map[context:caddy-cloudflare-ddns dockerfile:caddy-cloudflare-ddns/Dockerfile name:cloudflare-ddns]) (push) Successful in 1h28m42s
Build and Push Docker Images / build (map[context:caddy-cloudflare-ddns-crowdsec dockerfile:caddy-cloudflare-ddns-crowdsec/Dockerfile name:cloudflare-ddns-crowdsec]) (push) Successful in 1h36m15s
Build and Push Docker Images / build (map[context:caddy-crowdsec dockerfile:caddy-crowdsec/Dockerfile name:crowdsec]) (push) Successful in 55m34s
commit 2e64ea66a5
Author: Renovate Bot <renovate@sh.ryuu.in>
Date:   Thu May 14 08:32:58 2026 +0000

    Update caddy Docker tag to v2.11.3
2026-05-23 17:17:35 +05:30
ryuupendragon 3ef710295a Squashed commit of the following:
commit 189f470c29
Author: Renovate Bot <renovate@sh.ryuu.in>
Date:   Fri May 22 02:31:32 2026 +0000

    Update docker/build-push-action action to v7.2.0
2026-05-23 17:16:18 +05:30
ryuupendragon d445518d59 Squashed commit of the following:
commit 8658fd842c
Author: Renovate Bot <renovate@sh.ryuu.in>
Date:   Sat May 23 02:31:34 2026 +0000

    Update docker/login-action action to v4.2.0
2026-05-23 17:15:53 +05:30
ryuupendragon faa27bb354 Squashed commit of the following:
commit ed72e35e04
Author: Renovate Bot <renovate@sh.ryuu.in>
Date:   Sat May 23 02:31:36 2026 +0000

    Update docker/metadata-action action to v6.1.0
2026-05-23 17:15:33 +05:30
ryuupendragon a0411f8b9c Squashed commit of the following:
commit 756006d5c3
Author: Renovate Bot <renovate@sh.ryuu.in>
Date:   Sat May 23 02:31:38 2026 +0000

    Update docker/setup-buildx-action action to v4.1.0
2026-05-23 17:14:52 +05:30
ryuupendragon f4f114113d Squashed commit of the following:
Build and Push Docker Images / build (map[context:caddy-cloudflare dockerfile:caddy-cloudflare/Dockerfile name:cloudflare]) (push) Successful in 1h22m33s
Build and Push Docker Images / build (map[context:caddy-cloudflare-crowdsec dockerfile:caddy-cloudflare-crowdsec/Dockerfile name:cloudflare-crowdsec]) (push) Successful in 1h30m44s
Build and Push Docker Images / build (map[context:caddy-cloudflare-ddns dockerfile:caddy-cloudflare-ddns/Dockerfile name:cloudflare-ddns]) (push) Successful in 1h22m16s
Build and Push Docker Images / build (map[context:caddy-cloudflare-ddns-crowdsec dockerfile:caddy-cloudflare-ddns-crowdsec/Dockerfile name:cloudflare-ddns-crowdsec]) (push) Successful in 1h32m37s
Build and Push Docker Images / build (map[context:caddy-crowdsec dockerfile:caddy-crowdsec/Dockerfile name:crowdsec]) (push) Successful in 51m25s
commit 70567827da
Author: Renovate Bot <renovate@sh.ryuu.in>
Date:   Wed Mar 11 02:30:52 2026 +0000

    Update caddy:2.11.2-builder Docker digest to 84dfc34
2026-04-02 18:37:55 +05:30
ryuupendragon 7466a0236f Squashed commit of the following:
commit 406c6f15e2
Author: Renovate Bot <renovate@sh.ryuu.in>
Date:   Wed Mar 11 02:30:50 2026 +0000

    Update caddy:2.11.2 Docker digest to 1e40b25
2026-04-02 18:37:46 +05:30
ryuupendragon cc270c1d0f Squashed commit of the following:
Build and Push Docker Images / build (map[context:caddy-cloudflare dockerfile:caddy-cloudflare/Dockerfile name:cloudflare]) (push) Successful in 1h26m19s
Build and Push Docker Images / build (map[context:caddy-cloudflare-ddns dockerfile:caddy-cloudflare-ddns/Dockerfile name:cloudflare-ddns]) (push) Successful in 1h29m15s
Build and Push Docker Images / build (map[context:caddy-cloudflare-crowdsec dockerfile:caddy-cloudflare-crowdsec/Dockerfile name:cloudflare-crowdsec]) (push) Successful in 1h34m51s
Build and Push Docker Images / build (map[context:caddy-crowdsec dockerfile:caddy-crowdsec/Dockerfile name:crowdsec]) (push) Failing after 27m0s
Build and Push Docker Images / build (map[context:caddy-cloudflare-ddns-crowdsec dockerfile:caddy-cloudflare-ddns-crowdsec/Dockerfile name:cloudflare-ddns-crowdsec]) (push) Failing after 30m0s
commit 97fefbcdb4
Author: Renovate Bot <renovate@sh.ryuu.in>
Date:   Sat Mar 7 02:31:29 2026 +0000

    Update caddy Docker tag to v2.11.2
2026-03-10 20:20:49 +05:30
ryuupendragon f3211194c3 Squashed commit of the following:
commit 87a4f7b7f4
Author: Renovate Bot <renovate@sh.ryuu.in>
Date:   Sat Mar 7 02:31:34 2026 +0000

    Update docker/setup-buildx-action action to v4
2026-03-10 20:20:18 +05:30
ryuupendragon 50237be079 Squashed commit of the following:
commit b198143da4
Author: Renovate Bot <renovate@sh.ryuu.in>
Date:   Fri Mar 6 02:31:05 2026 +0000

    Update docker/metadata-action action to v6
2026-03-10 20:19:49 +05:30
ryuupendragon ccdfa543c4 Squashed commit of the following:
commit 7c9d2baa85
Author: Renovate Bot <renovate@sh.ryuu.in>
Date:   Fri Mar 6 02:31:01 2026 +0000

    Update docker/build-push-action action to v7
2026-03-10 20:19:18 +05:30
ryuupendragon 4df7907594 Squashed commit of the following:
commit 9d7c8912f7
Author: Renovate Bot <renovate@sh.ryuu.in>
Date:   Thu Mar 5 02:31:22 2026 +0000

    Update docker/setup-qemu-action action to v4
2026-03-10 20:18:38 +05:30
ryuupendragon ce29cc5963 Squashed commit of the following:
commit 69a92de51e
Author: Renovate Bot <renovate@sh.ryuu.in>
Date:   Thu Mar 5 02:31:19 2026 +0000

    Update docker/login-action action to v4
2026-03-10 20:17:51 +05:30
7 changed files with 58 additions and 82 deletions
+24 -41
View File
@@ -3,10 +3,10 @@ name: Build and Push Docker Images
on: on:
workflow_dispatch: workflow_dispatch:
push: push:
branches: [ main ] branches: [main]
paths: paths:
- 'caddy-*/**' - "caddy-*/**"
- '.gitea/workflows/build-and-push.yml' - ".gitea/workflows/build-and-push.yml"
jobs: jobs:
build: build:
@@ -14,29 +14,18 @@ jobs:
strategy: strategy:
matrix: matrix:
variant: 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 fail-fast: true
steps: steps:
- - name: Checkout code
name: Checkout code uses: actions/checkout@v6.0.3
uses: actions/checkout@v6.0.2 - name: Parse Caddy version
-
name: Parse Caddy version
id: version id: version
run: | run: |
VERSION=$(grep -m 1 -Eo 'caddy:[0-9]+\.[0-9]+\.[0-9]' caddy-cloudflare/Dockerfile | cut -d ':' -f2) VERSION=$(grep -m 1 -Eo 'caddy:[0-9]+\.[0-9]+\.[0-9]' caddy-cloudflare/Dockerfile | cut -d ':' -f2)
@@ -50,31 +39,26 @@ jobs:
echo "major_version=$MAJOR" >> $GITHUB_OUTPUT echo "major_version=$MAJOR" >> $GITHUB_OUTPUT
echo "minor_version=$MINOR" >> $GITHUB_OUTPUT echo "minor_version=$MINOR" >> $GITHUB_OUTPUT
echo "Major: $MAJOR, Minor: $MINOR" echo "Major: $MAJOR, Minor: $MINOR"
- - name: Set up QEMU
name: Set up QEMU uses: docker/setup-qemu-action@v4.1.0
uses: docker/setup-qemu-action@v3.7.0 - name: Set up Docker Buildx
- uses: docker/setup-buildx-action@v4.1.0
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3.12.0
with: with:
driver-opts: image=moby/buildkit:v0.23.2@sha256:ddd1ca44b21eda906e81ab14a3d467fa6c39cd73b9a39df1196210edcb8db59e driver-opts: image=moby/buildkit:v0.23.2@sha256:ddd1ca44b21eda906e81ab14a3d467fa6c39cd73b9a39df1196210edcb8db59e
- - name: Login to GitHub Container Registry
name: Login to GitHub Container Registry uses: docker/login-action@v4.2.0
uses: docker/login-action@v3.7.0
with: with:
registry: ghcr.io registry: ghcr.io
username: ${{ vars.GH_USERNAME }} username: ${{ vars.GH_USERNAME }}
password: ${{ secrets.GH_TOKEN }} password: ${{ secrets.GH_TOKEN }}
- - name: Login to Docker Hub
name: Login to Docker Hub uses: docker/login-action@v4.2.0
uses: docker/login-action@v3.7.0
with: with:
username: ${{ vars.DOCKERHUB_USERNAME }} username: ${{ vars.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }} password: ${{ secrets.DOCKERHUB_TOKEN }}
- - name: Extract metadata (tags, labels) for Docker
name: Extract metadata (tags, labels) for Docker
id: meta id: meta
uses: docker/metadata-action@v5.10.0 uses: docker/metadata-action@v6.1.0
with: with:
images: | images: |
ghcr.io/${{ vars.GH_USERNAME }}/caddy-${{ matrix.variant.name }} ghcr.io/${{ vars.GH_USERNAME }}/caddy-${{ matrix.variant.name }}
@@ -85,9 +69,8 @@ jobs:
type=raw,value=${{ steps.version.outputs.major_version }} type=raw,value=${{ steps.version.outputs.major_version }}
type=raw,value=${{ steps.version.outputs.minor_version }} type=raw,value=${{ steps.version.outputs.minor_version }}
type=raw,value=${{ steps.version.outputs.version }},priority=1000 type=raw,value=${{ steps.version.outputs.version }},priority=1000
- - name: Build and push
name: Build and push uses: docker/build-push-action@v7.2.0
uses: docker/build-push-action@v6.19.2
with: with:
context: ${{ matrix.variant.context }} context: ${{ matrix.variant.context }}
file: ${{ matrix.variant.dockerfile }} file: ${{ matrix.variant.dockerfile }}
+17 -26
View File
@@ -3,10 +3,10 @@ name: Build Test
on: on:
workflow_dispatch: workflow_dispatch:
pull_request: pull_request:
branches: [ main ] branches: [main]
paths: paths:
- 'caddy-*/**' - "caddy-*/**"
- '.gitea/workflows/**' - ".gitea/workflows/**"
jobs: jobs:
build: build:
@@ -14,20 +14,15 @@ jobs:
strategy: strategy:
matrix: matrix:
variant: 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 fail-fast: true
steps: steps:
- - name: Checkout code
name: Checkout code uses: actions/checkout@v6.0.3
uses: actions/checkout@v6.0.2 - name: Parse Caddy version
-
name: Parse Caddy version
id: version id: version
run: | run: |
VERSION=$(grep -m 1 -Eo 'caddy:[0-9]+\.[0-9]+\.[0-9]' caddy-cloudflare/Dockerfile | cut -d ':' -f2) VERSION=$(grep -m 1 -Eo 'caddy:[0-9]+\.[0-9]+\.[0-9]' caddy-cloudflare/Dockerfile | cut -d ':' -f2)
@@ -41,18 +36,15 @@ jobs:
echo "major_version=$MAJOR" >> $GITHUB_OUTPUT echo "major_version=$MAJOR" >> $GITHUB_OUTPUT
echo "minor_version=$MINOR" >> $GITHUB_OUTPUT echo "minor_version=$MINOR" >> $GITHUB_OUTPUT
echo "Major: $MAJOR, Minor: $MINOR" echo "Major: $MAJOR, Minor: $MINOR"
- - name: Set up QEMU
name: Set up QEMU uses: docker/setup-qemu-action@v4.1.0
uses: docker/setup-qemu-action@v3.7.0 - name: Set up Docker Buildx
- uses: docker/setup-buildx-action@v4.1.0
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3.12.0
with: with:
driver-opts: image=moby/buildkit:v0.23.2@sha256:ddd1ca44b21eda906e81ab14a3d467fa6c39cd73b9a39df1196210edcb8db59e 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 id: meta
uses: docker/metadata-action@v5.10.0 uses: docker/metadata-action@v6.1.0
with: with:
images: | images: |
ghcr.io/${{ vars.GH_USERNAME }}/caddy-${{ matrix.variant.name }} ghcr.io/${{ vars.GH_USERNAME }}/caddy-${{ matrix.variant.name }}
@@ -63,9 +55,8 @@ jobs:
type=raw,value=${{ steps.version.outputs.major_version }} type=raw,value=${{ steps.version.outputs.major_version }}
type=raw,value=${{ steps.version.outputs.minor_version }} type=raw,value=${{ steps.version.outputs.minor_version }}
type=raw,value=${{ steps.version.outputs.version }},priority=1000 type=raw,value=${{ steps.version.outputs.version }},priority=1000
- - name: Build Test
name: Build Test uses: docker/build-push-action@v7.2.0
uses: docker/build-push-action@v6.19.2
with: with:
context: ${{ matrix.variant.context }} context: ${{ matrix.variant.context }}
file: ${{ matrix.variant.dockerfile }} file: ${{ matrix.variant.dockerfile }}
+3 -2
View File
@@ -1,11 +1,12 @@
FROM caddy:2.11.1-builder@sha256:9780b126deae015b2c262fa9f4f1f951577e1f6a5fe4d88c0573aeb622071b2d AS builder FROM caddy:2.11.4-builder@sha256:ea6e54f62d2033b80747b022923ae0dd4f817ec4eefa2ca3a34cbebf16b6468c AS builder
RUN xcaddy build \ RUN xcaddy build \
--with github.com/caddy-dns/cloudflare \ --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/http \
--with github.com/hslatman/caddy-crowdsec-bouncer/layer4 \ --with github.com/hslatman/caddy-crowdsec-bouncer/layer4 \
--with github.com/hslatman/caddy-crowdsec-bouncer/appsec --with github.com/hslatman/caddy-crowdsec-bouncer/appsec
FROM caddy:2.11.1@sha256:9068f76202c0a03545036d32bf2d424d3b46c1174f254070f605002a2dbc9657 FROM caddy:2.11.4@sha256:cb9d71ad83182011b79355cd57692686374bd78d6fe327efe0ff8507da03ab13
COPY --from=builder /usr/bin/caddy /usr/bin/caddy COPY --from=builder /usr/bin/caddy /usr/bin/caddy
+2 -2
View File
@@ -1,4 +1,4 @@
FROM caddy:2.11.1-builder@sha256:9780b126deae015b2c262fa9f4f1f951577e1f6a5fe4d88c0573aeb622071b2d AS builder FROM caddy:2.11.4-builder@sha256:ea6e54f62d2033b80747b022923ae0dd4f817ec4eefa2ca3a34cbebf16b6468c AS builder
RUN xcaddy build \ RUN xcaddy build \
--with github.com/caddy-dns/cloudflare \ --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/layer4 \
--with github.com/hslatman/caddy-crowdsec-bouncer/appsec --with github.com/hslatman/caddy-crowdsec-bouncer/appsec
FROM caddy:2.11.1@sha256:9068f76202c0a03545036d32bf2d424d3b46c1174f254070f605002a2dbc9657 FROM caddy:2.11.4@sha256:cb9d71ad83182011b79355cd57692686374bd78d6fe327efe0ff8507da03ab13
COPY --from=builder /usr/bin/caddy /usr/bin/caddy COPY --from=builder /usr/bin/caddy /usr/bin/caddy
+2 -2
View File
@@ -1,9 +1,9 @@
FROM caddy:2.11.1-builder@sha256:9780b126deae015b2c262fa9f4f1f951577e1f6a5fe4d88c0573aeb622071b2d AS builder FROM caddy:2.11.4-builder@sha256:ea6e54f62d2033b80747b022923ae0dd4f817ec4eefa2ca3a34cbebf16b6468c AS builder
RUN xcaddy build \ RUN xcaddy build \
--with github.com/caddy-dns/cloudflare \ --with github.com/caddy-dns/cloudflare \
--with github.com/mholt/caddy-dynamicdns --with github.com/mholt/caddy-dynamicdns
FROM caddy:2.11.1@sha256:9068f76202c0a03545036d32bf2d424d3b46c1174f254070f605002a2dbc9657 FROM caddy:2.11.4@sha256:cb9d71ad83182011b79355cd57692686374bd78d6fe327efe0ff8507da03ab13
COPY --from=builder /usr/bin/caddy /usr/bin/caddy COPY --from=builder /usr/bin/caddy /usr/bin/caddy
+4 -3
View File
@@ -1,8 +1,9 @@
FROM caddy:2.11.1-builder@sha256:9780b126deae015b2c262fa9f4f1f951577e1f6a5fe4d88c0573aeb622071b2d AS builder FROM caddy:2.11.4-builder@sha256:ea6e54f62d2033b80747b022923ae0dd4f817ec4eefa2ca3a34cbebf16b6468c AS builder
RUN xcaddy build \ 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.1@sha256:9068f76202c0a03545036d32bf2d424d3b46c1174f254070f605002a2dbc9657 FROM caddy:2.11.4@sha256:cb9d71ad83182011b79355cd57692686374bd78d6fe327efe0ff8507da03ab13
COPY --from=builder /usr/bin/caddy /usr/bin/caddy COPY --from=builder /usr/bin/caddy /usr/bin/caddy
+2 -2
View File
@@ -1,10 +1,10 @@
FROM caddy:2.11.1-builder@sha256:9780b126deae015b2c262fa9f4f1f951577e1f6a5fe4d88c0573aeb622071b2d AS builder FROM caddy:2.11.4-builder@sha256:ea6e54f62d2033b80747b022923ae0dd4f817ec4eefa2ca3a34cbebf16b6468c AS builder
RUN xcaddy build \ RUN xcaddy build \
--with github.com/hslatman/caddy-crowdsec-bouncer/http \ --with github.com/hslatman/caddy-crowdsec-bouncer/http \
--with github.com/hslatman/caddy-crowdsec-bouncer/layer4 \ --with github.com/hslatman/caddy-crowdsec-bouncer/layer4 \
--with github.com/hslatman/caddy-crowdsec-bouncer/appsec --with github.com/hslatman/caddy-crowdsec-bouncer/appsec
FROM caddy:2.11.1@sha256:9068f76202c0a03545036d32bf2d424d3b46c1174f254070f605002a2dbc9657 FROM caddy:2.11.4@sha256:cb9d71ad83182011b79355cd57692686374bd78d6fe327efe0ff8507da03ab13
COPY --from=builder /usr/bin/caddy /usr/bin/caddy COPY --from=builder /usr/bin/caddy /usr/bin/caddy