From a039260ed4161248d0f3af2729ec0aba4b9532b5 Mon Sep 17 00:00:00 2001 From: Lars Francke Date: Sat, 15 Nov 2025 06:22:21 +0100 Subject: [PATCH] Fix Dockerfiles by moving the BASE_IMAGE arg into the global scope (#3536) fix: Fix Dockerfiles by moving the BASE_IMAGE arg into the global scope Signed-off-by: Lars Francke --- build/Dockerfile | 11 ++++++++++- build/Dockerfile-conformance | 11 ++++++++++- build/Dockerfile-minimal | 11 ++++++++++- build/Dockerfile-zb | 11 ++++++++++- build/Dockerfile-zxp | 11 ++++++++++- 5 files changed, 50 insertions(+), 5 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index f7dfdb57..ba6a0cce 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,3 +1,13 @@ +# --- +# Global ARGs for FROM statements +# This needs to be declared in the global scope otherwise the build will fail in Docker & Podman. +# Docker: +# WARNING: UndefinedArgInFrom - https://docs.docker.com/go/dockerfile/rule/undefined-arg-in-from/ +# FROM argument 'BASE_IMAGE' is not declared +# Podman: Error: determining starting point for build: no FROM statement found +# --- +ARG BASE_IMAGE + # --- # Stage 1: Install certs, build binary, create default config file # --- @@ -28,7 +38,6 @@ RUN echo '{\n\ # --- # Stage 2: Final image with nothing but certs, binary, and default config file # --- -ARG BASE_IMAGE FROM $BASE_IMAGE AS final ARG TARGETOS ARG TARGETARCH diff --git a/build/Dockerfile-conformance b/build/Dockerfile-conformance index efa7d4b1..df53b223 100644 --- a/build/Dockerfile-conformance +++ b/build/Dockerfile-conformance @@ -1,3 +1,13 @@ +# --- +# Global ARGs for FROM statements +# This needs to be declared in the global scope otherwise the build will fail in Docker & Podman. +# Docker: +# WARNING: UndefinedArgInFrom - https://docs.docker.com/go/dockerfile/rule/undefined-arg-in-from/ +# FROM argument 'BASE_IMAGE' is not declared +# Podman: Error: determining starting point for build: no FROM statement found +# --- +ARG BASE_IMAGE + # --- # Stage 1: Install certs, build binary, create default config file # --- @@ -24,7 +34,6 @@ storage:\n\ # --- # Stage 2: Final image with nothing but certs, binary, and default config file # --- -ARG BASE_IMAGE FROM $BASE_IMAGE AS final ARG TARGETOS ARG TARGETARCH diff --git a/build/Dockerfile-minimal b/build/Dockerfile-minimal index 964401e8..a1944508 100644 --- a/build/Dockerfile-minimal +++ b/build/Dockerfile-minimal @@ -1,3 +1,13 @@ +# --- +# Global ARGs for FROM statements +# This needs to be declared in the global scope otherwise the build will fail in Docker & Podman. +# Docker: +# WARNING: UndefinedArgInFrom - https://docs.docker.com/go/dockerfile/rule/undefined-arg-in-from/ +# FROM argument 'BASE_IMAGE' is not declared +# Podman: Error: determining starting point for build: no FROM statement found +# --- +ARG BASE_IMAGE + # --- # Stage 1: Install certs, build binary, create default config file # --- @@ -27,7 +37,6 @@ RUN echo '{\n\ # --- # Stage 2: Final image with nothing but certs, binary, and default config file # --- -ARG BASE_IMAGE FROM $BASE_IMAGE AS final ARG TARGETOS ARG TARGETARCH diff --git a/build/Dockerfile-zb b/build/Dockerfile-zb index 138d0c87..2e7237ca 100644 --- a/build/Dockerfile-zb +++ b/build/Dockerfile-zb @@ -1,3 +1,13 @@ +# --- +# Global ARGs for FROM statements +# This needs to be declared in the global scope otherwise the build will fail in Docker & Podman. +# Docker: +# WARNING: UndefinedArgInFrom - https://docs.docker.com/go/dockerfile/rule/undefined-arg-in-from/ +# FROM argument 'BASE_IMAGE' is not declared +# Podman: Error: determining starting point for build: no FROM statement found +# --- +ARG BASE_IMAGE + # --- # Stage 1: Install certs, build binary, create default config file # --- @@ -15,7 +25,6 @@ RUN make COMMIT=$COMMIT OS=$TARGETOS ARCH=$TARGETARCH clean bench # --- # Stage 2: Final image with nothing but certs, binary, and default config file # --- -ARG BASE_IMAGE FROM BASE_IMAGE AS final ARG TARGETOS ARG TARGETARCH diff --git a/build/Dockerfile-zxp b/build/Dockerfile-zxp index bd0c5645..1cb25eb5 100644 --- a/build/Dockerfile-zxp +++ b/build/Dockerfile-zxp @@ -1,3 +1,13 @@ +# --- +# Global ARGs for FROM statements +# This needs to be declared in the global scope otherwise the build will fail in Docker & Podman. +# Docker: +# WARNING: UndefinedArgInFrom - https://docs.docker.com/go/dockerfile/rule/undefined-arg-in-from/ +# FROM argument 'BASE_IMAGE' is not declared +# Podman: Error: determining starting point for build: no FROM statement found +# --- +ARG BASE_IMAGE + # --- # Stage 1: Build binary, create default config file # --- @@ -28,7 +38,6 @@ RUN echo '{\n\ # --- # Stage 2: Final image with nothing but binary and default config file # --- -ARG BASE_IMAGE FROM $BASE_IMAGE AS final ARG TARGETOS ARG TARGETARCH