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

versioning: Set DEFAULT_DOCKCROSS_IMAGE based on the image tag

Browse Source 
This ensures that the dockcross script will continue to use the specific
tagged version of the image that generates it.
This commit is contained in:
Matt McCormick
2019-01-13 15:50:24 -05:00
parent 6c36c469b7
commit c96cbdc956
19 changed files with 152 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Makefile
View File

@ -105,7 +105,13 @@ manylinux-x64: manylinux-x64/Dockerfile
--build-arg VCS_URL=`git config --get remote.origin.url` \
--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
-f manylinux-x64/Dockerfile .
$(DOCKER) tag $(ORG)/manylinux-x64:latest $(ORG)/manylinux-x64:$(TAG)
$(DOCKER) build -t $(ORG)/manylinux-x64:$(TAG) \
--build-arg IMAGE=$(ORG)/manylinux-x64 \
--build-arg VERSION=$(TAG) \
--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"` \
-f manylinux-x64/Dockerfile .
rm -rf $@/imagefiles
manylinux-x64.test: manylinux-x64
@ -124,7 +130,13 @@ manylinux-x86: manylinux-x86/Dockerfile
--build-arg VCS_URL=`git config --get remote.origin.url` \
--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
-f manylinux-x86/Dockerfile .
$(DOCKER) tag $(ORG)/manylinux-x86:latest $(ORG)/manylinux-x86:$(TAG)
$(DOCKER) build -t $(ORG)/manylinux-x86:$(TAG) \
--build-arg IMAGE=$(ORG)/manylinux-x86 \
--build-arg VERSION=$(TAG) \
--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"` \
-f manylinux-x86/Dockerfile .
rm -rf $@/imagefiles
manylinux-x86.test: manylinux-x86
@ -164,7 +176,13 @@ $(STANDARD_IMAGES): %: %/Dockerfile base
--build-arg VCS_URL=`git config --get remote.origin.url` \
--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
$@
$(DOCKER) tag $(ORG)/$@:latest $(ORG)/$@:$(TAG)
$(DOCKER) build -t $(ORG)/$@:$(TAG) \
--build-arg IMAGE=$(ORG)/$@ \
--build-arg VERSION=$(TAG) \
--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"` \
$@
rm -rf $@/imagefiles
#