Compare commits
29
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e620312ef2 | ||
|
|
42818a4854 | ||
|
|
3207efb735 | ||
|
|
7b4cefb625 | ||
|
|
6618849a1e | ||
|
|
a18a1215e7 | ||
|
|
3205e2e6e2 | ||
|
|
c93b191c33 | ||
|
|
c40be8e37c | ||
|
|
6f3dba5cc2 | ||
|
|
54d1f58e43 | ||
|
|
b5095ada92 | ||
|
|
6f63f55f3a | ||
|
|
b5d07ec7b3 | ||
|
|
d3af60317f | ||
|
|
d5db564bf6 | ||
|
|
52d45b667b | ||
|
|
633008debd | ||
|
|
7f9aabc804 | ||
|
|
d339a1c66b | ||
|
|
52f1fcf266 | ||
|
|
c25b716828 | ||
|
|
e7f9281019 | ||
|
|
0dc98d67e8 | ||
|
|
19348dc1cb | ||
|
|
3ef710295a | ||
|
|
d445518d59 | ||
|
|
faa27bb354 | ||
|
|
a0411f8b9c |
@@ -3,78 +3,62 @@ 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:
|
||||
runs-on: ubuntu-latest
|
||||
runs-on: temp
|
||||
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-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'
|
||||
- name: "cloudflare"
|
||||
dockerfile: "caddy-cloudflare/Dockerfile"
|
||||
context: "caddy-cloudflare"
|
||||
- name: "cloudflare-crowdsec"
|
||||
dockerfile: "caddy-cloudflare-crowdsec/Dockerfile"
|
||||
context: "caddy-cloudflare-crowdsec"
|
||||
fail-fast: true
|
||||
|
||||
steps:
|
||||
-
|
||||
name: Checkout code
|
||||
uses: actions/checkout@v6.0.2
|
||||
-
|
||||
name: Parse Caddy version
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v7.0.0
|
||||
- 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
|
||||
- name: Set up QEMU
|
||||
uses: docker/setup-qemu-action@v4.2.0
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v4.2.0
|
||||
with:
|
||||
driver-opts: image=moby/buildkit:v0.23.2@sha256:ddd1ca44b21eda906e81ab14a3d467fa6c39cd73b9a39df1196210edcb8db59e
|
||||
-
|
||||
name: Login to GitHub Container Registry
|
||||
uses: docker/login-action@v4.0.0
|
||||
- name: Login to GitHub Container Registry
|
||||
uses: docker/login-action@v4.4.0
|
||||
with:
|
||||
registry: ghcr.io
|
||||
username: ${{ vars.GH_USERNAME }}
|
||||
password: ${{ secrets.GH_TOKEN }}
|
||||
-
|
||||
name: Login to Docker Hub
|
||||
uses: docker/login-action@v4.0.0
|
||||
- name: Login to Docker Hub
|
||||
uses: docker/login-action@v4.4.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.0.0
|
||||
uses: docker/metadata-action@v6.2.0
|
||||
with:
|
||||
images: |
|
||||
ghcr.io/${{ vars.GH_USERNAME }}/caddy-${{ matrix.variant.name }}
|
||||
@@ -85,17 +69,12 @@ 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.3.0
|
||||
with:
|
||||
context: ${{ matrix.variant.context }}
|
||||
file: ${{ matrix.variant.dockerfile }}
|
||||
push: true
|
||||
tags: ${{ steps.meta.outputs.tags }}
|
||||
labels: ${{ steps.meta.outputs.labels }}
|
||||
platforms: linux/amd64,linux/arm64,linux/arm/v7
|
||||
cache-from: type=gha
|
||||
cache-to: type=gha,mode=max
|
||||
build-args: |
|
||||
BUILDKIT_INLINE_CACHE=1
|
||||
platforms: linux/amd64,linux/arm64
|
||||
|
||||
@@ -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,45 +14,37 @@ jobs:
|
||||
strategy:
|
||||
matrix:
|
||||
variant:
|
||||
- name: 'cloudflare'
|
||||
dockerfile: 'caddy-cloudflare/Dockerfile'
|
||||
context: 'caddy-cloudflare'
|
||||
- name: 'crowdsec'
|
||||
dockerfile: 'caddy-crowdsec/Dockerfile'
|
||||
context: 'caddy-crowdsec'
|
||||
- name: "cloudflare"
|
||||
dockerfile: "caddy-cloudflare/Dockerfile"
|
||||
context: "caddy-cloudflare"
|
||||
fail-fast: true
|
||||
|
||||
steps:
|
||||
-
|
||||
name: Checkout code
|
||||
uses: actions/checkout@v6.0.2
|
||||
-
|
||||
name: Parse Caddy version
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v7.0.0
|
||||
- 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
|
||||
- name: Set up QEMU
|
||||
uses: docker/setup-qemu-action@v4.2.0
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v4.2.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.0.0
|
||||
uses: docker/metadata-action@v6.2.0
|
||||
with:
|
||||
images: |
|
||||
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.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.3.0
|
||||
with:
|
||||
context: ${{ matrix.variant.context }}
|
||||
file: ${{ matrix.variant.dockerfile }}
|
||||
|
||||
@@ -0,0 +1,80 @@
|
||||
name: Build and Push Docker Images
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
push:
|
||||
branches: [main]
|
||||
paths:
|
||||
- ".gitea/workflows/test.yml"
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: temp
|
||||
strategy:
|
||||
matrix:
|
||||
variant:
|
||||
- name: "cloudflare"
|
||||
dockerfile: "caddy-cloudflare/Dockerfile"
|
||||
context: "caddy-cloudflare"
|
||||
fail-fast: true
|
||||
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v7.0.0
|
||||
- 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.2.0
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v4.2.0
|
||||
with:
|
||||
driver-opts: image=moby/buildkit:v0.23.2@sha256:ddd1ca44b21eda906e81ab14a3d467fa6c39cd73b9a39df1196210edcb8db59e
|
||||
- name: Login to GitHub Container Registry
|
||||
uses: docker/login-action@v4.4.0
|
||||
with:
|
||||
registry: ghcr.io
|
||||
username: ${{ vars.GH_USERNAME }}
|
||||
password: ${{ secrets.GH_TOKEN }}
|
||||
- name: Login to Docker Hub
|
||||
uses: docker/login-action@v4.4.0
|
||||
with:
|
||||
username: ${{ vars.DOCKERHUB_USERNAME }}
|
||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||
- name: Extract metadata (tags, labels) for Docker
|
||||
id: meta
|
||||
uses: docker/metadata-action@v6.2.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 and push
|
||||
uses: docker/build-push-action@v7.3.0
|
||||
with:
|
||||
context: ${{ matrix.variant.context }}
|
||||
file: ${{ matrix.variant.dockerfile }}
|
||||
push: false
|
||||
tags: ${{ steps.meta.outputs.tags }}
|
||||
labels: ${{ steps.meta.outputs.labels }}
|
||||
# platforms: linux/amd64,linux/arm64
|
||||
cache-from: type=gha
|
||||
cache-to: type=gha,mode=max
|
||||
build-args: |
|
||||
BUILDKIT_INLINE_CACHE=1
|
||||
@@ -1,11 +1,12 @@
|
||||
FROM caddy:2.11.2-builder@sha256:84dfc3479309c690643ada9279b3e0b4352ce56b0ec8fd802c668f42b546e98f AS builder
|
||||
FROM caddy:2.11.4-builder@sha256:198d47eaee306d4d0c38a9960c89ff2c959aa29ad51d3e2dafa3e93ac961782a 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.2@sha256:1e40b251ca9639ead7b5cd2cedcc8765adfbabb99450fe23f130eefabf50f4bc
|
||||
FROM caddy:2.11.4@sha256:af5fdcd76f2db5e4e974ee92f96ee8c0fc3edb55bd4ba5032547cbf3f65e486d
|
||||
|
||||
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:198d47eaee306d4d0c38a9960c89ff2c959aa29ad51d3e2dafa3e93ac961782a 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.2@sha256:1e40b251ca9639ead7b5cd2cedcc8765adfbabb99450fe23f130eefabf50f4bc
|
||||
FROM caddy:2.11.4@sha256:af5fdcd76f2db5e4e974ee92f96ee8c0fc3edb55bd4ba5032547cbf3f65e486d
|
||||
|
||||
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:198d47eaee306d4d0c38a9960c89ff2c959aa29ad51d3e2dafa3e93ac961782a AS builder
|
||||
|
||||
RUN xcaddy build \
|
||||
--with github.com/caddy-dns/cloudflare \
|
||||
--with github.com/mholt/caddy-dynamicdns
|
||||
|
||||
FROM caddy:2.11.2@sha256:1e40b251ca9639ead7b5cd2cedcc8765adfbabb99450fe23f130eefabf50f4bc
|
||||
FROM caddy:2.11.4@sha256:af5fdcd76f2db5e4e974ee92f96ee8c0fc3edb55bd4ba5032547cbf3f65e486d
|
||||
|
||||
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:198d47eaee306d4d0c38a9960c89ff2c959aa29ad51d3e2dafa3e93ac961782a AS builder
|
||||
|
||||
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:af5fdcd76f2db5e4e974ee92f96ee8c0fc3edb55bd4ba5032547cbf3f65e486d
|
||||
|
||||
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:198d47eaee306d4d0c38a9960c89ff2c959aa29ad51d3e2dafa3e93ac961782a 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.2@sha256:1e40b251ca9639ead7b5cd2cedcc8765adfbabb99450fe23f130eefabf50f4bc
|
||||
FROM caddy:2.11.4@sha256:af5fdcd76f2db5e4e974ee92f96ee8c0fc3edb55bd4ba5032547cbf3f65e486d
|
||||
|
||||
COPY --from=builder /usr/bin/caddy /usr/bin/caddy
|
||||
|
||||
Reference in New Issue
Block a user