10 Commits

Author SHA1 Message Date
06b4ced48f Update caddy Docker tag to v2.11.1
All checks were successful
Build Test / build (map[context:caddy-cloudflare dockerfile:caddy-cloudflare/Dockerfile name:cloudflare]) (pull_request) Successful in 7m4s
Build Test / build (map[context:caddy-crowdsec dockerfile:caddy-crowdsec/Dockerfile name:crowdsec]) (pull_request) Successful in 7m36s
2026-02-24 02:31:25 +00:00
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 107 additions and 21 deletions

View File

@@ -6,12 +6,7 @@ on:
branches: [ main ]
paths:
- 'caddy-*/**'
- '.github/workflows/**'
pull_request:
branches: [ main ]
paths:
- 'caddy-*/**'
- '.github/workflows/**'
- '.gitea/workflows/build-and-push.yml'
jobs:
build:
@@ -34,7 +29,7 @@ jobs:
- name: 'crowdsec'
dockerfile: 'caddy-crowdsec/Dockerfile'
context: 'caddy-crowdsec'
fail-fast: false
fail-fast: true
steps:
-
@@ -43,7 +38,18 @@ jobs:
-
name: Parse Caddy 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
uses: docker/setup-qemu-action@v3.7.0
@@ -74,16 +80,18 @@ jobs:
ghcr.io/${{ vars.GH_USERNAME }}/caddy-${{ matrix.variant.name }}
${{ vars.DOCKERHUB_USERNAME }}/caddy-${{ matrix.variant.name }}
tags: |
type=raw,value=${{ steps.version.outputs.version }}
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@v6.18.0
uses: docker/build-push-action@v6.19.2
with:
context: ${{ matrix.variant.context }}
file: ${{ matrix.variant.dockerfile }}
push: ${{ github.event_name != 'pull_request' }}
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
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@v3.7.0
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3.12.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@v5.10.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@v6.19.2
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:23e70f63a88bacd9b0564d055eed5c25b98e90930876cca01aee1f5d1ae29748 AS builder
FROM caddy:2.11.1-builder@sha256:4f2f7dc18c7451f8b560dde511f76bf69d3db63350485f919616c8f4397497d0 AS builder
RUN xcaddy build \
--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/appsec
FROM caddy:2.10.2@sha256:f20f80e1fb627294fb84b8515b7593aff8018c840f1396dc942a50ed0c2db648
FROM caddy:2.11.1@sha256:01511babb51d90619d4a9919206d45b3e7fef645ba1ca9ff0fc298b4c80fac16
COPY --from=builder /usr/bin/caddy /usr/bin/caddy

View File

@@ -1,4 +1,4 @@
FROM caddy:2.10.2-builder@sha256:23e70f63a88bacd9b0564d055eed5c25b98e90930876cca01aee1f5d1ae29748 AS builder
FROM caddy:2.11.1-builder@sha256:4f2f7dc18c7451f8b560dde511f76bf69d3db63350485f919616c8f4397497d0 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.10.2@sha256:f20f80e1fb627294fb84b8515b7593aff8018c840f1396dc942a50ed0c2db648
FROM caddy:2.11.1@sha256:01511babb51d90619d4a9919206d45b3e7fef645ba1ca9ff0fc298b4c80fac16
COPY --from=builder /usr/bin/caddy /usr/bin/caddy

View File

@@ -1,9 +1,9 @@
FROM caddy:2.10.2-builder@sha256:23e70f63a88bacd9b0564d055eed5c25b98e90930876cca01aee1f5d1ae29748 AS builder
FROM caddy:2.11.1-builder@sha256:4f2f7dc18c7451f8b560dde511f76bf69d3db63350485f919616c8f4397497d0 AS builder
RUN xcaddy build \
--with github.com/caddy-dns/cloudflare \
--with github.com/mholt/caddy-dynamicdns
FROM caddy:2.10.2@sha256:f20f80e1fb627294fb84b8515b7593aff8018c840f1396dc942a50ed0c2db648
FROM caddy:2.11.1@sha256:01511babb51d90619d4a9919206d45b3e7fef645ba1ca9ff0fc298b4c80fac16
COPY --from=builder /usr/bin/caddy /usr/bin/caddy

View File

@@ -1,8 +1,8 @@
FROM caddy:2.10.2-builder@sha256:23e70f63a88bacd9b0564d055eed5c25b98e90930876cca01aee1f5d1ae29748 AS builder
FROM caddy:2.11.1-builder@sha256:4f2f7dc18c7451f8b560dde511f76bf69d3db63350485f919616c8f4397497d0 AS builder
RUN xcaddy build \
--with github.com/caddy-dns/cloudflare
FROM caddy:2.10.2@sha256:f20f80e1fb627294fb84b8515b7593aff8018c840f1396dc942a50ed0c2db648
FROM caddy:2.11.1@sha256:01511babb51d90619d4a9919206d45b3e7fef645ba1ca9ff0fc298b4c80fac16
COPY --from=builder /usr/bin/caddy /usr/bin/caddy

View File

@@ -1,10 +1,10 @@
FROM caddy:2.10.2-builder@sha256:23e70f63a88bacd9b0564d055eed5c25b98e90930876cca01aee1f5d1ae29748 AS builder
FROM caddy:2.11.1-builder@sha256:4f2f7dc18c7451f8b560dde511f76bf69d3db63350485f919616c8f4397497d0 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.10.2@sha256:f20f80e1fb627294fb84b8515b7593aff8018c840f1396dc942a50ed0c2db648
FROM caddy:2.11.1@sha256:01511babb51d90619d4a9919206d45b3e7fef645ba1ca9ff0fc298b4c80fac16
COPY --from=builder /usr/bin/caddy /usr/bin/caddy