Compare commits
10 Commits
f7a92ace3d
..
main
| Author | SHA1 | Date | |
|---|---|---|---|
| d339a1c66b | |||
| 52f1fcf266 | |||
| c25b716828 | |||
| e7f9281019 | |||
| 0dc98d67e8 | |||
| 19348dc1cb | |||
| 3ef710295a | |||
| d445518d59 | |||
| faa27bb354 | |||
| a0411f8b9c |
@@ -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,67 +14,51 @@ 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
|
||||||
name: Checkout code
|
uses: actions/checkout@v6.0.3
|
||||||
uses: actions/checkout@v6.0.2
|
- name: Parse Caddy version
|
||||||
-
|
|
||||||
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
|
||||||
name: Set up QEMU
|
uses: docker/setup-qemu-action@v4.1.0
|
||||||
uses: docker/setup-qemu-action@v4.0.0
|
- name: Set up Docker Buildx
|
||||||
-
|
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
|
||||||
name: Login to GitHub Container Registry
|
uses: docker/login-action@v4.2.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@v4.2.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@v6.0.0
|
uses: docker/metadata-action@v6.1.0
|
||||||
with:
|
with:
|
||||||
images: |
|
images: |
|
||||||
ghcr.io/${{ vars.GH_USERNAME }}/caddy-${{ matrix.variant.name }}
|
ghcr.io/${{ vars.GH_USERNAME }}/caddy-${{ matrix.variant.name }}
|
||||||
@@ -85,9 +69,8 @@ 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
|
||||||
name: Build and push
|
uses: docker/build-push-action@v7.2.0
|
||||||
uses: docker/build-push-action@v7.1.0
|
|
||||||
with:
|
with:
|
||||||
context: ${{ matrix.variant.context }}
|
context: ${{ matrix.variant.context }}
|
||||||
file: ${{ matrix.variant.dockerfile }}
|
file: ${{ matrix.variant.dockerfile }}
|
||||||
|
|||||||
@@ -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,45 +14,37 @@ 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
|
||||||
name: Checkout code
|
uses: actions/checkout@v6.0.3
|
||||||
uses: actions/checkout@v6.0.2
|
- name: Parse Caddy version
|
||||||
-
|
|
||||||
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
|
||||||
name: Set up QEMU
|
uses: docker/setup-qemu-action@v4.1.0
|
||||||
uses: docker/setup-qemu-action@v4.0.0
|
- name: Set up Docker Buildx
|
||||||
-
|
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.0.0
|
uses: docker/metadata-action@v6.1.0
|
||||||
with:
|
with:
|
||||||
images: |
|
images: |
|
||||||
ghcr.io/${{ vars.GH_USERNAME }}/caddy-${{ matrix.variant.name }}
|
ghcr.io/${{ vars.GH_USERNAME }}/caddy-${{ matrix.variant.name }}
|
||||||
@@ -63,9 +55,8 @@ 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
|
||||||
name: Build Test
|
uses: docker/build-push-action@v7.2.0
|
||||||
uses: docker/build-push-action@v7.1.0
|
|
||||||
with:
|
with:
|
||||||
context: ${{ matrix.variant.context }}
|
context: ${{ matrix.variant.context }}
|
||||||
file: ${{ matrix.variant.dockerfile }}
|
file: ${{ matrix.variant.dockerfile }}
|
||||||
|
|||||||
@@ -1,11 +1,12 @@
|
|||||||
FROM caddy:2.11.2-builder@sha256:84dfc3479309c690643ada9279b3e0b4352ce56b0ec8fd802c668f42b546e98f AS builder
|
FROM caddy:2.11.4-builder@sha256:f2b98918658f949a3c533f2c73bd0806e3f2576ccf8eb182c8b1690c977007ea 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.2@sha256:1e40b251ca9639ead7b5cd2cedcc8765adfbabb99450fe23f130eefabf50f4bc
|
FROM caddy:2.11.4@sha256:cb9d71ad83182011b79355cd57692686374bd78d6fe327efe0ff8507da03ab13
|
||||||
|
|
||||||
COPY --from=builder /usr/bin/caddy /usr/bin/caddy
|
COPY --from=builder /usr/bin/caddy /usr/bin/caddy
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
FROM caddy:2.11.2-builder@sha256:84dfc3479309c690643ada9279b3e0b4352ce56b0ec8fd802c668f42b546e98f AS builder
|
FROM caddy:2.11.4-builder@sha256:f2b98918658f949a3c533f2c73bd0806e3f2576ccf8eb182c8b1690c977007ea 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.2@sha256:1e40b251ca9639ead7b5cd2cedcc8765adfbabb99450fe23f130eefabf50f4bc
|
FROM caddy:2.11.4@sha256:cb9d71ad83182011b79355cd57692686374bd78d6fe327efe0ff8507da03ab13
|
||||||
|
|
||||||
COPY --from=builder /usr/bin/caddy /usr/bin/caddy
|
COPY --from=builder /usr/bin/caddy /usr/bin/caddy
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
FROM caddy:2.11.2-builder@sha256:84dfc3479309c690643ada9279b3e0b4352ce56b0ec8fd802c668f42b546e98f AS builder
|
FROM caddy:2.11.4-builder@sha256:f2b98918658f949a3c533f2c73bd0806e3f2576ccf8eb182c8b1690c977007ea 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.2@sha256:1e40b251ca9639ead7b5cd2cedcc8765adfbabb99450fe23f130eefabf50f4bc
|
FROM caddy:2.11.4@sha256:cb9d71ad83182011b79355cd57692686374bd78d6fe327efe0ff8507da03ab13
|
||||||
|
|
||||||
COPY --from=builder /usr/bin/caddy /usr/bin/caddy
|
COPY --from=builder /usr/bin/caddy /usr/bin/caddy
|
||||||
|
|||||||
@@ -1,8 +1,9 @@
|
|||||||
FROM caddy:2.11.2-builder@sha256:84dfc3479309c690643ada9279b3e0b4352ce56b0ec8fd802c668f42b546e98f AS builder
|
FROM caddy:2.11.4-builder@sha256:f2b98918658f949a3c533f2c73bd0806e3f2576ccf8eb182c8b1690c977007ea 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.2@sha256:1e40b251ca9639ead7b5cd2cedcc8765adfbabb99450fe23f130eefabf50f4bc
|
FROM caddy:2.11.4@sha256:cb9d71ad83182011b79355cd57692686374bd78d6fe327efe0ff8507da03ab13
|
||||||
|
|
||||||
COPY --from=builder /usr/bin/caddy /usr/bin/caddy
|
COPY --from=builder /usr/bin/caddy /usr/bin/caddy
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
FROM caddy:2.11.2-builder@sha256:84dfc3479309c690643ada9279b3e0b4352ce56b0ec8fd802c668f42b546e98f AS builder
|
FROM caddy:2.11.4-builder@sha256:f2b98918658f949a3c533f2c73bd0806e3f2576ccf8eb182c8b1690c977007ea 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.2@sha256:1e40b251ca9639ead7b5cd2cedcc8765adfbabb99450fe23f130eefabf50f4bc
|
FROM caddy:2.11.4@sha256:cb9d71ad83182011b79355cd57692686374bd78d6fe327efe0ff8507da03ab13
|
||||||
|
|
||||||
COPY --from=builder /usr/bin/caddy /usr/bin/caddy
|
COPY --from=builder /usr/bin/caddy /usr/bin/caddy
|
||||||
|
|||||||
Reference in New Issue
Block a user