From 70ac373206642339ff5cc9e9b091723156082499 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Wed, 26 May 2021 12:42:49 +0100 Subject: [PATCH] kernel: Fix ARG handling in Dockerfiles At least for the perf image I got an error when not having the ARG up front. Signed-off-by: Rolf Neugebauer --- kernel/Dockerfile.bcc | 3 ++- kernel/Dockerfile.kconfig | 4 ++-- kernel/Dockerfile.perf | 3 ++- kernel/Dockerfile.zfs | 3 ++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/kernel/Dockerfile.bcc b/kernel/Dockerfile.bcc index 95114f5d4..f84a8425d 100644 --- a/kernel/Dockerfile.bcc +++ b/kernel/Dockerfile.bcc @@ -1,7 +1,8 @@ ARG IMAGE +ARG BUILD_IMAGE + FROM ${IMAGE} as ksrc -ARG BUILD_IMAGE FROM ${BUILD_IMAGE} AS build RUN apk update && apk upgrade -a && \ apk add --no-cache \ diff --git a/kernel/Dockerfile.kconfig b/kernel/Dockerfile.kconfig index 9a89ccd92..3858fea96 100644 --- a/kernel/Dockerfile.kconfig +++ b/kernel/Dockerfile.kconfig @@ -1,4 +1,6 @@ ARG BUILD_IMAGE +ARG KERNEL_VERSIONS + FROM ${BUILD_IMAGE} AS kernel-build RUN apk add \ argp-standalone \ @@ -15,8 +17,6 @@ RUN apk add \ patch \ xz -ARG KERNEL_VERSIONS - COPY / / # Unpack kernels (download if not present) diff --git a/kernel/Dockerfile.perf b/kernel/Dockerfile.perf index c6444d5c4..ec906ee89 100644 --- a/kernel/Dockerfile.perf +++ b/kernel/Dockerfile.perf @@ -1,9 +1,10 @@ # This Dockerfile extracts the source code and headers from a kernel package, # builds the perf utility, and places it into a scratch image ARG IMAGE +ARG BUILD_IMAGE + FROM ${IMAGE} AS ksrc -ARG BUILD_IMAGE FROM ${BUILD_IMAGE} AS build RUN apk add \ argp-standalone \ diff --git a/kernel/Dockerfile.zfs b/kernel/Dockerfile.zfs index 8729c54e9..caae046c9 100644 --- a/kernel/Dockerfile.zfs +++ b/kernel/Dockerfile.zfs @@ -1,7 +1,8 @@ ARG IMAGE +ARG BUILD_IMAGE + FROM ${IMAGE} AS ksrc -ARG BUILD_IMAGE FROM ${BUILD_IMAGE} AS build RUN apk add \ attr-dev \