From e84496568aee0683d3afc208fa95a5f7b55f5aae Mon Sep 17 00:00:00 2001 From: Lorenzo Prosseda Date: Sat, 8 Jun 2024 15:34:44 +0200 Subject: [PATCH] Update Caddy and Alpine base --- .github/workflows/build-container-publish-dockerhub.yaml | 8 ++++---- Containerfile.aarch64 | 6 +++--- Containerfile.amd64 | 6 +++--- Containerfile.armv7 | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build-container-publish-dockerhub.yaml b/.github/workflows/build-container-publish-dockerhub.yaml index 8320adb..b2cf4f1 100644 --- a/.github/workflows/build-container-publish-dockerhub.yaml +++ b/.github/workflows/build-container-publish-dockerhub.yaml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Download code from GitHub - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Save the tag that triggered the workflow to an env file run: | echo "GH_TAG=${GITHUB_REF/refs\/tags\//}" >> ${CWD}/GH_TAG.env && cat ${CWD}/GH_TAG.env @@ -29,7 +29,7 @@ jobs: run: | cp /usr/bin/qemu-aarch64-static /usr/bin/qemu-arm-static ${CWD} - name: Upload repo folder artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: repo-folder path: ${{ env.CWD }} @@ -45,7 +45,7 @@ jobs: needs: setup steps: - name: Download repo folder artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: repo-folder path: ${{ env.CWD }} @@ -75,7 +75,7 @@ jobs: needs: build-push steps: - name: Download repo folder artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: repo-folder path: ${{ env.CWD }} diff --git a/Containerfile.aarch64 b/Containerfile.aarch64 index 51eb73e..9a60a6c 100644 --- a/Containerfile.aarch64 +++ b/Containerfile.aarch64 @@ -1,4 +1,4 @@ -ARG caddyversion=2.7.6 +ARG caddyversion=2.8.4 FROM docker.io/caddy/caddy:${caddyversion}-builder-alpine AS builder @@ -6,12 +6,12 @@ RUN GOARCH=arm64 xcaddy build \ --with github.com/pteich/caddy-tlsconsul \ --with github.com/caddy-dns/cloudflare -FROM docker.io/arm64v8/alpine:3.19.0 +FROM docker.io/arm64v8/alpine:3.20.0 LABEL maintainer "Lorenzo Prosseda " # Download environment tools RUN apk add --no-cache \ - 'ca-certificates=20230506-r0' + 'ca-certificates=20240226-r0' # Create directories and get Caddy binary from builder RUN mkdir -p \ diff --git a/Containerfile.amd64 b/Containerfile.amd64 index 66f4594..33439a6 100644 --- a/Containerfile.amd64 +++ b/Containerfile.amd64 @@ -1,4 +1,4 @@ -ARG caddyversion=2.7.6 +ARG caddyversion=2.8.4 FROM docker.io/caddy/caddy:${caddyversion}-builder-alpine AS builder @@ -6,12 +6,12 @@ RUN GOARCH=amd64 xcaddy build \ --with github.com/pteich/caddy-tlsconsul \ --with github.com/caddy-dns/cloudflare -FROM docker.io/amd64/alpine:3.19.0 +FROM docker.io/amd64/alpine:3.20.0 LABEL maintainer "Lorenzo Prosseda " # Download environment tools RUN apk add --no-cache \ - 'ca-certificates=20230506-r0' + 'ca-certificates=20240226-r0' # Create directories and get Caddy binary from builder RUN mkdir -p \ diff --git a/Containerfile.armv7 b/Containerfile.armv7 index d82d4e7..2b99929 100644 --- a/Containerfile.armv7 +++ b/Containerfile.armv7 @@ -1,4 +1,4 @@ -ARG caddyversion=2.7.6 +ARG caddyversion=2.8.4 FROM docker.io/caddy/caddy:${caddyversion}-builder-alpine AS builder @@ -6,12 +6,12 @@ RUN GOARCH=arm xcaddy build \ --with github.com/pteich/caddy-tlsconsul \ --with github.com/caddy-dns/cloudflare -FROM docker.io/arm32v7/alpine:3.19.0 +FROM docker.io/arm32v7/alpine:3.20.0 LABEL maintainer "Lorenzo Prosseda " # Download environment tools RUN apk add --no-cache \ - 'ca-certificates=20230506-r0' + 'ca-certificates=20240226-r0' # Create directories and get Caddy binary from builder RUN mkdir -p \