From 2f46888e8ffdf31702e7f68de5b5a432a3158bf1 Mon Sep 17 00:00:00 2001 From: Nathan ter Bogt Date: Mon, 30 Mar 2026 12:55:56 +1300 Subject: [PATCH 1/3] Include the alpine version only in the bake --- base/Dockerfile | 7 ++----- cli/Dockerfile | 3 +-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/base/Dockerfile b/base/Dockerfile index 646db4a..ba17bff 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -1,14 +1,11 @@ -ARG ALPINE_VERSION=3.21 +ARG ALPINE_VERSION ARG PHP_VERSION=8.0 +ARG TARGETARCH FROM docker.io/skpr/docconv:alpine${ALPINE_VERSION} AS docconv FROM from_image AS base -ARG TARGETARCH -ARG ALPINE_VERSION=3.21 -ARG PHP_VERSION=8.0 - ENV ALPINE_VERSION=${ALPINE_VERSION} ENV PHP_MEMORY_LIMIT=128M ENV PHP_LOG_LIMIT=4096 diff --git a/cli/Dockerfile b/cli/Dockerfile index abe3c0c..97ee6e2 100644 --- a/cli/Dockerfile +++ b/cli/Dockerfile @@ -1,5 +1,4 @@ -ARG ALPINE_VERSION=3.21 - +ARG ALPINE_VERSION FROM alpine:${ALPINE_VERSION} AS redis-cli RUN apk add redis From 50c9c1e20f6e340c218dd9cb5d2e9a6e4afc894b Mon Sep 17 00:00:00 2001 From: Nathan ter Bogt Date: Mon, 30 Mar 2026 13:13:53 +1300 Subject: [PATCH 2/3] Using latest for images so we don't need to update them --- base/Dockerfile | 7 +++++-- cli/Dockerfile | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/base/Dockerfile b/base/Dockerfile index ba17bff..2e6f93d 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -1,11 +1,14 @@ -ARG ALPINE_VERSION +ARG ALPINE_VERSION=latest ARG PHP_VERSION=8.0 -ARG TARGETARCH FROM docker.io/skpr/docconv:alpine${ALPINE_VERSION} AS docconv FROM from_image AS base +ARG ALPINE_VERSION=latest +ARG PHP_VERSION=8.0 +ARG TARGETARCH + ENV ALPINE_VERSION=${ALPINE_VERSION} ENV PHP_MEMORY_LIMIT=128M ENV PHP_LOG_LIMIT=4096 diff --git a/cli/Dockerfile b/cli/Dockerfile index 97ee6e2..9f14384 100644 --- a/cli/Dockerfile +++ b/cli/Dockerfile @@ -1,4 +1,4 @@ -ARG ALPINE_VERSION +ARG ALPINE_VERSION=latest FROM alpine:${ALPINE_VERSION} AS redis-cli RUN apk add redis From 35cb28247e73dccfa14e0daa3500013759358434 Mon Sep 17 00:00:00 2001 From: Nathan ter Bogt Date: Mon, 30 Mar 2026 13:16:58 +1300 Subject: [PATCH 3/3] Bump alpine to 3.23 too --- docker-bake.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-bake.hcl b/docker-bake.hcl index 390bbec..00b0f83 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -3,7 +3,7 @@ variable "PHP_VERSION" { } variable "ALPINE_VERSION" { - default = "3.21" + default = "3.23" } variable "STREAM" {