Compare commits
15 Commits
renovate/c
...
cc270c1d0f
| Author | SHA1 | Date | |
|---|---|---|---|
| cc270c1d0f | |||
| f3211194c3 | |||
| 50237be079 | |||
| ccdfa543c4 | |||
| 4df7907594 | |||
| ce29cc5963 | |||
| b4ac64822f | |||
| 593b38fbc0 | |||
| 1eec567df9 | |||
| 80b0396ca7 | |||
| 8a0a66d24e | |||
| 1ac6bad682 | |||
| 02450fcb8a | |||
| 09217762c9 | |||
| a01cc50916 |
@@ -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,47 +38,60 @@ 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
|
||||
uses: docker/setup-qemu-action@v4.0.0
|
||||
-
|
||||
name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v3.12.0
|
||||
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@v3.7.0
|
||||
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@v3.7.0
|
||||
uses: docker/login-action@v4.0.0
|
||||
with:
|
||||
username: ${{ vars.DOCKERHUB_USERNAME }}
|
||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||
-
|
||||
name: Extract metadata (tags, labels) for Docker
|
||||
id: meta
|
||||
uses: docker/metadata-action@v5.10.0
|
||||
uses: docker/metadata-action@v6.0.0
|
||||
with:
|
||||
images: |
|
||||
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@v7.0.0
|
||||
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
|
||||
78
.gitea/workflows/build-test.yml
Normal file
78
.gitea/workflows/build-test.yml
Normal 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@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
|
||||
id: meta
|
||||
uses: docker/metadata-action@v6.0.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@v7.0.0
|
||||
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
|
||||
@@ -1,4 +1,4 @@
|
||||
FROM caddy:2.10.2-builder@sha256:23e70f63a88bacd9b0564d055eed5c25b98e90930876cca01aee1f5d1ae29748 AS builder
|
||||
FROM caddy:2.11.2-builder@sha256:d4f984844fc3b867ac88fd814285a38eaaf5b3ecadb9ca1b3b0397182ef60cfe 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.2@sha256:261437d35b88cc2f8fa1ed337ebb6b6ce2bd5cd61b2a28cdf83cb201db0a853b
|
||||
|
||||
COPY --from=builder /usr/bin/caddy /usr/bin/caddy
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
FROM caddy:2.10.2-builder@sha256:23e70f63a88bacd9b0564d055eed5c25b98e90930876cca01aee1f5d1ae29748 AS builder
|
||||
FROM caddy:2.11.2-builder@sha256:d4f984844fc3b867ac88fd814285a38eaaf5b3ecadb9ca1b3b0397182ef60cfe 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.2@sha256:261437d35b88cc2f8fa1ed337ebb6b6ce2bd5cd61b2a28cdf83cb201db0a853b
|
||||
|
||||
COPY --from=builder /usr/bin/caddy /usr/bin/caddy
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
FROM caddy:2.10.2-builder@sha256:23e70f63a88bacd9b0564d055eed5c25b98e90930876cca01aee1f5d1ae29748 AS builder
|
||||
FROM caddy:2.11.2-builder@sha256:d4f984844fc3b867ac88fd814285a38eaaf5b3ecadb9ca1b3b0397182ef60cfe 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.2@sha256:261437d35b88cc2f8fa1ed337ebb6b6ce2bd5cd61b2a28cdf83cb201db0a853b
|
||||
|
||||
COPY --from=builder /usr/bin/caddy /usr/bin/caddy
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
FROM caddy:2.10.2-builder@sha256:23e70f63a88bacd9b0564d055eed5c25b98e90930876cca01aee1f5d1ae29748 AS builder
|
||||
FROM caddy:2.11.2-builder@sha256:d4f984844fc3b867ac88fd814285a38eaaf5b3ecadb9ca1b3b0397182ef60cfe AS builder
|
||||
|
||||
RUN xcaddy build \
|
||||
--with github.com/caddy-dns/cloudflare
|
||||
|
||||
FROM caddy:2.10.2@sha256:f20f80e1fb627294fb84b8515b7593aff8018c840f1396dc942a50ed0c2db648
|
||||
FROM caddy:2.11.2@sha256:261437d35b88cc2f8fa1ed337ebb6b6ce2bd5cd61b2a28cdf83cb201db0a853b
|
||||
|
||||
COPY --from=builder /usr/bin/caddy /usr/bin/caddy
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
FROM caddy:2.10.2-builder@sha256:23e70f63a88bacd9b0564d055eed5c25b98e90930876cca01aee1f5d1ae29748 AS builder
|
||||
FROM caddy:2.11.2-builder@sha256:d4f984844fc3b867ac88fd814285a38eaaf5b3ecadb9ca1b3b0397182ef60cfe 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.2@sha256:261437d35b88cc2f8fa1ed337ebb6b6ce2bd5cd61b2a28cdf83cb201db0a853b
|
||||
|
||||
COPY --from=builder /usr/bin/caddy /usr/bin/caddy
|
||||
|
||||
Reference in New Issue
Block a user