mirror of
https://github.com/bensuperpc/dockcross.git
synced 2024-12-23 00:54:26 +01:00
Update docker file with ARG FROM image
This commit is contained in:
parent
b4e1b0e87d
commit
9159152331
3
Makefile
3
Makefile
@ -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` \
|
||||||
|
@ -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
|
||||||
|
@ -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 && \
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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 && \
|
||||||
|
@ -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 && \
|
||||||
|
@ -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 && \
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user