Skip to content

Commit

Permalink
Update Alpine image and system packages
Browse files Browse the repository at this point in the history
CA-Certificates and Caddy plugins update; also changed to using
multiarch. images from Docker Hub
  • Loading branch information
Procsiab committed Sep 20, 2024
1 parent e844965 commit 8d6d660
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 14 deletions.
11 changes: 6 additions & 5 deletions Containerfile.aarch64
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
ARG caddyversion=2.8.4
ARG PLTF_ARCH=arm64

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
RUN GOARCH=${PLTF_ARCH} xcaddy build \
--with github.com/pteich/caddy-tlsconsul@v1.5.0 \
--with github.com/caddy-dns/cloudflare@89f16b99c18ef49c8bb470a82f895bce01cbaece

FROM docker.io/arm64v8/alpine:3.20.0
FROM --platform=linux/${PLTF_ARCH} docker.io/library/alpine:3.20.3
LABEL maintainer "Lorenzo Prosseda <[email protected]>"

# Download environment tools
RUN apk add --no-cache \
'ca-certificates=20240226-r0'
'ca-certificates=20240705-r0'

# Create directories and get Caddy binary from builder
RUN mkdir -p \
Expand Down
11 changes: 6 additions & 5 deletions Containerfile.amd64
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
ARG caddyversion=2.8.4
ARG PLTF_ARCH=amd64

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
RUN GOARCH=${PLTF_ARCH} xcaddy build \
--with github.com/pteich/caddy-tlsconsul@v1.5.0 \
--with github.com/caddy-dns/cloudflare@89f16b99c18ef49c8bb470a82f895bce01cbaece

FROM docker.io/amd64/alpine:3.20.0
FROM --platform=linux/${PLTF_ARCH} docker.io/library/alpine:3.20.3
LABEL maintainer "Lorenzo Prosseda <[email protected]>"

# Download environment tools
RUN apk add --no-cache \
'ca-certificates=20240226-r0'
'ca-certificates=20240705-r0'

# Create directories and get Caddy binary from builder
RUN mkdir -p \
Expand Down
9 changes: 5 additions & 4 deletions Containerfile.armv7
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
ARG caddyversion=2.8.4
ARG PLTF_ARCH=arm/v7

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
--with github.com/pteich/caddy-tlsconsul@v1.5.0 \
--with github.com/caddy-dns/cloudflare@89f16b99c18ef49c8bb470a82f895bce01cbaece

FROM docker.io/arm32v7/alpine:3.20.0
FROM --platform=linux/${PLTF_ARCH} docker.io/library/alpine:3.20.3
LABEL maintainer "Lorenzo Prosseda <[email protected]>"

# Download environment tools
RUN apk add --no-cache \
'ca-certificates=20240226-r0'
'ca-certificates=20240705-r0'

# Create directories and get Caddy binary from builder
RUN mkdir -p \
Expand Down

0 comments on commit 8d6d660

Please sign in to comment.