From dde484ac61423603a1240489bc1505de32f36d3b Mon Sep 17 00:00:00 2001 From: pi-farm Date: Mon, 16 Mar 2026 17:38:35 +0100 Subject: [PATCH] fix BUILD_BASE_IMAGE in Dockerfiles --- Dockerfile | 4 ++-- Dockerfile.aarch64 | 4 ++-- buildargs.env | 7 +++---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1f498c0..7beff97 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 - -FROM alpine:3 AS rootfs-stage +ARG BUILD_BASE_IMAGE +FROM ${BUILD_BASE_IMAGE} AS rootfs-stage ARG BUILD_APP_VERSION ARG BUILD_S6_ARCH_amd64 diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 10fefb8..622aba7 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 - -FROM alpine:3 AS rootfs-stage +ARG BUILD_BASE_IMAGE +FROM ${BUILD_BASE_IMAGE} AS rootfs-stage ARG BUILD_APP_VERSION ARG BUILD_S6_ARCH_aarch64 diff --git a/buildargs.env b/buildargs.env index e5c2a52..cc382dc 100644 --- a/buildargs.env +++ b/buildargs.env @@ -1,5 +1,6 @@ ## BUILD STAGE -BUILD_BASE_TAG=3 +BUILD_BASE_TAG=3.23 +BUILD_TAG_LATEST=y BUILD_BASE_IMAGE=alpine:${BUILD_BASE_TAG} ## Examples for BUILD_BASE_IMAGE # alpine:${BUILD_TAG} @@ -13,13 +14,11 @@ BUILD_S6_ARCH_amd64=x86_64 BUILD_S6_ARCH_aarch64=aarch64 BUILD_S6_OVERLAY_VERSION=3.2.1.0 BUILD_MAINTAINER=pi-farm -BUILD_APP_VERSION=v${BUILD_BASE_TAG} +BUILD_APP_VERSION=trixie-slim BUILD_APP_NAME=baseimage-debian BUILD_APP_USER=pi BUILD_APP_UID=1000 BUILD_APP_GID=1000 -TARGET_BASE_TAG=trixie-slim -TARGET_BASE_IMAGE=debian:${TARGET_BASE_TAG} ## ENV STAGE ENV_TZ=Europe/Berlin ENV_PUID=1000