Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 renovate-bot
|
9319faf784 | ||
|
renovate-bot
|
056505b425 | ||
|
renovate-bot
|
285f2acf96 | ||
 Julien Valverdé
|
5916520d13 | ||
|
Julien Valverdé
|
35df744bec | ||
|
renovate-bot
|
0e4aca4296 | ||
|
renovate-bot
|
d98a992440 | ||
|
renovate-bot
|
16b30d366a |
@@ -11,14 +11,14 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@v3
|
uses: docker/setup-buildx-action@v4
|
||||||
|
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v6
|
uses: actions/checkout@v6
|
||||||
|
|
||||||
- name: Login to Container Registry
|
- name: Login to Container Registry
|
||||||
if: ${{ gitea.event_name != 'pull_request' }}
|
if: ${{ gitea.event_name != 'pull_request' }}
|
||||||
uses: docker/login-action@v3
|
uses: docker/login-action@v4
|
||||||
with:
|
with:
|
||||||
registry: docker.valverde.cloud
|
registry: docker.valverde.cloud
|
||||||
username: ${{ secrets.DOCKER_REGISTRY_USERNAME }}
|
username: ${{ secrets.DOCKER_REGISTRY_USERNAME }}
|
||||||
@@ -26,11 +26,11 @@ jobs:
|
|||||||
|
|
||||||
- name: Parse Caddy version
|
- name: Parse Caddy version
|
||||||
id: version
|
id: version
|
||||||
run: echo "version=$(grep -Eo 'caddy:[0-9]+\.[0-9]+\.[0-9]+$' ./Dockerfile | cut -d ':' -f2)" | tee -a $GITEA_OUTPUT
|
run: echo "version=$(grep -Eo 'caddy:[0-9]+\.[0-9]+\.[0-9]+' ./Dockerfile | head -1 | cut -d ':' -f2)" | tee -a $GITEA_OUTPUT
|
||||||
|
|
||||||
- name: Generate Docker metadata
|
- name: Generate Docker metadata
|
||||||
id: meta
|
id: meta
|
||||||
uses: docker/metadata-action@v5
|
uses: docker/metadata-action@v6
|
||||||
with:
|
with:
|
||||||
images: |
|
images: |
|
||||||
docker.valverde.cloud/${{ gitea.repository }}
|
docker.valverde.cloud/${{ gitea.repository }}
|
||||||
@@ -46,7 +46,7 @@ jobs:
|
|||||||
latest=true
|
latest=true
|
||||||
|
|
||||||
- name: Build
|
- name: Build
|
||||||
uses: docker/build-push-action@v6
|
uses: docker/build-push-action@v7
|
||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
file: ./Dockerfile
|
file: ./Dockerfile
|
||||||
|
|||||||
+6
-6
@@ -1,11 +1,11 @@
|
|||||||
FROM caddy:2.10.2-builder@sha256:7ed26c87abd76318b35677bef46457f9221113f7d9ab341104096862f182a3eb AS builder
|
FROM caddy:2.11.4-builder@sha256:ea6e54f62d2033b80747b022923ae0dd4f817ec4eefa2ca3a34cbebf16b6468c AS builder
|
||||||
RUN --mount=type=cache,target=/go/pkg/mod \
|
RUN --mount=type=cache,target=/go/pkg/mod \
|
||||||
--mount=type=cache,target=/root/.cache/go-build \
|
--mount=type=cache,target=/root/.cache/go-build \
|
||||||
xcaddy build \
|
xcaddy build \
|
||||||
--with github.com/mholt/caddy-l4@master \
|
--with github.com/mholt/caddy-l4@v0.1.1 \
|
||||||
--with github.com/greenpau/caddy-security@v1.1.31 \
|
--with github.com/greenpau/caddy-security@v1.1.62 \
|
||||||
--with github.com/hslatman/caddy-crowdsec-bouncer/crowdsec@v0.9.2 \
|
--with github.com/hslatman/caddy-crowdsec-bouncer@v0.12.1 \
|
||||||
--with github.com/caddy-dns/namecheap@master
|
--with github.com/caddy-dns/namecheap@c7fcf32
|
||||||
|
|
||||||
FROM caddy:2.10.2@sha256:70e816c44fb79071fc4cd939ffda76e3b629642309efe31a4fb0ed45873be464
|
FROM caddy:2.11.4@sha256:cfeb0b281bc44a5a51fecde39e9e577c60d863c0b6196e6bbdf58fd00960887f
|
||||||
COPY --from=builder /usr/bin/caddy /usr/bin/caddy
|
COPY --from=builder /usr/bin/caddy /usr/bin/caddy
|
||||||
|
|||||||
+7
-8
@@ -7,12 +7,11 @@
|
|||||||
"labels": ["renovate"],
|
"labels": ["renovate"],
|
||||||
"configMigration": true,
|
"configMigration": true,
|
||||||
"prHourlyLimit": 0,
|
"prHourlyLimit": 0,
|
||||||
"docker-compose": {
|
"packageRules": [
|
||||||
"hostRules": [
|
{
|
||||||
{
|
"matchPackageNames": ["*"],
|
||||||
"matchHost": "docker.io",
|
"groupName": "all dependencies",
|
||||||
"concurrentRequestLimit": 2
|
"groupSlug": "all-deps"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user