16 Commits

Author SHA1 Message Date
406c6f15e2 Update caddy:2.11.2 Docker digest to 1e40b25
All checks were successful
Build Test / build (map[context:caddy-crowdsec dockerfile:caddy-crowdsec/Dockerfile name:crowdsec]) (pull_request) Successful in 29s
Build Test / build (map[context:caddy-cloudflare dockerfile:caddy-cloudflare/Dockerfile name:cloudflare]) (pull_request) Successful in 5m12s
2026-03-11 02:30:50 +00:00
cc270c1d0f Squashed commit of the following:
Some checks failed
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
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
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
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
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
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
b4ac64822f Manually update caddy:2.10.2-builder for solving renovate issue
Some checks failed
Build and Push Docker Images / build (map[context:caddy-cloudflare-ddns dockerfile:caddy-cloudflare-ddns/Dockerfile name:cloudflare-ddns]) (push) Has been cancelled
Build and Push Docker Images / build (map[context:caddy-cloudflare-ddns-crowdsec dockerfile:caddy-cloudflare-ddns-crowdsec/Dockerfile name:cloudflare-ddns-crowdsec]) (push) Has been cancelled
Build and Push Docker Images / build (map[context:caddy-crowdsec dockerfile:caddy-crowdsec/Dockerfile name:crowdsec]) (push) Has been cancelled
Build and Push Docker Images / build (map[context:caddy-cloudflare dockerfile:caddy-cloudflare/Dockerfile name:cloudflare]) (push) Has been cancelled
Build and Push Docker Images / build (map[context:caddy-cloudflare-crowdsec dockerfile:caddy-cloudflare-crowdsec/Dockerfile name:cloudflare-crowdsec]) (push) Has been cancelled
2026-02-13 17:18:47 +05:30
593b38fbc0 Update fail-fast to true and change trigger for main WF
All checks were successful
Build and Push Docker Images / build (map[context:caddy-cloudflare dockerfile:caddy-cloudflare/Dockerfile name:cloudflare]) (push) Successful in 49m24s
Build and Push Docker Images / build (map[context:caddy-cloudflare-crowdsec dockerfile:caddy-cloudflare-crowdsec/Dockerfile name:cloudflare-crowdsec]) (push) Successful in 54m9s
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 53m19s
Build and Push Docker Images / build (map[context:caddy-crowdsec dockerfile:caddy-crowdsec/Dockerfile name:crowdsec]) (push) Successful in 32m28s
Build and Push Docker Images / build (map[context:caddy-cloudflare-ddns dockerfile:caddy-cloudflare-ddns/Dockerfile name:cloudflare-ddns]) (push) Successful in 49m35s
2026-02-12 19:57:05 +05:30
1eec567df9 Update Test WF 2026-02-12 19:51:09 +05:30
80b0396ca7 Squashed commit of the following:
commit c4e412c0e5
Author: Renovate Bot <renovate@sh.ryuu.in>
Date:   Thu Feb 12 13:42:41 2026 +0000

    Update caddy:2.10.2 Docker digest to c3d7ee5
2026-02-12 19:39:29 +05:30
8a0a66d24e Squashed commit of the following:
commit bc23823632
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Sun Feb 8 09:30:11 2026 +0000

    Update caddy:2.10.2-builder Docker digest to fbcbf6e
2026-02-12 19:39:23 +05:30
1ac6bad682 Squashed commit of the following:
commit 5c57761e80
Author: Renovate Bot <renovate@sh.ryuu.in>
Date:   Thu Feb 12 13:42:43 2026 +0000

    Update docker/build-push-action action to v6.19.2
2026-02-12 19:38:35 +05:30
02450fcb8a Update WF 2026-02-12 19:37:39 +05:30
09217762c9 Update step name for test WF 2026-02-12 19:37:18 +05:30
a01cc50916 Add test WF 2026-02-12 19:26:56 +05:30
7 changed files with 112 additions and 26 deletions

View File

@@ -6,12 +6,7 @@ on:
branches: [ main ] branches: [ main ]
paths: paths:
- 'caddy-*/**' - 'caddy-*/**'
- '.github/workflows/**' - '.gitea/workflows/build-and-push.yml'
pull_request:
branches: [ main ]
paths:
- 'caddy-*/**'
- '.github/workflows/**'
jobs: jobs:
build: build:
@@ -34,7 +29,7 @@ jobs:
- name: 'crowdsec' - name: 'crowdsec'
dockerfile: 'caddy-crowdsec/Dockerfile' dockerfile: 'caddy-crowdsec/Dockerfile'
context: 'caddy-crowdsec' context: 'caddy-crowdsec'
fail-fast: false fail-fast: true
steps: steps:
- -
@@ -43,47 +38,60 @@ jobs:
- -
name: Parse Caddy version name: Parse Caddy version
id: version id: version
run: echo "version=$(grep -oP '(?<=FROM caddy:)[0-9]+\.[0-9]+\.[0-9]+' ${{ matrix.variant.dockerfile }} | head -n 1)" >> $GITHUB_OUTPUT 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 name: Set up QEMU
uses: docker/setup-qemu-action@v3.7.0 uses: docker/setup-qemu-action@v4.0.0
- -
name: Set up Docker Buildx name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3.12.0 uses: docker/setup-buildx-action@v4.0.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@v3.7.0 uses: docker/login-action@v4.0.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@v3.7.0 uses: docker/login-action@v4.0.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.0.0
with: with:
images: | images: |
ghcr.io/${{ vars.GH_USERNAME }}/caddy-${{ matrix.variant.name }} ghcr.io/${{ vars.GH_USERNAME }}/caddy-${{ matrix.variant.name }}
${{ vars.DOCKERHUB_USERNAME }}/caddy-${{ matrix.variant.name }} ${{ vars.DOCKERHUB_USERNAME }}/caddy-${{ matrix.variant.name }}
tags: | tags: |
type=raw,value=${{ steps.version.outputs.version }}
type=sha,format=long,prefix=sha- type=sha,format=long,prefix=sha-
type=raw,value=latest 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 name: Build and push
uses: docker/build-push-action@v6.18.0 uses: docker/build-push-action@v7.0.0
with: with:
context: ${{ matrix.variant.context }} context: ${{ matrix.variant.context }}
file: ${{ matrix.variant.dockerfile }} file: ${{ matrix.variant.dockerfile }}
push: ${{ github.event_name != 'pull_request' }} push: true
tags: ${{ steps.meta.outputs.tags }} tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }} labels: ${{ steps.meta.outputs.labels }}
platforms: linux/amd64,linux/arm64,linux/arm/v7 platforms: linux/amd64,linux/arm64,linux/arm/v7

View File

@@ -0,0 +1,78 @@
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@v4.0.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
id: meta
uses: docker/metadata-action@v6.0.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@v7.0.0
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

View File

@@ -1,4 +1,4 @@
FROM caddy:2.10.2-builder@sha256:fbcbf6ec1f6d94bc85be547a4d46ac32d0d8119baeaffc383dee068ba332cb50 AS builder FROM caddy:2.11.2-builder@sha256:d4f984844fc3b867ac88fd814285a38eaaf5b3ecadb9ca1b3b0397182ef60cfe AS builder
RUN xcaddy build \ RUN xcaddy build \
--with github.com/caddy-dns/cloudflare \ --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/layer4 \
--with github.com/hslatman/caddy-crowdsec-bouncer/appsec --with github.com/hslatman/caddy-crowdsec-bouncer/appsec
FROM caddy:2.10.2@sha256:f20f80e1fb627294fb84b8515b7593aff8018c840f1396dc942a50ed0c2db648 FROM caddy:2.11.2@sha256:1e40b251ca9639ead7b5cd2cedcc8765adfbabb99450fe23f130eefabf50f4bc
COPY --from=builder /usr/bin/caddy /usr/bin/caddy COPY --from=builder /usr/bin/caddy /usr/bin/caddy

View File

@@ -1,4 +1,4 @@
FROM caddy:2.10.2-builder@sha256:fbcbf6ec1f6d94bc85be547a4d46ac32d0d8119baeaffc383dee068ba332cb50 AS builder FROM caddy:2.11.2-builder@sha256:d4f984844fc3b867ac88fd814285a38eaaf5b3ecadb9ca1b3b0397182ef60cfe 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.10.2@sha256:f20f80e1fb627294fb84b8515b7593aff8018c840f1396dc942a50ed0c2db648 FROM caddy:2.11.2@sha256:1e40b251ca9639ead7b5cd2cedcc8765adfbabb99450fe23f130eefabf50f4bc
COPY --from=builder /usr/bin/caddy /usr/bin/caddy COPY --from=builder /usr/bin/caddy /usr/bin/caddy

View File

@@ -1,9 +1,9 @@
FROM caddy:2.10.2-builder@sha256:fbcbf6ec1f6d94bc85be547a4d46ac32d0d8119baeaffc383dee068ba332cb50 AS builder FROM caddy:2.11.2-builder@sha256:d4f984844fc3b867ac88fd814285a38eaaf5b3ecadb9ca1b3b0397182ef60cfe 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.10.2@sha256:f20f80e1fb627294fb84b8515b7593aff8018c840f1396dc942a50ed0c2db648 FROM caddy:2.11.2@sha256:1e40b251ca9639ead7b5cd2cedcc8765adfbabb99450fe23f130eefabf50f4bc
COPY --from=builder /usr/bin/caddy /usr/bin/caddy COPY --from=builder /usr/bin/caddy /usr/bin/caddy

View File

@@ -1,8 +1,8 @@
FROM caddy:2.10.2-builder@sha256:fbcbf6ec1f6d94bc85be547a4d46ac32d0d8119baeaffc383dee068ba332cb50 AS builder FROM caddy:2.11.2-builder@sha256:d4f984844fc3b867ac88fd814285a38eaaf5b3ecadb9ca1b3b0397182ef60cfe AS builder
RUN xcaddy build \ RUN xcaddy build \
--with github.com/caddy-dns/cloudflare --with github.com/caddy-dns/cloudflare
FROM caddy:2.10.2@sha256:f20f80e1fb627294fb84b8515b7593aff8018c840f1396dc942a50ed0c2db648 FROM caddy:2.11.2@sha256:1e40b251ca9639ead7b5cd2cedcc8765adfbabb99450fe23f130eefabf50f4bc
COPY --from=builder /usr/bin/caddy /usr/bin/caddy COPY --from=builder /usr/bin/caddy /usr/bin/caddy

View File

@@ -1,10 +1,10 @@
FROM caddy:2.10.2-builder@sha256:fbcbf6ec1f6d94bc85be547a4d46ac32d0d8119baeaffc383dee068ba332cb50 AS builder FROM caddy:2.11.2-builder@sha256:d4f984844fc3b867ac88fd814285a38eaaf5b3ecadb9ca1b3b0397182ef60cfe 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.10.2@sha256:f20f80e1fb627294fb84b8515b7593aff8018c840f1396dc942a50ed0c2db648 FROM caddy:2.11.2@sha256:1e40b251ca9639ead7b5cd2cedcc8765adfbabb99450fe23f130eefabf50f4bc
COPY --from=builder /usr/bin/caddy /usr/bin/caddy COPY --from=builder /usr/bin/caddy /usr/bin/caddy