Skip to content

Commit

Permalink
Update Caddy and Alpine base
Browse files Browse the repository at this point in the history
  • Loading branch information
Procsiab committed Jun 8, 2024
1 parent 71ec36d commit e844965
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build-container-publish-dockerhub.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 }}
Expand All @@ -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 }}
Expand Down Expand Up @@ -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 }}
Expand Down
6 changes: 3 additions & 3 deletions Containerfile.aarch64
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
ARG caddyversion=2.7.6
ARG caddyversion=2.8.4

FROM docker.io/caddy/caddy:${caddyversion}-builder-alpine AS builder

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 <[email protected]>"

# 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 \
Expand Down
6 changes: 3 additions & 3 deletions Containerfile.amd64
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
ARG caddyversion=2.7.6
ARG caddyversion=2.8.4

FROM docker.io/caddy/caddy:${caddyversion}-builder-alpine AS builder

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 <[email protected]>"

# 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 \
Expand Down
6 changes: 3 additions & 3 deletions Containerfile.armv7
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
ARG caddyversion=2.7.6
ARG caddyversion=2.8.4

FROM docker.io/caddy/caddy:${caddyversion}-builder-alpine AS builder

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 <[email protected]>"

# 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 \
Expand Down

0 comments on commit e844965

Please sign in to comment.