Update docker file with ARG FROM image

This commit is contained in:
Bensuperpc 2021-05-14 18:51:41 +02:00
parent b4e1b0e87d
commit 9159152331
38 changed files with 76 additions and 38 deletions

View File

@ -202,17 +202,18 @@ $(VERBOSE).SILENT: display_images
# #
# build implicit rule # build implicit rule
# #
$(STANDARD_IMAGES): %: %/Dockerfile base $(STANDARD_IMAGES): %: %/Dockerfile base
mkdir -p $@/imagefiles && cp -r imagefiles $@/ mkdir -p $@/imagefiles && cp -r imagefiles $@/
$(DOCKER) build -t $(ORG)/$@:latest \ $(DOCKER) build -t $(ORG)/$@:latest \
--build-arg IMAGE=$(ORG)/$@ \ --build-arg IMAGE=$(ORG)/$@ \
--build-arg DOCKER_IMAGE=$(ORG)/base:latest \
--build-arg VCS_REF=`git rev-parse --short HEAD` \ --build-arg VCS_REF=`git rev-parse --short HEAD` \
--build-arg VCS_URL=`git config --get remote.origin.url` \ --build-arg VCS_URL=`git config --get remote.origin.url` \
--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \ --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
$@ $@
$(DOCKER) build -t $(ORG)/$@:$(TAG) \ $(DOCKER) build -t $(ORG)/$@:$(TAG) \
--build-arg IMAGE=$(ORG)/$@ \ --build-arg IMAGE=$(ORG)/$@ \
--build-arg DOCKER_IMAGE=$(ORG)/base:latest \
--build-arg VERSION=$(TAG) \ --build-arg VERSION=$(TAG) \
--build-arg VCS_REF=`git rev-parse --short HEAD` \ --build-arg VCS_REF=`git rev-parse --short HEAD` \
--build-arg VCS_URL=`git config --get remote.origin.url` \ --build-arg VCS_URL=`git config --get remote.origin.url` \

View File

@ -1,4 +1,5 @@
FROM bensuperpc/base:latest ARG DOCKER_IMAGE=bensuperpc/base:latest
FROM $DOCKER_IMAGE
MAINTAINER Bensuperpc "bensuperpc@gmail.com" MAINTAINER Bensuperpc "bensuperpc@gmail.com"
# The cross-compiling emulator # The cross-compiling emulator

View File

@ -1,4 +1,5 @@
FROM bensuperpc/base:latest ARG DOCKER_IMAGE=bensuperpc/base:latest
FROM $DOCKER_IMAGE
MAINTAINER Bensuperpc "bensuperpc@gmail.com" MAINTAINER Bensuperpc "bensuperpc@gmail.com"
RUN \ RUN \
sed -i '/debian-security/d' /etc/apt/sources.list && \ sed -i '/debian-security/d' /etc/apt/sources.list && \

View File

@ -1,4 +1,5 @@
FROM bensuperpc/base:latest ARG DOCKER_IMAGE=bensuperpc/base:latest
FROM $DOCKER_IMAGE
MAINTAINER Bensuperpc "bensuperpc@gmail.com" MAINTAINER Bensuperpc "bensuperpc@gmail.com"
RUN apt-get update && apt-get install -y unzip RUN apt-get update && apt-get install -y unzip

View File

@ -1,4 +1,5 @@
FROM bensuperpc/base:latest ARG DOCKER_IMAGE=bensuperpc/base:latest
FROM $DOCKER_IMAGE
MAINTAINER Bensuperpc "bensuperpc@gmail.com" MAINTAINER Bensuperpc "bensuperpc@gmail.com"
RUN apt-get update && apt-get install -y unzip RUN apt-get update && apt-get install -y unzip

View File

@ -1,4 +1,5 @@
FROM bensuperpc/base:latest ARG DOCKER_IMAGE=bensuperpc/base:latest
FROM $DOCKER_IMAGE
MAINTAINER Bensuperpc "bensuperpc@gmail.com" MAINTAINER Bensuperpc "bensuperpc@gmail.com"
# This is for avr # This is for avr

View File

@ -1,4 +1,5 @@
FROM bensuperpc/base:latest ARG DOCKER_IMAGE=bensuperpc/base:latest
FROM $DOCKER_IMAGE
MAINTAINER Bensuperpc "bensuperpc@gmail.com" MAINTAINER Bensuperpc "bensuperpc@gmail.com"
# This is for ARMv5 "legacy" (armel) devices which do NOT support hard float # This is for ARMv5 "legacy" (armel) devices which do NOT support hard float

View File

@ -1,4 +1,5 @@
FROM bensuperpc/base:latest ARG DOCKER_IMAGE=bensuperpc/base:latest
FROM $DOCKER_IMAGE
MAINTAINER Bensuperpc "bensuperpc@gmail.com" MAINTAINER Bensuperpc "bensuperpc@gmail.com"
# This is for ARMv5 "legacy" (armel) devices which do NOT support hard float # This is for ARMv5 "legacy" (armel) devices which do NOT support hard float

View File

@ -1,4 +1,5 @@
FROM bensuperpc/base:latest ARG DOCKER_IMAGE=bensuperpc/base:latest
FROM $DOCKER_IMAGE
MAINTAINER Bensuperpc "bensuperpc@gmail.com" MAINTAINER Bensuperpc "bensuperpc@gmail.com"
ENV XCC_PREFIX /usr/xcc ENV XCC_PREFIX /usr/xcc

View File

@ -1,4 +1,5 @@
FROM bensuperpc/base:latest ARG DOCKER_IMAGE=bensuperpc/base:latest
FROM $DOCKER_IMAGE
MAINTAINER Bensuperpc "bensuperpc@gmail.com" MAINTAINER Bensuperpc "bensuperpc@gmail.com"
# Enable 32 bits binaries # Enable 32 bits binaries

View File

@ -1,4 +1,5 @@
FROM bensuperpc/base:latest ARG DOCKER_IMAGE=bensuperpc/base:latest
FROM $DOCKER_IMAGE
MAINTAINER Bensuperpc "bensuperpc@gmail.com" MAINTAINER Bensuperpc "bensuperpc@gmail.com"
# This is for 32-bit ARMv6 Linux # This is for 32-bit ARMv6 Linux

View File

@ -1,4 +1,5 @@
FROM bensuperpc/base:latest ARG DOCKER_IMAGE=bensuperpc/base:latest
FROM $DOCKER_IMAGE
MAINTAINER Bensuperpc "bensuperpc@gmail.com" MAINTAINER Bensuperpc "bensuperpc@gmail.com"
# This is for 32-bit ARMv7 Linux # This is for 32-bit ARMv7 Linux

View File

@ -1,4 +1,5 @@
FROM bensuperpc/base:latest ARG DOCKER_IMAGE=bensuperpc/base:latest
FROM $DOCKER_IMAGE
MAINTAINER Bensuperpc "bensuperpc@gmail.com" MAINTAINER Bensuperpc "bensuperpc@gmail.com"
# This is for 32-bit ARMv7 Linux # This is for 32-bit ARMv7 Linux

View File

@ -1,4 +1,5 @@
FROM bensuperpc/base:latest ARG DOCKER_IMAGE=bensuperpc/base:latest
FROM $DOCKER_IMAGE
MAINTAINER Bensuperpc "bensuperpc@gmail.com" MAINTAINER Bensuperpc "bensuperpc@gmail.com"
# This is for 32-bit ARMv7 Linux # This is for 32-bit ARMv7 Linux

View File

@ -1,4 +1,5 @@
FROM bensuperpc/base:latest ARG DOCKER_IMAGE=bensuperpc/base:latest
FROM $DOCKER_IMAGE
MAINTAINER Bensuperpc "bensuperpc@gmail.com" MAINTAINER Bensuperpc "bensuperpc@gmail.com"
ENV XCC_PREFIX /usr/xcc ENV XCC_PREFIX /usr/xcc

View File

@ -1,4 +1,5 @@
FROM bensuperpc/base:latest ARG DOCKER_IMAGE=bensuperpc/base:latest
FROM $DOCKER_IMAGE
MAINTAINER Bensuperpc "bensuperpc@gmail.com" MAINTAINER Bensuperpc "bensuperpc@gmail.com"
ENV XCC_PREFIX /usr/xcc ENV XCC_PREFIX /usr/xcc

View File

@ -1,4 +1,5 @@
FROM bensuperpc/base:latest ARG DOCKER_IMAGE=bensuperpc/base:latest
FROM $DOCKER_IMAGE
MAINTAINER Bensuperpc "bensuperpc@gmail.com" MAINTAINER Bensuperpc "bensuperpc@gmail.com"
# This is for 64-bit ARM Linux machine Raspberry PI 4 # This is for 64-bit ARM Linux machine Raspberry PI 4

View File

@ -1,4 +1,5 @@
FROM bensuperpc/base:latest ARG DOCKER_IMAGE=bensuperpc/base:latest
FROM $DOCKER_IMAGE
MAINTAINER Bensuperpc "bensuperpc@gmail.com" MAINTAINER Bensuperpc "bensuperpc@gmail.com"
# This is for 64-bit ARM Linux machine Raspberry PI 4 # This is for 64-bit ARM Linux machine Raspberry PI 4

View File

@ -1,4 +1,5 @@
FROM bensuperpc/base:latest ARG DOCKER_IMAGE=bensuperpc/base:latest
FROM $DOCKER_IMAGE
MAINTAINER Bensuperpc "bensuperpc@gmail.com" MAINTAINER Bensuperpc "bensuperpc@gmail.com"
# This is for 64-bit ARM Linux machine # This is for 64-bit ARM Linux machine

View File

@ -1,4 +1,5 @@
FROM bensuperpc/base:latest ARG DOCKER_IMAGE=bensuperpc/base:latest
FROM $DOCKER_IMAGE
MAINTAINER Bensuperpc "bensuperpc@gmail.com" MAINTAINER Bensuperpc "bensuperpc@gmail.com"
# This is for 32-bit m68k Linux # This is for 32-bit m68k Linux

View File

@ -1,4 +1,5 @@
FROM bensuperpc/base:latest ARG DOCKER_IMAGE=bensuperpc/base:latest
FROM $DOCKER_IMAGE
MAINTAINER Bensuperpc "bensuperpc@gmail.com" MAINTAINER Bensuperpc "bensuperpc@gmail.com"
# This is for 32-bit Big-Endian MIPS devices with hard floating point enabled # This is for 32-bit Big-Endian MIPS devices with hard floating point enabled

View File

@ -1,4 +1,5 @@
FROM bensuperpc/base:latest ARG DOCKER_IMAGE=bensuperpc/base:latest
FROM $DOCKER_IMAGE
MAINTAINER Bensuperpc "bensuperpc@gmail.com" MAINTAINER Bensuperpc "bensuperpc@gmail.com"
# This is for 64-bit Little-Endian MIPS devices with hard floating point enabled # This is for 64-bit Little-Endian MIPS devices with hard floating point enabled

View File

@ -1,4 +1,5 @@
FROM bensuperpc/base:latest ARG DOCKER_IMAGE=bensuperpc/base:latest
FROM $DOCKER_IMAGE
MAINTAINER Bensuperpc "bensuperpc@gmail.com" MAINTAINER Bensuperpc "bensuperpc@gmail.com"
# This is for ARMv5 "legacy" (mipsel) devices which do NOT support hard float # This is for ARMv5 "legacy" (mipsel) devices which do NOT support hard float

View File

@ -1,4 +1,5 @@
FROM bensuperpc/base:latest ARG DOCKER_IMAGE=bensuperpc/base:latest
FROM $DOCKER_IMAGE
MAINTAINER Bensuperpc "bensuperpc@gmail.com" MAINTAINER Bensuperpc "bensuperpc@gmail.com"
# This is for 32-bit PowerPC Linux machine # This is for 32-bit PowerPC Linux machine

View File

@ -1,4 +1,5 @@
FROM bensuperpc/base:latest ARG DOCKER_IMAGE=bensuperpc/base:latest
FROM $DOCKER_IMAGE
MAINTAINER Bensuperpc "bensuperpc@gmail.com" MAINTAINER Bensuperpc "bensuperpc@gmail.com"
# This is for 64-bit PowerPC Linux machine # This is for 64-bit PowerPC Linux machine

View File

@ -1,4 +1,5 @@
FROM bensuperpc/base:latest ARG DOCKER_IMAGE=bensuperpc/base:latest
FROM $DOCKER_IMAGE
MAINTAINER Bensuperpc "bensuperpc@gmail.com" MAINTAINER Bensuperpc "bensuperpc@gmail.com"
# This is for 64-bit PowerPC Linux machine # This is for 64-bit PowerPC Linux machine

View File

@ -1,4 +1,5 @@
FROM bensuperpc/base:latest ARG DOCKER_IMAGE=bensuperpc/base:latest
FROM $DOCKER_IMAGE
MAINTAINER Bensuperpc "bensuperpc@gmail.com" MAINTAINER Bensuperpc "bensuperpc@gmail.com"
# This is for 64-bit riscv64 Linux machine # This is for 64-bit riscv64 Linux machine

View File

@ -1,4 +1,5 @@
FROM bensuperpc/base:latest ARG DOCKER_IMAGE=bensuperpc/base:latest
FROM $DOCKER_IMAGE
MAINTAINER Bensuperpc "bensuperpc@gmail.com" MAINTAINER Bensuperpc "bensuperpc@gmail.com"
# This is for 64-bit riscv64 Linux machine # This is for 64-bit riscv64 Linux machine

View File

@ -1,4 +1,5 @@
FROM bensuperpc/base:latest ARG DOCKER_IMAGE=bensuperpc/base:latest
FROM $DOCKER_IMAGE
MAINTAINER Bensuperpc "bensuperpc@gmail.com" MAINTAINER Bensuperpc "bensuperpc@gmail.com"
# This is for 64-bit S390X Linux machine # This is for 64-bit S390X Linux machine

View File

@ -1,4 +1,5 @@
FROM bensuperpc/base:latest ARG DOCKER_IMAGE=bensuperpc/base:latest
FROM $DOCKER_IMAGE
MAINTAINER Bensuperpc "bensuperpc@gmail.com" MAINTAINER Bensuperpc "bensuperpc@gmail.com"
RUN apt-get update && \ RUN apt-get update && \

View File

@ -1,4 +1,5 @@
FROM bensuperpc/base:latest ARG DOCKER_IMAGE=bensuperpc/base:latest
FROM $DOCKER_IMAGE
MAINTAINER Bensuperpc "bensuperpc@gmail.com" MAINTAINER Bensuperpc "bensuperpc@gmail.com"
RUN apt-get update && \ RUN apt-get update && \

View File

@ -1,4 +1,5 @@
FROM bensuperpc/base:latest ARG DOCKER_IMAGE=bensuperpc/base:latest
FROM $DOCKER_IMAGE
MAINTAINER Bensuperpc "bensuperpc@gmail.com" MAINTAINER Bensuperpc "bensuperpc@gmail.com"
RUN dpkg --add-architecture i386 && \ RUN dpkg --add-architecture i386 && \

View File

@ -1,4 +1,5 @@
FROM bensuperpc/base:latest ARG DOCKER_IMAGE=bensuperpc/base:latest
FROM $DOCKER_IMAGE
MAINTAINER Bensuperpc "bensuperpc@gmail.com" MAINTAINER Bensuperpc "bensuperpc@gmail.com"
ENV WINEARCH win64 ENV WINEARCH win64

View File

@ -1,4 +1,5 @@
FROM bensuperpc/base:latest ARG DOCKER_IMAGE=bensuperpc/base:latest
FROM $DOCKER_IMAGE
MAINTAINER Bensuperpc "bensuperpc@gmail.com" MAINTAINER Bensuperpc "bensuperpc@gmail.com"
ENV WINEARCH win64 ENV WINEARCH win64

View File

@ -1,4 +1,5 @@
FROM bensuperpc/base:latest ARG DOCKER_IMAGE=bensuperpc/base:latest
FROM $DOCKER_IMAGE
MAINTAINER Bensuperpc "bensuperpc@gmail.com" MAINTAINER Bensuperpc "bensuperpc@gmail.com"
ENV WINEARCH win32 ENV WINEARCH win32

View File

@ -1,4 +1,5 @@
FROM bensuperpc/base:latest ARG DOCKER_IMAGE=bensuperpc/base:latest
FROM $DOCKER_IMAGE
MAINTAINER Bensuperpc "bensuperpc@gmail.com" MAINTAINER Bensuperpc "bensuperpc@gmail.com"
ENV WINEARCH win64 ENV WINEARCH win64

View File

@ -1,4 +1,5 @@
FROM bensuperpc/base:latest ARG DOCKER_IMAGE=bensuperpc/base:latest
FROM $DOCKER_IMAGE
MAINTAINER Bensuperpc "bensuperpc@gmail.com" MAINTAINER Bensuperpc "bensuperpc@gmail.com"
ENV WINEARCH win64 ENV WINEARCH win64

View File

@ -1,4 +1,5 @@
FROM bensuperpc/base:latest ARG DOCKER_IMAGE=bensuperpc/base:latest
FROM $DOCKER_IMAGE
MAINTAINER Bensuperpc "bensuperpc@gmail.com" MAINTAINER Bensuperpc "bensuperpc@gmail.com"
ENV WINEARCH win32 ENV WINEARCH win32