5 Commits

Author SHA1 Message Date
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
7 changed files with 50 additions and 74 deletions
+21 -38
View File
@@ -3,10 +3,10 @@ name: Build and Push Docker Images
on:
workflow_dispatch:
push:
branches: [ main ]
branches: [main]
paths:
- 'caddy-*/**'
- '.gitea/workflows/build-and-push.yml'
- "caddy-*/**"
- ".gitea/workflows/build-and-push.yml"
jobs:
build:
@@ -14,65 +14,49 @@ jobs:
strategy:
matrix:
variant:
- name: 'cloudflare'
dockerfile: 'caddy-cloudflare/Dockerfile'
context: 'caddy-cloudflare'
- name: 'cloudflare-crowdsec'
dockerfile: 'caddy-cloudflare-crowdsec/Dockerfile'
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'
- name: "cloudflare"
dockerfile: "caddy-cloudflare/Dockerfile"
context: "caddy-cloudflare"
- name: "cloudflare-crowdsec"
dockerfile: "caddy-cloudflare-crowdsec/Dockerfile"
context: "caddy-cloudflare-crowdsec"
fail-fast: true
steps:
-
name: Checkout code
uses: actions/checkout@v6.0.2
-
name: Parse Caddy version
- name: Checkout code
uses: actions/checkout@v6.0.3
- 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.0.0
-
name: Set up Docker Buildx
- name: Set up QEMU
uses: docker/setup-qemu-action@v4.1.0
- name: Set up Docker Buildx
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
- name: Login to GitHub Container Registry
uses: docker/login-action@v4.2.0
with:
registry: ghcr.io
username: ${{ vars.GH_USERNAME }}
password: ${{ secrets.GH_TOKEN }}
-
name: Login to Docker Hub
- name: Login to Docker Hub
uses: docker/login-action@v4.2.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
with:
@@ -85,8 +69,7 @@ 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
- name: Build and push
uses: docker/build-push-action@v7.2.0
with:
context: ${{ matrix.variant.context }}
+16 -25
View File
@@ -3,10 +3,10 @@ name: Build Test
on:
workflow_dispatch:
pull_request:
branches: [ main ]
branches: [main]
paths:
- 'caddy-*/**'
- '.gitea/workflows/**'
- "caddy-*/**"
- ".gitea/workflows/**"
jobs:
build:
@@ -14,43 +14,35 @@ jobs:
strategy:
matrix:
variant:
- name: 'cloudflare'
dockerfile: 'caddy-cloudflare/Dockerfile'
context: 'caddy-cloudflare'
- name: 'crowdsec'
dockerfile: 'caddy-crowdsec/Dockerfile'
context: 'caddy-crowdsec'
- name: "cloudflare"
dockerfile: "caddy-cloudflare/Dockerfile"
context: "caddy-cloudflare"
fail-fast: true
steps:
-
name: Checkout code
uses: actions/checkout@v6.0.2
-
name: Parse Caddy version
- name: Checkout code
uses: actions/checkout@v6.0.3
- 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.0.0
-
name: Set up Docker Buildx
- name: Set up QEMU
uses: docker/setup-qemu-action@v4.1.0
- name: Set up Docker Buildx
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
- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v6.1.0
with:
@@ -63,8 +55,7 @@ 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
- name: Build Test
uses: docker/build-push-action@v7.2.0
with:
context: ${{ matrix.variant.context }}
+3 -2
View File
@@ -1,11 +1,12 @@
FROM caddy:2.11.3-builder@sha256:f96a3b748f2ce4e5f6595453615da734b93993b231213fe35d0673893b5613ef 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 \
--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.3@sha256:ec18ee54aab3315c22e25f3b2babda73ff8007d39b13b3bd1bfffa2f0444c7d9
FROM caddy:2.11.4@sha256:cb9d71ad83182011b79355cd57692686374bd78d6fe327efe0ff8507da03ab13
COPY --from=builder /usr/bin/caddy /usr/bin/caddy
+2 -2
View File
@@ -1,4 +1,4 @@
FROM caddy:2.11.3-builder@sha256:f96a3b748f2ce4e5f6595453615da734b93993b231213fe35d0673893b5613ef 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.3@sha256:ec18ee54aab3315c22e25f3b2babda73ff8007d39b13b3bd1bfffa2f0444c7d9
FROM caddy:2.11.4@sha256:cb9d71ad83182011b79355cd57692686374bd78d6fe327efe0ff8507da03ab13
COPY --from=builder /usr/bin/caddy /usr/bin/caddy
+2 -2
View File
@@ -1,9 +1,9 @@
FROM caddy:2.11.3-builder@sha256:f96a3b748f2ce4e5f6595453615da734b93993b231213fe35d0673893b5613ef 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.3@sha256:ec18ee54aab3315c22e25f3b2babda73ff8007d39b13b3bd1bfffa2f0444c7d9
FROM caddy:2.11.4@sha256:cb9d71ad83182011b79355cd57692686374bd78d6fe327efe0ff8507da03ab13
COPY --from=builder /usr/bin/caddy /usr/bin/caddy
+4 -3
View File
@@ -1,8 +1,9 @@
FROM caddy:2.11.3-builder@sha256:f96a3b748f2ce4e5f6595453615da734b93993b231213fe35d0673893b5613ef AS builder
FROM caddy:2.11.4-builder@sha256:f2b98918658f949a3c533f2c73bd0806e3f2576ccf8eb182c8b1690c977007ea 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.3@sha256:ec18ee54aab3315c22e25f3b2babda73ff8007d39b13b3bd1bfffa2f0444c7d9
FROM caddy:2.11.4@sha256:cb9d71ad83182011b79355cd57692686374bd78d6fe327efe0ff8507da03ab13
COPY --from=builder /usr/bin/caddy /usr/bin/caddy
+2 -2
View File
@@ -1,10 +1,10 @@
FROM caddy:2.11.3-builder@sha256:f96a3b748f2ce4e5f6595453615da734b93993b231213fe35d0673893b5613ef 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.3@sha256:ec18ee54aab3315c22e25f3b2babda73ff8007d39b13b3bd1bfffa2f0444c7d9
FROM caddy:2.11.4@sha256:cb9d71ad83182011b79355cd57692686374bd78d6fe327efe0ff8507da03ab13
COPY --from=builder /usr/bin/caddy /usr/bin/caddy