Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2025-06-22 10:53:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update docker file with ARG FROM image

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

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