github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-19 17:26:28 +00:00
Code Issues Projects Releases Wiki Activity

kernel: Fix ARG handling in Dockerfiles

Browse Source 
At least for the perf image I got an error when
not having the ARG up front.

Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
This commit is contained in:
Rolf Neugebauer 2021-05-26 12:42:49 +01:00
parent c25cc37643
commit 70ac373206
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kernel/Dockerfile.bcc
View File

@ -1,7 +1,8 @@
ARG IMAGE ARG IMAGE
ARG BUILD_IMAGE
FROM ${IMAGE} as ksrc FROM ${IMAGE} as ksrc
ARG BUILD_IMAGE
FROM ${BUILD_IMAGE} AS build FROM ${BUILD_IMAGE} AS build
RUN apk update && apk upgrade -a && \ RUN apk update && apk upgrade -a && \
apk add --no-cache \ apk add --no-cache \

4
kernel/Dockerfile.kconfig
View File

@ -1,4 +1,6 @@
ARG BUILD_IMAGE ARG BUILD_IMAGE
ARG KERNEL_VERSIONS
FROM ${BUILD_IMAGE} AS kernel-build FROM ${BUILD_IMAGE} AS kernel-build
RUN apk add \ RUN apk add \
argp-standalone \ argp-standalone \
@ -15,8 +17,6 @@ RUN apk add \
patch \ patch \
xz xz
ARG KERNEL_VERSIONS
COPY / / COPY / /
# Unpack kernels (download if not present) # Unpack kernels (download if not present)

3
kernel/Dockerfile.perf
View File

@ -1,9 +1,10 @@
# This Dockerfile extracts the source code and headers from a kernel package, # This Dockerfile extracts the source code and headers from a kernel package,
# builds the perf utility, and places it into a scratch image # builds the perf utility, and places it into a scratch image
ARG IMAGE ARG IMAGE
ARG BUILD_IMAGE
FROM ${IMAGE} AS ksrc FROM ${IMAGE} AS ksrc
ARG BUILD_IMAGE
FROM ${BUILD_IMAGE} AS build FROM ${BUILD_IMAGE} AS build
RUN apk add \ RUN apk add \
argp-standalone \ argp-standalone \

3
kernel/Dockerfile.zfs
View File

@ -1,7 +1,8 @@
ARG IMAGE ARG IMAGE
ARG BUILD_IMAGE
FROM ${IMAGE} AS ksrc FROM ${IMAGE} AS ksrc
ARG BUILD_IMAGE
FROM ${BUILD_IMAGE} AS build FROM ${BUILD_IMAGE} AS build
RUN apk add \ RUN apk add \
attr-dev \ attr-dev \