Compare commits
1 Commits
main
..
4db73436af
| Author | SHA1 | Date | |
|---|---|---|---|
 renovate-bot
|
4db73436af |
@@ -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,18 +14,29 @@ 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'
|
||||
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'
|
||||
fail-fast: true
|
||||
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v6.0.3
|
||||
- name: Parse Caddy version
|
||||
-
|
||||
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)
|
||||
@@ -39,26 +50,31 @@ jobs:
|
||||
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.1.0
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v4.1.0
|
||||
-
|
||||
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: 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:
|
||||
registry: ghcr.io
|
||||
username: ${{ vars.GH_USERNAME }}
|
||||
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:
|
||||
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
|
||||
uses: docker/metadata-action@v6.0.0
|
||||
with:
|
||||
images: |
|
||||
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.minor_version }}
|
||||
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:
|
||||
context: ${{ matrix.variant.context }}
|
||||
file: ${{ matrix.variant.dockerfile }}
|
||||
|
||||
@@ -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,15 +14,20 @@ jobs:
|
||||
strategy:
|
||||
matrix:
|
||||
variant:
|
||||
- name: "cloudflare"
|
||||
dockerfile: "caddy-cloudflare/Dockerfile"
|
||||
context: "caddy-cloudflare"
|
||||
- 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.3
|
||||
- name: Parse Caddy version
|
||||
-
|
||||
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)
|
||||
@@ -36,15 +41,18 @@ jobs:
|
||||
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.1.0
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v4.1.0
|
||||
-
|
||||
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
|
||||
-
|
||||
name: Extract metadata (tags, labels) for Docker
|
||||
id: meta
|
||||
uses: docker/metadata-action@v6.1.0
|
||||
uses: docker/metadata-action@v6.0.0
|
||||
with:
|
||||
images: |
|
||||
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.minor_version }}
|
||||
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:
|
||||
context: ${{ matrix.variant.context }}
|
||||
file: ${{ matrix.variant.dockerfile }}
|
||||
|
||||
@@ -1,12 +1,11 @@
|
||||
FROM caddy:2.11.4-builder@sha256:f2b98918658f949a3c533f2c73bd0806e3f2576ccf8eb182c8b1690c977007ea AS builder
|
||||
FROM caddy:2.11.2-builder@sha256:84dfc3479309c690643ada9279b3e0b4352ce56b0ec8fd802c668f42b546e98f 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.4@sha256:cb9d71ad83182011b79355cd57692686374bd78d6fe327efe0ff8507da03ab13
|
||||
FROM caddy:2.11.2@sha256:22e1d921a7dd98ea722ebd6819de785fd71abdab7f7fed8a2378e96d29bb923a
|
||||
|
||||
COPY --from=builder /usr/bin/caddy /usr/bin/caddy
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
FROM caddy:2.11.4-builder@sha256:f2b98918658f949a3c533f2c73bd0806e3f2576ccf8eb182c8b1690c977007ea AS builder
|
||||
FROM caddy:2.11.2-builder@sha256:84dfc3479309c690643ada9279b3e0b4352ce56b0ec8fd802c668f42b546e98f 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.4@sha256:cb9d71ad83182011b79355cd57692686374bd78d6fe327efe0ff8507da03ab13
|
||||
FROM caddy:2.11.2@sha256:22e1d921a7dd98ea722ebd6819de785fd71abdab7f7fed8a2378e96d29bb923a
|
||||
|
||||
COPY --from=builder /usr/bin/caddy /usr/bin/caddy
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
FROM caddy:2.11.4-builder@sha256:f2b98918658f949a3c533f2c73bd0806e3f2576ccf8eb182c8b1690c977007ea AS builder
|
||||
FROM caddy:2.11.2-builder@sha256:84dfc3479309c690643ada9279b3e0b4352ce56b0ec8fd802c668f42b546e98f AS builder
|
||||
|
||||
RUN xcaddy build \
|
||||
--with github.com/caddy-dns/cloudflare \
|
||||
--with github.com/mholt/caddy-dynamicdns
|
||||
|
||||
FROM caddy:2.11.4@sha256:cb9d71ad83182011b79355cd57692686374bd78d6fe327efe0ff8507da03ab13
|
||||
FROM caddy:2.11.2@sha256:22e1d921a7dd98ea722ebd6819de785fd71abdab7f7fed8a2378e96d29bb923a
|
||||
|
||||
COPY --from=builder /usr/bin/caddy /usr/bin/caddy
|
||||
|
||||
@@ -1,9 +1,8 @@
|
||||
FROM caddy:2.11.4-builder@sha256:f2b98918658f949a3c533f2c73bd0806e3f2576ccf8eb182c8b1690c977007ea AS builder
|
||||
FROM caddy:2.11.2-builder@sha256:84dfc3479309c690643ada9279b3e0b4352ce56b0ec8fd802c668f42b546e98f AS builder
|
||||
|
||||
RUN xcaddy build \
|
||||
--with github.com/caddy-dns/cloudflare \
|
||||
--with github.com/mholt/caddy-l4/modules/l4proxy
|
||||
--with github.com/caddy-dns/cloudflare
|
||||
|
||||
FROM caddy:2.11.4@sha256:cb9d71ad83182011b79355cd57692686374bd78d6fe327efe0ff8507da03ab13
|
||||
FROM caddy:2.11.2@sha256:22e1d921a7dd98ea722ebd6819de785fd71abdab7f7fed8a2378e96d29bb923a
|
||||
|
||||
COPY --from=builder /usr/bin/caddy /usr/bin/caddy
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
FROM caddy:2.11.4-builder@sha256:f2b98918658f949a3c533f2c73bd0806e3f2576ccf8eb182c8b1690c977007ea AS builder
|
||||
FROM caddy:2.11.2-builder@sha256:84dfc3479309c690643ada9279b3e0b4352ce56b0ec8fd802c668f42b546e98f 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.4@sha256:cb9d71ad83182011b79355cd57692686374bd78d6fe327efe0ff8507da03ab13
|
||||
FROM caddy:2.11.2@sha256:22e1d921a7dd98ea722ebd6819de785fd71abdab7f7fed8a2378e96d29bb923a
|
||||
|
||||
COPY --from=builder /usr/bin/caddy /usr/bin/caddy
|
||||
|
||||
Reference in New Issue
Block a user