ryuupendragon/docker-caddy
1
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Compare commits

base: ryuupendragon/docker-caddy:renovate/caddy-2.11.4
Branches Tags
ryuupendragon/docker-caddy:main ryuupendragon/docker-caddy:renovate/caddy-2.11.4-builder ryuupendragon/docker-caddy:renovate/caddy-2.11.4 ryuupendragon/docker-caddy:renovate/caddy-2.10.2-builder ryuupendragon/docker-caddy:add-dependabot
..
compare: ryuupendragon/docker-caddy:a786dff8ce6aa1045b302b521184c1335d810bd0
Branches Tags
ryuupendragon/docker-caddy:renovate/caddy-2.11.4-builder ryuupendragon/docker-caddy:renovate/caddy-2.11.4 ryuupendragon/docker-caddy:main ryuupendragon/docker-caddy:renovate/caddy-2.10.2-builder ryuupendragon/docker-caddy:add-dependabot

1 Commits
renovate/caddy-2.11.4 .. a786dff8ce

Author SHA1 Message Date
renovate-bot a786dff8ce Update caddy Docker tag to v2.11.3
Build Test / build (map[context:caddy-crowdsec dockerfile:caddy-crowdsec/Dockerfile name:crowdsec]) (pull_request) Successful in 26s
Details
Build Test / build (map[context:caddy-cloudflare dockerfile:caddy-cloudflare/Dockerfile name:cloudflare]) (pull_request) Successful in 4m37s
Details
2026-05-14 02:31:55 +00:00
7 changed files with 82 additions and 58 deletions
Expand all files Collapse all files
.gitea/workflows/build-and-push.yml
+43 -26
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,51 +14,67 @@ 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 -
uses: actions/checkout@v6.0.3 name: Checkout code
- name: Parse Caddy version uses: actions/checkout@v6.0.2
-
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)
echo "version=$VERSION" >> $GITHUB_OUTPUT echo "version=$VERSION" >> $GITHUB_OUTPUT
echo "Version from file: $VERSION" echo "Version from file: $VERSION"
# Extract semantic version parts # Extract semantic version parts
MAJOR=$(echo $VERSION | cut -d. -f1) MAJOR=$(echo $VERSION | cut -d. -f1)
MINOR=$(echo $VERSION | cut -d. -f1-2) MINOR=$(echo $VERSION | cut -d. -f1-2)
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 -
uses: docker/setup-qemu-action@v4.1.0 name: Set up QEMU
- name: Set up Docker Buildx uses: docker/setup-qemu-action@v4.0.0
uses: docker/setup-buildx-action@v4.1.0 -
name: Set up Docker Buildx
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 -
uses: docker/login-action@v4.2.0 name: Login to GitHub Container Registry
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 -
uses: docker/login-action@v4.2.0 name: Login to Docker Hub
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@v6.1.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 }}
@@ -69,8 +85,9 @@ 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 -
uses: docker/build-push-action@v7.2.0 name: Build and push
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 }}
.gitea/workflows/build-test.yml
+28 -19
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,37 +14,45 @@ 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 -
uses: actions/checkout@v6.0.3 name: Checkout code
- name: Parse Caddy version uses: actions/checkout@v6.0.2
-
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)
echo "version=$VERSION" >> $GITHUB_OUTPUT echo "version=$VERSION" >> $GITHUB_OUTPUT
echo "Version from file: $VERSION" echo "Version from file: $VERSION"
# Extract semantic version parts # Extract semantic version parts
MAJOR=$(echo $VERSION | cut -d. -f1) MAJOR=$(echo $VERSION | cut -d. -f1)
MINOR=$(echo $VERSION | cut -d. -f1-2) MINOR=$(echo $VERSION | cut -d. -f1-2)
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 -
uses: docker/setup-qemu-action@v4.1.0 name: Set up QEMU
- name: Set up Docker Buildx uses: docker/setup-qemu-action@v4.0.0
uses: docker/setup-buildx-action@v4.1.0 -
name: Set up Docker Buildx
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: Extract metadata (tags, labels) for Docker -
name: Extract metadata (tags, labels) for Docker
id: meta id: meta
uses: docker/metadata-action@v6.1.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 }}
@@ -55,8 +63,9 @@ 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 -
uses: docker/build-push-action@v7.2.0 name: Build Test
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 }}
caddy-cloudflare-crowdsec/Dockerfile
+2 -3
View File
@@ -1,12 +1,11 @@
FROM caddy:2.11.4-builder@sha256:f2b98918658f949a3c533f2c73bd0806e3f2576ccf8eb182c8b1690c977007ea AS builder FROM caddy:2.11.3-builder@sha256:090dbc9541137fc6caac753baf94491d9998d7a04a3facb057dbfe8ddef8739a 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.4@sha256:cfeb0b281bc44a5a51fecde39e9e577c60d863c0b6196e6bbdf58fd00960887f FROM caddy:2.11.3@sha256:a464e5c4fb9c324b53adca428a40a66631e59127153b8816fab58103817ba8f0
COPY --from=builder /usr/bin/caddy /usr/bin/caddy COPY --from=builder /usr/bin/caddy /usr/bin/caddy
caddy-cloudflare-ddns-crowdsec/Dockerfile
+2 -2
View File
@@ -1,4 +1,4 @@
FROM caddy:2.11.4-builder@sha256:f2b98918658f949a3c533f2c73bd0806e3f2576ccf8eb182c8b1690c977007ea AS builder FROM caddy:2.11.3-builder@sha256:090dbc9541137fc6caac753baf94491d9998d7a04a3facb057dbfe8ddef8739a 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.4@sha256:cfeb0b281bc44a5a51fecde39e9e577c60d863c0b6196e6bbdf58fd00960887f FROM caddy:2.11.3@sha256:a464e5c4fb9c324b53adca428a40a66631e59127153b8816fab58103817ba8f0
COPY --from=builder /usr/bin/caddy /usr/bin/caddy COPY --from=builder /usr/bin/caddy /usr/bin/caddy
caddy-cloudflare-ddns/Dockerfile
+2 -2
View File
@@ -1,9 +1,9 @@
FROM caddy:2.11.4-builder@sha256:f2b98918658f949a3c533f2c73bd0806e3f2576ccf8eb182c8b1690c977007ea AS builder FROM caddy:2.11.3-builder@sha256:090dbc9541137fc6caac753baf94491d9998d7a04a3facb057dbfe8ddef8739a 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.4@sha256:cfeb0b281bc44a5a51fecde39e9e577c60d863c0b6196e6bbdf58fd00960887f FROM caddy:2.11.3@sha256:a464e5c4fb9c324b53adca428a40a66631e59127153b8816fab58103817ba8f0
COPY --from=builder /usr/bin/caddy /usr/bin/caddy COPY --from=builder /usr/bin/caddy /usr/bin/caddy
caddy-cloudflare/Dockerfile
+3 -4
View File
@@ -1,9 +1,8 @@
FROM caddy:2.11.4-builder@sha256:f2b98918658f949a3c533f2c73bd0806e3f2576ccf8eb182c8b1690c977007ea AS builder FROM caddy:2.11.3-builder@sha256:090dbc9541137fc6caac753baf94491d9998d7a04a3facb057dbfe8ddef8739a 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.4@sha256:cfeb0b281bc44a5a51fecde39e9e577c60d863c0b6196e6bbdf58fd00960887f FROM caddy:2.11.3@sha256:a464e5c4fb9c324b53adca428a40a66631e59127153b8816fab58103817ba8f0
COPY --from=builder /usr/bin/caddy /usr/bin/caddy COPY --from=builder /usr/bin/caddy /usr/bin/caddy
caddy-crowdsec/Dockerfile
+2 -2
View File
@@ -1,10 +1,10 @@
FROM caddy:2.11.4-builder@sha256:f2b98918658f949a3c533f2c73bd0806e3f2576ccf8eb182c8b1690c977007ea AS builder FROM caddy:2.11.3-builder@sha256:090dbc9541137fc6caac753baf94491d9998d7a04a3facb057dbfe8ddef8739a 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.4@sha256:cfeb0b281bc44a5a51fecde39e9e577c60d863c0b6196e6bbdf58fd00960887f FROM caddy:2.11.3@sha256:a464e5c4fb9c324b53adca428a40a66631e59127153b8816fab58103817ba8f0
COPY --from=builder /usr/bin/caddy /usr/bin/caddy COPY --from=builder /usr/bin/caddy /usr/bin/caddy