Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2024-11-09 20:57:26 +01: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
No known key found for this signature in database
GPG Key ID: 45DA982347954FA5
19 changed files with 152 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129
.circleci/config.yml
View File

@ -35,7 +35,8 @@ jobs:
command: | command: |
docker load -i ~/docker/base.tar docker load -i ~/docker/base.tar
make android-arm make android-arm
docker save -o ~/docker/android-arm.tar dockcross/android-arm:latest tagged=$(docker images -q -f 'since=dockcross/android-arm:latest' --format '{{.Repository}}:{{.Tag}}' | grep android-arm)
docker save -o ~/docker/android-arm.tar dockcross/android-arm:latest $tagged
- run: - run:
name: android-arm test name: android-arm test
command: | command: |
@ -54,7 +55,8 @@ jobs:
command: | command: |
docker load -i ~/docker/base.tar docker load -i ~/docker/base.tar
make android-arm64 make android-arm64
docker save -o ~/docker/android-arm64.tar dockcross/android-arm64:latest tagged=$(docker images -q -f 'since=dockcross/android-arm64:latest' --format '{{.Repository}}:{{.Tag}}' | grep android-arm64)
docker save -o ~/docker/android-arm64.tar dockcross/android-arm64:latest $tagged
- run: - run:
name: android-arm64 test name: android-arm64 test
command: | command: |
@ -93,7 +95,8 @@ jobs:
command: | command: |
docker load -i ~/docker/base.tar docker load -i ~/docker/base.tar
make linux-arm64 make linux-arm64
docker save -o ~/docker/linux-arm64.tar dockcross/linux-arm64:latest tagged=$(docker images -q -f 'since=dockcross/linux-arm64:latest' --format '{{.Repository}}:{{.Tag}}' | grep linux-arm64)
docker save -o ~/docker/linux-arm64.tar dockcross/linux-arm64:latest $tagged
- run: - run:
name: linux-arm64 test name: linux-arm64 test
command: | command: |
@ -112,7 +115,8 @@ jobs:
command: | command: |
docker load -i ~/docker/base.tar docker load -i ~/docker/base.tar
make linux-armv5 make linux-armv5
docker save -o ~/docker/linux-armv5.tar dockcross/linux-armv5:latest tagged=$(docker images -q -f 'since=dockcross/linux-armv5:latest' --format '{{.Repository}}:{{.Tag}}' | grep linux-armv5)
docker save -o ~/docker/linux-armv5.tar dockcross/linux-armv5:latest $tagged
- run: - run:
name: linux-armv5 test name: linux-armv5 test
command: | command: |
@ -131,7 +135,8 @@ jobs:
command: | command: |
docker load -i ~/docker/base.tar docker load -i ~/docker/base.tar
make linux-armv6 make linux-armv6
docker save -o ~/docker/linux-armv6.tar dockcross/linux-armv6:latest tagged=$(docker images -q -f 'since=dockcross/linux-armv6:latest' --format '{{.Repository}}:{{.Tag}}' | grep linux-armv6)
docker save -o ~/docker/linux-armv6.tar dockcross/linux-armv6:latest $tagged
- run: - run:
name: linux-armv6 test name: linux-armv6 test
command: | command: |
@ -150,7 +155,8 @@ jobs:
command: | command: |
docker load -i ~/docker/base.tar docker load -i ~/docker/base.tar
make linux-armv7 make linux-armv7
docker save -o ~/docker/linux-armv7.tar dockcross/linux-armv7:latest tagged=$(docker images -q -f 'since=dockcross/linux-armv7:latest' --format '{{.Repository}}:{{.Tag}}' | grep linux-armv7)
docker save -o ~/docker/linux-armv7.tar dockcross/linux-armv7:latest $tagged
- run: - run:
name: linux-armv7 test name: linux-armv7 test
command: | command: |
@ -170,7 +176,8 @@ jobs:
#command: | #command: |
#docker load -i ~/docker/base.tar #docker load -i ~/docker/base.tar
#make linux-mipsel #make linux-mipsel
#docker save -o ~/docker/linux-mipsel.tar dockcross/linux-mipsel:latest #tagged=$(docker images -q -f 'since=dockcross/linux-mipsel:latest' --format '{{.Repository}}:{{.Tag}}' | grep linux-mipsel)
#docker save -o ~/docker/linux-mipsel.tar dockcross/linux-mipsel:latest $tagged
#- run: #- run:
#name: linux-mipsel test #name: linux-mipsel test
#command: | #command: |
@ -189,7 +196,8 @@ jobs:
command: | command: |
docker load -i ~/docker/base.tar docker load -i ~/docker/base.tar
make linux-s390x make linux-s390x
docker save -o ~/docker/linux-s390x.tar dockcross/linux-s390x:latest tagged=$(docker images -q -f 'since=dockcross/linux-s390x:latest' --format '{{.Repository}}:{{.Tag}}' | grep linux-s390x)
docker save -o ~/docker/linux-s390x.tar dockcross/linux-s390x:latest $tagged
- run: - run:
name: linux-s390x test name: linux-s390x test
command: | command: |
@ -209,7 +217,8 @@ jobs:
#command: | #command: |
#docker load -i ~/docker/base.tar #docker load -i ~/docker/base.tar
#make linux-ppc64le #make linux-ppc64le
#docker save -o ~/docker/linux-ppc64le.tar dockcross/linux-ppc64le:latest #tagged=$(docker images -q -f 'since=dockcross/linux-ppc64le:latest' --format '{{.Repository}}:{{.Tag}}' | grep linux-ppc64le)
#docker save -o ~/docker/linux-ppc64le.tar dockcross/linux-ppc64le:latest $tagged
#- run: #- run:
#name: linux-ppc64le test #name: linux-ppc64le test
#command: | #command: |
@ -228,7 +237,8 @@ jobs:
command: | command: |
docker load -i ~/docker/base.tar docker load -i ~/docker/base.tar
make linux-x64 make linux-x64
docker save -o ~/docker/linux-x64.tar dockcross/linux-x64:latest tagged=$(docker images -q -f 'since=dockcross/linux-x64:latest' --format '{{.Repository}}:{{.Tag}}' | grep linux-x64)
docker save -o ~/docker/linux-x64.tar dockcross/linux-x64:latest $tagged
- run: - run:
name: linux-x64 test name: linux-x64 test
command: | command: |
@ -247,7 +257,8 @@ jobs:
command: | command: |
docker load -i ~/docker/base.tar docker load -i ~/docker/base.tar
make linux-x86 make linux-x86
docker save -o ~/docker/linux-x86.tar dockcross/linux-x86:latest tagged=$(docker images -q -f 'since=dockcross/linux-x86:latest' --format '{{.Repository}}:{{.Tag}}' | grep linux-x86)
docker save -o ~/docker/linux-x86.tar dockcross/linux-x86:latest $tagged
- run: - run:
name: linux-x86 test name: linux-x86 test
command: | command: |
@ -266,7 +277,8 @@ jobs:
command: | command: |
docker load -i ~/docker/base.tar docker load -i ~/docker/base.tar
make manylinux-x64 make manylinux-x64
docker save -o ~/docker/manylinux-x64.tar dockcross/manylinux-x64:latest tagged=$(docker images -q -f 'since=dockcross/manylinux-x64:latest' --format '{{.Repository}}:{{.Tag}}' | grep manylinux-x64)
docker save -o ~/docker/manylinux-x64.tar dockcross/manylinux-x64:latest $tagged
- run: - run:
name: manylinux-x64 test name: manylinux-x64 test
command: | command: |
@ -285,7 +297,8 @@ jobs:
command: | command: |
docker load -i ~/docker/base.tar docker load -i ~/docker/base.tar
make manylinux-x86 make manylinux-x86
docker save -o ~/docker/manylinux-x86.tar dockcross/manylinux-x86:latest tagged=$(docker images -q -f 'since=dockcross/manylinux-x86:latest' --format '{{.Repository}}:{{.Tag}}' | grep manylinux-x86)
docker save -o ~/docker/manylinux-x86.tar dockcross/manylinux-x86:latest $tagged
- run: - run:
name: manylinux-x86 test name: manylinux-x86 test
command: | command: |
@ -304,7 +317,8 @@ jobs:
command: | command: |
docker load -i ~/docker/base.tar docker load -i ~/docker/base.tar
make windows-x64 make windows-x64
docker save -o ~/docker/windows-x64.tar dockcross/windows-x64:latest tagged=$(docker images -q -f 'since=dockcross/windows-x64:latest' --format '{{.Repository}}:{{.Tag}}' | grep windows-x64)
docker save -o ~/docker/windows-x64.tar dockcross/windows-x64:latest $tagged
- run: - run:
name: windows-x64 test name: windows-x64 test
command: | command: |
@ -323,7 +337,8 @@ jobs:
command: | command: |
docker load -i ~/docker/base.tar docker load -i ~/docker/base.tar
make windows-x64-posix make windows-x64-posix
docker save -o ~/docker/windows-x64-posix.tar dockcross/windows-x64-posix:latest tagged=$(docker images -q -f 'since=dockcross/windows-x64-posix:latest' --format '{{.Repository}}:{{.Tag}}' | grep windows-x64-posix)
docker save -o ~/docker/windows-x64-posix.tar dockcross/windows-x64-posix:latest $tagged
- run: - run:
name: windows-x64-posix test name: windows-x64-posix test
command: | command: |
@ -342,6 +357,7 @@ jobs:
command: | command: |
docker load -i ~/docker/base.tar docker load -i ~/docker/base.tar
make windows-x86 make windows-x86
tagged=$(docker images -q -f 'since=dockcross/windows-x86:latest' --format '{{.Repository}}:{{.Tag}}' | grep windows-x86)
docker save -o ~/docker/windows-x86.tar dockcross/windows-x86:latest docker save -o ~/docker/windows-x86.tar dockcross/windows-x86:latest
- run: - run:
name: windows-x86 test name: windows-x86 test
@ -361,10 +377,7 @@ jobs:
docker load -i ~/docker/base.tar docker load -i ~/docker/base.tar
if [ "${CIRCLE_BRANCH}" == "master" ]; then if [ "${CIRCLE_BRANCH}" == "master" ]; then
docker login -u $DOCKER_USER -p $DOCKER_PASS docker login -u $DOCKER_USER -p $DOCKER_PASS
TAG=$(date '+%Y%m%d')-$(git rev-parse --short HEAD)
docker push dockcross/base:latest docker push dockcross/base:latest
docker tag dockcross/base:latest dockcross/base:${TAG}
docker push dockcross/base:${TAG}
fi fi
- restore_cache: - restore_cache:
key: android-arm-assets-{{ .Revision }} key: android-arm-assets-{{ .Revision }}
@ -374,10 +387,9 @@ jobs:
docker load -i ~/docker/android-arm.tar docker load -i ~/docker/android-arm.tar
if [ "${CIRCLE_BRANCH}" == "master" ]; then if [ "${CIRCLE_BRANCH}" == "master" ]; then
docker login -u $DOCKER_USER -p $DOCKER_PASS docker login -u $DOCKER_USER -p $DOCKER_PASS
TAG=$(date '+%Y%m%d')-$(git rev-parse --short HEAD)
docker push dockcross/android-arm:latest docker push dockcross/android-arm:latest
docker tag dockcross/android-arm:latest dockcross/android-arm:${TAG} tagged=$(docker images -q -f 'since=dockcross/android-arm:latest' --format '{{.Repository}}:{{.Tag}}' | grep android-arm)
docker push dockcross/android-arm:${TAG} docker push $tagged
fi fi
- restore_cache: - restore_cache:
key: android-arm64-assets-{{ .Revision }} key: android-arm64-assets-{{ .Revision }}
@ -387,10 +399,9 @@ jobs:
docker load -i ~/docker/android-arm64.tar docker load -i ~/docker/android-arm64.tar
if [ "${CIRCLE_BRANCH}" == "master" ]; then if [ "${CIRCLE_BRANCH}" == "master" ]; then
docker login -u $DOCKER_USER -p $DOCKER_PASS docker login -u $DOCKER_USER -p $DOCKER_PASS
TAG=$(date '+%Y%m%d')-$(git rev-parse --short HEAD)
docker push dockcross/android-arm64:latest docker push dockcross/android-arm64:latest
docker tag dockcross/android-arm64:latest dockcross/android-arm64:${TAG} tagged=$(docker images -q -f 'since=dockcross/android-arm64:latest' --format '{{.Repository}}:{{.Tag}}' | grep android-arm64)
docker push dockcross/android-arm64:${TAG} docker push $tagged
fi fi
- restore_cache: - restore_cache:
key: browser-asmjs-assets-{{ .Revision }} key: browser-asmjs-assets-{{ .Revision }}
@ -412,10 +423,9 @@ jobs:
docker load -i ~/docker/linux-arm64.tar docker load -i ~/docker/linux-arm64.tar
if [ "${CIRCLE_BRANCH}" == "master" ]; then if [ "${CIRCLE_BRANCH}" == "master" ]; then
docker login -u $DOCKER_USER -p $DOCKER_PASS docker login -u $DOCKER_USER -p $DOCKER_PASS
TAG=$(date '+%Y%m%d')-$(git rev-parse --short HEAD)
docker push dockcross/linux-arm64:latest docker push dockcross/linux-arm64:latest
docker tag dockcross/linux-arm64:latest dockcross/linux-arm64:${TAG} tagged=$(docker images -q -f 'since=dockcross/linux-arm64:latest' --format '{{.Repository}}:{{.Tag}}' | grep linux-arm64)
docker push dockcross/linux-arm64:${TAG} docker push $tagged
fi fi
- restore_cache: - restore_cache:
key: linux-armv5-assets-{{ .Revision }} key: linux-armv5-assets-{{ .Revision }}
@ -425,10 +435,9 @@ jobs:
docker load -i ~/docker/linux-armv5.tar docker load -i ~/docker/linux-armv5.tar
if [ "${CIRCLE_BRANCH}" == "master" ]; then if [ "${CIRCLE_BRANCH}" == "master" ]; then
docker login -u $DOCKER_USER -p $DOCKER_PASS docker login -u $DOCKER_USER -p $DOCKER_PASS
TAG=$(date '+%Y%m%d')-$(git rev-parse --short HEAD)
docker push dockcross/linux-armv5:latest docker push dockcross/linux-armv5:latest
docker tag dockcross/linux-armv5:latest dockcross/linux-armv5:${TAG} tagged=$(docker images -q -f 'since=dockcross/linux-armv5:latest' --format '{{.Repository}}:{{.Tag}}' | grep linux-armv5)
docker push dockcross/linux-armv5:${TAG} docker push $tagged
fi fi
- restore_cache: - restore_cache:
key: linux-armv6-assets-{{ .Revision }} key: linux-armv6-assets-{{ .Revision }}
@ -438,10 +447,9 @@ jobs:
docker load -i ~/docker/linux-armv6.tar docker load -i ~/docker/linux-armv6.tar
if [ "${CIRCLE_BRANCH}" == "master" ]; then if [ "${CIRCLE_BRANCH}" == "master" ]; then
docker login -u $DOCKER_USER -p $DOCKER_PASS docker login -u $DOCKER_USER -p $DOCKER_PASS
TAG=$(date '+%Y%m%d')-$(git rev-parse --short HEAD)
docker push dockcross/linux-armv6:latest docker push dockcross/linux-armv6:latest
docker tag dockcross/linux-armv6:latest dockcross/linux-armv6:${TAG} tagged=$(docker images -q -f 'since=dockcross/linux-armv6:latest' --format '{{.Repository}}:{{.Tag}}' | grep linux-armv6)
docker push dockcross/linux-armv6:${TAG} docker push $tagged
fi fi
- restore_cache: - restore_cache:
key: linux-armv7-assets-{{ .Revision }} key: linux-armv7-assets-{{ .Revision }}
@ -451,10 +459,9 @@ jobs:
docker load -i ~/docker/linux-armv7.tar docker load -i ~/docker/linux-armv7.tar
if [ "${CIRCLE_BRANCH}" == "master" ]; then if [ "${CIRCLE_BRANCH}" == "master" ]; then
docker login -u $DOCKER_USER -p $DOCKER_PASS docker login -u $DOCKER_USER -p $DOCKER_PASS
TAG=$(date '+%Y%m%d')-$(git rev-parse --short HEAD)
docker push dockcross/linux-armv7:latest docker push dockcross/linux-armv7:latest
docker tag dockcross/linux-armv7:latest dockcross/linux-armv7:${TAG} tagged=$(docker images -q -f 'since=dockcross/linux-armv7:latest' --format '{{.Repository}}:{{.Tag}}' | grep linux-armv7)
docker push dockcross/linux-armv7:${TAG} docker push $tagged
fi fi
# Image build currently broken. See #209 # Image build currently broken. See #209
#- restore_cache: #- restore_cache:
@ -465,10 +472,9 @@ jobs:
#docker load -i ~/docker/linux-mipsel.tar #docker load -i ~/docker/linux-mipsel.tar
#if [ "${CIRCLE_BRANCH}" == "master" ]; then #if [ "${CIRCLE_BRANCH}" == "master" ]; then
#docker login -u $DOCKER_USER -p $DOCKER_PASS #docker login -u $DOCKER_USER -p $DOCKER_PASS
#TAG=$(date '+%Y%m%d')-$(git rev-parse --short HEAD)
#docker push dockcross/linux-mipsel:latest #docker push dockcross/linux-mipsel:latest
#docker tag dockcross/linux-mipsel:latest dockcross/linux-mipsel:${TAG} #tagged=$(docker images -q -f 'since=dockcross/linux-mipsel:latest' --format '{{.Repository}}:{{.Tag}}' | grep linux-mipsel)
#docker push dockcross/linux-mipsel:${TAG} #docker push $tagged
#fi #fi
- restore_cache: - restore_cache:
key: linux-s390x-assets-{{ .Revision }} key: linux-s390x-assets-{{ .Revision }}
@ -478,10 +484,9 @@ jobs:
docker load -i ~/docker/linux-s390x.tar docker load -i ~/docker/linux-s390x.tar
if [ "${CIRCLE_BRANCH}" == "master" ]; then if [ "${CIRCLE_BRANCH}" == "master" ]; then
docker login -u $DOCKER_USER -p $DOCKER_PASS docker login -u $DOCKER_USER -p $DOCKER_PASS
TAG=$(date '+%Y%m%d')-$(git rev-parse --short HEAD)
docker push dockcross/linux-s390x:latest docker push dockcross/linux-s390x:latest
docker tag dockcross/linux-s390x:latest dockcross/linux-s390x:${TAG} tagged=$(docker images -q -f 'since=dockcross/linux-s390x:latest' --format '{{.Repository}}:{{.Tag}}' | grep linux-s390x)
docker push dockcross/linux-s390x:${TAG} docker push $tagged
fi fi
# Image build currently broken. See #209 # Image build currently broken. See #209
#- restore_cache: #- restore_cache:
@ -492,10 +497,9 @@ jobs:
#docker load -i ~/docker/linux-ppc64le.tar #docker load -i ~/docker/linux-ppc64le.tar
#if [ "${CIRCLE_BRANCH}" == "master" ]; then #if [ "${CIRCLE_BRANCH}" == "master" ]; then
#docker login -u $DOCKER_USER -p $DOCKER_PASS #docker login -u $DOCKER_USER -p $DOCKER_PASS
#TAG=$(date '+%Y%m%d')-$(git rev-parse --short HEAD)
#docker push dockcross/linux-ppc64le:latest #docker push dockcross/linux-ppc64le:latest
#docker tag dockcross/linux-ppc64le:latest dockcross/linux-ppc64le:${TAG} #tagged=$(docker images -q -f 'since=dockcross/linux-ppc64le:latest' --format '{{.Repository}}:{{.Tag}}' | grep linux-ppc64le)
#docker push dockcross/linux-ppc64le:${TAG} #docker push $tagged
#fi #fi
- restore_cache: - restore_cache:
key: linux-x64-assets-{{ .Revision }} key: linux-x64-assets-{{ .Revision }}
@ -505,10 +509,9 @@ jobs:
docker load -i ~/docker/linux-x64.tar docker load -i ~/docker/linux-x64.tar
if [ "${CIRCLE_BRANCH}" == "master" ]; then if [ "${CIRCLE_BRANCH}" == "master" ]; then
docker login -u $DOCKER_USER -p $DOCKER_PASS docker login -u $DOCKER_USER -p $DOCKER_PASS
TAG=$(date '+%Y%m%d')-$(git rev-parse --short HEAD)
docker push dockcross/linux-x64:latest docker push dockcross/linux-x64:latest
docker tag dockcross/linux-x64:latest dockcross/linux-x64:${TAG} tagged=$(docker images -q -f 'since=dockcross/linux-x64:latest' --format '{{.Repository}}:{{.Tag}}' | grep linux-x64)
docker push dockcross/linux-x64:${TAG} docker push $tagged
fi fi
- restore_cache: - restore_cache:
key: linux-x86-assets-{{ .Revision }} key: linux-x86-assets-{{ .Revision }}
@ -518,10 +521,9 @@ jobs:
docker load -i ~/docker/linux-x86.tar docker load -i ~/docker/linux-x86.tar
if [ "${CIRCLE_BRANCH}" == "master" ]; then if [ "${CIRCLE_BRANCH}" == "master" ]; then
docker login -u $DOCKER_USER -p $DOCKER_PASS docker login -u $DOCKER_USER -p $DOCKER_PASS
TAG=$(date '+%Y%m%d')-$(git rev-parse --short HEAD)
docker push dockcross/linux-x86:latest docker push dockcross/linux-x86:latest
docker tag dockcross/linux-x86:latest dockcross/linux-x86:${TAG} tagged=$(docker images -q -f 'since=dockcross/linux-x86:latest' --format '{{.Repository}}:{{.Tag}}' | grep linux-x86)
docker push dockcross/linux-x86:${TAG} docker push $tagged
fi fi
- restore_cache: - restore_cache:
key: manylinux-x64-assets-{{ .Revision }} key: manylinux-x64-assets-{{ .Revision }}
@ -531,10 +533,9 @@ jobs:
docker load -i ~/docker/manylinux-x64.tar docker load -i ~/docker/manylinux-x64.tar
if [ "${CIRCLE_BRANCH}" == "master" ]; then if [ "${CIRCLE_BRANCH}" == "master" ]; then
docker login -u $DOCKER_USER -p $DOCKER_PASS docker login -u $DOCKER_USER -p $DOCKER_PASS
TAG=$(date '+%Y%m%d')-$(git rev-parse --short HEAD)
docker push dockcross/manylinux-x64:latest docker push dockcross/manylinux-x64:latest
docker tag dockcross/manylinux-x64:latest dockcross/manylinux-x64:${TAG} tagged=$(docker images -q -f 'since=dockcross/manylinux-x64:latest' --format '{{.Repository}}:{{.Tag}}' | grep manylinux-x64)
docker push dockcross/manylinux-x64:${TAG} docker push $tagged
fi fi
- restore_cache: - restore_cache:
key: manylinux-x86-assets-{{ .Revision }} key: manylinux-x86-assets-{{ .Revision }}
@ -544,10 +545,9 @@ jobs:
docker load -i ~/docker/manylinux-x86.tar docker load -i ~/docker/manylinux-x86.tar
if [ "${CIRCLE_BRANCH}" == "master" ]; then if [ "${CIRCLE_BRANCH}" == "master" ]; then
docker login -u $DOCKER_USER -p $DOCKER_PASS docker login -u $DOCKER_USER -p $DOCKER_PASS
TAG=$(date '+%Y%m%d')-$(git rev-parse --short HEAD)
docker push dockcross/manylinux-x86:latest docker push dockcross/manylinux-x86:latest
docker tag dockcross/manylinux-x86:latest dockcross/manylinux-x86:${TAG} tagged=$(docker images -q -f 'since=dockcross/manylinux-x86:latest' --format '{{.Repository}}:{{.Tag}}' | grep manylinux-x86)
docker push dockcross/manylinux-x86:${TAG} docker push $tagged
fi fi
- restore_cache: - restore_cache:
key: windows-x64-assets-{{ .Revision }} key: windows-x64-assets-{{ .Revision }}
@ -557,10 +557,9 @@ jobs:
docker load -i ~/docker/windows-x64.tar docker load -i ~/docker/windows-x64.tar
if [ "${CIRCLE_BRANCH}" == "master" ]; then if [ "${CIRCLE_BRANCH}" == "master" ]; then
docker login -u $DOCKER_USER -p $DOCKER_PASS docker login -u $DOCKER_USER -p $DOCKER_PASS
TAG=$(date '+%Y%m%d')-$(git rev-parse --short HEAD)
docker push dockcross/windows-x64:latest docker push dockcross/windows-x64:latest
docker tag dockcross/windows-x64:latest dockcross/windows-x64:${TAG} tagged=$(docker images -q -f 'since=dockcross/windows-x64:latest' --format '{{.Repository}}:{{.Tag}}' | grep windows-x64)
docker push dockcross/windows-x64:${TAG} docker push $tagged
fi fi
- restore_cache: - restore_cache:
key: windows-x64-posix-assets-{{ .Revision }} key: windows-x64-posix-assets-{{ .Revision }}
@ -570,10 +569,9 @@ jobs:
docker load -i ~/docker/windows-x64-posix.tar docker load -i ~/docker/windows-x64-posix.tar
if [ "${CIRCLE_BRANCH}" == "master" ]; then if [ "${CIRCLE_BRANCH}" == "master" ]; then
docker login -u $DOCKER_USER -p $DOCKER_PASS docker login -u $DOCKER_USER -p $DOCKER_PASS
TAG=$(date '+%Y%m%d')-$(git rev-parse --short HEAD)
docker push dockcross/windows-x64-posix:latest docker push dockcross/windows-x64-posix:latest
docker tag dockcross/windows-x64-posix:latest dockcross/windows-x64-posix:${TAG} tagged=$(docker images -q -f 'since=dockcross/windows-x64-posix:latest' --format '{{.Repository}}:{{.Tag}}' | grep windows-x64-posix)
docker push dockcross/windows-x64-posix:${TAG} docker push $tagged
fi fi
- restore_cache: - restore_cache:
key: windows-x86-assets-{{ .Revision }} key: windows-x86-assets-{{ .Revision }}
@ -583,10 +581,9 @@ jobs:
docker load -i ~/docker/windows-x86.tar docker load -i ~/docker/windows-x86.tar
if [ "${CIRCLE_BRANCH}" == "master" ]; then if [ "${CIRCLE_BRANCH}" == "master" ]; then
docker login -u $DOCKER_USER -p $DOCKER_PASS docker login -u $DOCKER_USER -p $DOCKER_PASS
TAG=$(date '+%Y%m%d')-$(git rev-parse --short HEAD)
docker push dockcross/windows-x86:latest docker push dockcross/windows-x86:latest
docker tag dockcross/windows-x86:latest dockcross/windows-x86:${TAG} tagged=$(docker images -q -f 'since=dockcross/windows-x86:latest' --format '{{.Repository}}:{{.Tag}}' | grep windows-x86)
docker push dockcross/windows-x86:${TAG} docker push $tagged
fi fi
workflows: workflows:

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 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"` \
-f manylinux-x64/Dockerfile . -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 rm -rf $@/imagefiles
manylinux-x64.test: manylinux-x64 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 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"` \
-f manylinux-x86/Dockerfile . -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 rm -rf $@/imagefiles
manylinux-x86.test: manylinux-x86 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 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) 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 rm -rf $@/imagefiles
# #

8
android-arm/Dockerfile
View File

@ -34,19 +34,19 @@ RUN mkdir -p /build && \
find ${CROSS_ROOT} -exec chmod a+r '{}' \; && \ find ${CROSS_ROOT} -exec chmod a+r '{}' \; && \
find ${CROSS_ROOT} -executable -exec chmod a+x '{}' \; find ${CROSS_ROOT} -executable -exec chmod a+x '{}' \;
ENV DEFAULT_DOCKCROSS_IMAGE dockcross/android-arm
COPY Toolchain.cmake ${CROSS_ROOT}/ COPY Toolchain.cmake ${CROSS_ROOT}/
ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake
# Build-time metadata as defined at http://label-schema.org # Build-time metadata as defined at http://label-schema.org
ARG BUILD_DATE ARG BUILD_DATE
ARG IMAGE ARG IMAGE=dockcross/android-arm
ARG VERSION=latest
ARG VCS_REF ARG VCS_REF
ARG VCS_URL ARG VCS_URL
LABEL org.label-schema.build-date=$BUILD_DATE \ LABEL org.label-schema.build-date=$BUILD_DATE \
org.label-schema.name=$IMAGE \ org.label-schema.name=$IMAGE \
org.label-schema.version=$VERSION \
org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-ref=$VCS_REF \
org.label-schema.vcs-url=$VCS_URL \ org.label-schema.vcs-url=$VCS_URL \
org.label-schema.schema-version="1.0" org.label-schema.schema-version="1.0"
ENV DEFAULT_DOCKCROSS_IMAGE ${IMAGE}:${VERSION}

7
android-arm64/Dockerfile
View File

@ -39,18 +39,19 @@ RUN mkdir -p /build && \
find ${CROSS_ROOT} -executable -exec chmod a+x '{}' \; find ${CROSS_ROOT} -executable -exec chmod a+x '{}' \;
ENV DEFAULT_DOCKCROSS_IMAGE dockcross/android-arm64
COPY Toolchain.cmake ${CROSS_ROOT}/ COPY Toolchain.cmake ${CROSS_ROOT}/
ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake
# Build-time metadata as defined at http://label-schema.org # Build-time metadata as defined at http://label-schema.org
ARG BUILD_DATE ARG BUILD_DATE
ARG IMAGE ARG IMAGE=dockcross/android-arm64
ARG VERSION=latest
ARG VCS_REF ARG VCS_REF
ARG VCS_URL ARG VCS_URL
LABEL org.label-schema.build-date=$BUILD_DATE \ LABEL org.label-schema.build-date=$BUILD_DATE \
org.label-schema.name=$IMAGE \ org.label-schema.name=$IMAGE \
org.label-schema.version=$VERSION \
org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-ref=$VCS_REF \
org.label-schema.vcs-url=$VCS_URL \ org.label-schema.vcs-url=$VCS_URL \
org.label-schema.schema-version="1.0" org.label-schema.schema-version="1.0"
ENV DEFAULT_DOCKCROSS_IMAGE ${IMAGE}:${VERSION}

7
linux-arm64/Dockerfile.in
View File

@ -26,8 +26,6 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
ENV QEMU_LD_PREFIX "${CROSS_ROOT}/${CROSS_TRIPLE}/sysroot" ENV QEMU_LD_PREFIX "${CROSS_ROOT}/${CROSS_TRIPLE}/sysroot"
ENV QEMU_SET_ENV "LD_LIBRARY_PATH=${CROSS_ROOT}/lib:${QEMU_LD_PREFIX}" ENV QEMU_SET_ENV "LD_LIBRARY_PATH=${CROSS_ROOT}/lib:${QEMU_LD_PREFIX}"
ENV DEFAULT_DOCKCROSS_IMAGE dockcross/linux-arm64
COPY Toolchain.cmake ${CROSS_ROOT}/ COPY Toolchain.cmake ${CROSS_ROOT}/
ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake
@ -35,11 +33,14 @@ ENV PKG_CONFIG_PATH /usr/lib/aarch64-linux-gnu/pkgconfig
# Build-time metadata as defined at http://label-schema.org # Build-time metadata as defined at http://label-schema.org
ARG BUILD_DATE ARG BUILD_DATE
ARG IMAGE ARG IMAGE=dockcross/linux-arm64
ARG VERSION=latest
ARG VCS_REF ARG VCS_REF
ARG VCS_URL ARG VCS_URL
LABEL org.label-schema.build-date=$BUILD_DATE \ LABEL org.label-schema.build-date=$BUILD_DATE \
org.label-schema.name=$IMAGE \ org.label-schema.name=$IMAGE \
org.label-schema.version=$VERSION \
org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-ref=$VCS_REF \
org.label-schema.vcs-url=$VCS_URL \ org.label-schema.vcs-url=$VCS_URL \
org.label-schema.schema-version="1.0" org.label-schema.schema-version="1.0"
ENV DEFAULT_DOCKCROSS_IMAGE ${IMAGE}:${VERSION}

9
linux-armv5/Dockerfile.in
View File

@ -30,8 +30,6 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
ENV QEMU_LD_PREFIX "${CROSS_ROOT}/${CROSS_TRIPLE}/sysroot" ENV QEMU_LD_PREFIX "${CROSS_ROOT}/${CROSS_TRIPLE}/sysroot"
ENV QEMU_SET_ENV "LD_LIBRARY_PATH=${CROSS_ROOT}/lib:${QEMU_LD_PREFIX}" ENV QEMU_SET_ENV "LD_LIBRARY_PATH=${CROSS_ROOT}/lib:${QEMU_LD_PREFIX}"
ENV DEFAULT_DOCKCROSS_IMAGE dockcross/linux-armv5
COPY Toolchain.cmake ${CROSS_ROOT}/ COPY Toolchain.cmake ${CROSS_ROOT}/
ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake
@ -39,13 +37,14 @@ ENV PKG_CONFIG_PATH /usr/lib/arm-linux-gnueabihf/
# Build-time metadata as defined at http://label-schema.org # Build-time metadata as defined at http://label-schema.org
ARG BUILD_DATE ARG BUILD_DATE
ARG IMAGE ARG IMAGE=dockcross/linux-armv5
ARG VERSION=latest
ARG VCS_REF ARG VCS_REF
ARG VCS_URL ARG VCS_URL
LABEL org.label-schema.build-date=$BUILD_DATE \ LABEL org.label-schema.build-date=$BUILD_DATE \
org.label-schema.name=$IMAGE \ org.label-schema.name=$IMAGE \
org.label-schema.version=$VERSION \
org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-ref=$VCS_REF \
org.label-schema.vcs-url=$VCS_URL \ org.label-schema.vcs-url=$VCS_URL \
org.label-schema.schema-version="1.0" org.label-schema.schema-version="1.0"
ENV DEFAULT_DOCKCROSS_IMAGE ${IMAGE}:${VERSION}
RUN echo poop version is ${CROSS_TRIPLE}

7
linux-armv6/Dockerfile
View File

@ -40,18 +40,19 @@ RUN mkdir rpi_tools && cd rpi_tools && git init && git remote add -f origin http
ENV QEMU_LD_PREFIX ${CROSS_ROOT}/libc ENV QEMU_LD_PREFIX ${CROSS_ROOT}/libc
ENV QEMU_SET_ENV "LD_LIBRARY_PATH=${CROSS_ROOT}/lib:${CROSS_ROOT}/libc/lib/${CROSS_TRIPLE}/" ENV QEMU_SET_ENV "LD_LIBRARY_PATH=${CROSS_ROOT}/lib:${CROSS_ROOT}/libc/lib/${CROSS_TRIPLE}/"
ENV DEFAULT_DOCKCROSS_IMAGE dockcross/linux-armv6
COPY Toolchain.cmake ${CROSS_ROOT}/ COPY Toolchain.cmake ${CROSS_ROOT}/
ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake
# Build-time metadata as defined at http://label-schema.org # Build-time metadata as defined at http://label-schema.org
ARG BUILD_DATE ARG BUILD_DATE
ARG IMAGE ARG IMAGE=dockcross/linux-armv6
ARG VERSION=latest
ARG VCS_REF ARG VCS_REF
ARG VCS_URL ARG VCS_URL
LABEL org.label-schema.build-date=$BUILD_DATE \ LABEL org.label-schema.build-date=$BUILD_DATE \
org.label-schema.name=$IMAGE \ org.label-schema.name=$IMAGE \
org.label-schema.version=$VERSION \
org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-ref=$VCS_REF \
org.label-schema.vcs-url=$VCS_URL \ org.label-schema.vcs-url=$VCS_URL \
org.label-schema.schema-version="1.0" org.label-schema.schema-version="1.0"
ENV DEFAULT_DOCKCROSS_IMAGE ${IMAGE}:${VERSION}

10
linux-armv7/Dockerfile.in
View File

@ -12,9 +12,6 @@ RUN apt-get update \
&& apt-get clean --yes && apt-get clean --yes
# The CROSS_TRIPLE is a configured alias of the "aarch64-unknown-linux-gnueabi" target. # The CROSS_TRIPLE is a configured alias of the "aarch64-unknown-linux-gnueabi" target.
ENV CROSS_TRIPLE armv7-unknown-linux-gnueabi ENV CROSS_TRIPLE armv7-unknown-linux-gnueabi
ENV CROSS_ROOT ${XCC_PREFIX}/${CROSS_TRIPLE} ENV CROSS_ROOT ${XCC_PREFIX}/${CROSS_TRIPLE}
@ -29,8 +26,6 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
ENV QEMU_LD_PREFIX "${CROSS_ROOT}/${CROSS_TRIPLE}/sysroot" ENV QEMU_LD_PREFIX "${CROSS_ROOT}/${CROSS_TRIPLE}/sysroot"
ENV QEMU_SET_ENV "LD_LIBRARY_PATH=${CROSS_ROOT}/lib:${QEMU_LD_PREFIX}" ENV QEMU_SET_ENV "LD_LIBRARY_PATH=${CROSS_ROOT}/lib:${QEMU_LD_PREFIX}"
ENV DEFAULT_DOCKCROSS_IMAGE dockcross/linux-armv7
COPY Toolchain.cmake ${CROSS_ROOT}/ COPY Toolchain.cmake ${CROSS_ROOT}/
ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake
@ -38,11 +33,14 @@ ENV PKG_CONFIG_PATH /usr/lib/arm-linux-gnueabihf/
# Build-time metadata as defined at http://label-schema.org # Build-time metadata as defined at http://label-schema.org
ARG BUILD_DATE ARG BUILD_DATE
ARG IMAGE ARG IMAGE=dockcross/linux-armv7
ARG VERSION=latest
ARG VCS_REF ARG VCS_REF
ARG VCS_URL ARG VCS_URL
LABEL org.label-schema.build-date=$BUILD_DATE \ LABEL org.label-schema.build-date=$BUILD_DATE \
org.label-schema.name=$IMAGE \ org.label-schema.name=$IMAGE \
org.label-schema.version=$VERSION \
org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-ref=$VCS_REF \
org.label-schema.vcs-url=$VCS_URL \ org.label-schema.vcs-url=$VCS_URL \
org.label-schema.schema-version="1.0" org.label-schema.schema-version="1.0"
ENV DEFAULT_DOCKCROSS_IMAGE ${IMAGE}:${VERSION}

7
linux-mips/Dockerfile.in
View File

@ -26,18 +26,19 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
ENV QEMU_LD_PREFIX "${CROSS_ROOT}/${CROSS_TRIPLE}/sysroot" ENV QEMU_LD_PREFIX "${CROSS_ROOT}/${CROSS_TRIPLE}/sysroot"
ENV QEMU_SET_ENV "LD_LIBRARY_PATH=${CROSS_ROOT}/lib:${QEMU_LD_PREFIX}" ENV QEMU_SET_ENV "LD_LIBRARY_PATH=${CROSS_ROOT}/lib:${QEMU_LD_PREFIX}"
ENV DEFAULT_DOCKCROSS_IMAGE dockcross/linux-mips
COPY Toolchain.cmake ${CROSS_ROOT}/ COPY Toolchain.cmake ${CROSS_ROOT}/
ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake
# Build-time metadata as defined at http://label-schema.org # Build-time metadata as defined at http://label-schema.org
ARG BUILD_DATE ARG BUILD_DATE
ARG IMAGE ARG IMAGE=dockcross/linux-mips
ARG VERSION=latest
ARG VCS_REF ARG VCS_REF
ARG VCS_URL ARG VCS_URL
LABEL org.label-schema.build-date=$BUILD_DATE \ LABEL org.label-schema.build-date=$BUILD_DATE \
org.label-schema.name=$IMAGE \ org.label-schema.name=$IMAGE \
org.label-schema.version=$VERSION \
org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-ref=$VCS_REF \
org.label-schema.vcs-url=$VCS_URL \ org.label-schema.vcs-url=$VCS_URL \
org.label-schema.schema-version="1.0" org.label-schema.schema-version="1.0"
ENV DEFAULT_DOCKCROSS_IMAGE ${IMAGE}:${VERSION}

7
linux-mipsel/Dockerfile
View File

@ -29,18 +29,19 @@ ENV AS=${CROSS_ROOT}/${CROSS_TRIPLE}-as \
ENV QEMU_LD_PREFIX ${CROSS_ROOT}/libc ENV QEMU_LD_PREFIX ${CROSS_ROOT}/libc
ENV QEMU_SET_ENV "LD_LIBRARY_PATH=${CROSS_ROOT}/lib:${CROSS_ROOT}/libc/lib/${CROSS_TRIPLE}/" ENV QEMU_SET_ENV "LD_LIBRARY_PATH=${CROSS_ROOT}/lib:${CROSS_ROOT}/libc/lib/${CROSS_TRIPLE}/"
ENV DEFAULT_DOCKCROSS_IMAGE dockcross/linux-mipsel
COPY Toolchain.cmake ${CROSS_ROOT}/ COPY Toolchain.cmake ${CROSS_ROOT}/
ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake
# Build-time metadata as defined at http://label-schema.org # Build-time metadata as defined at http://label-schema.org
ARG BUILD_DATE ARG BUILD_DATE
ARG IMAGE ARG IMAGE=dockcross/linux-mipsel
ARG VERSION=latest
ARG VCS_REF ARG VCS_REF
ARG VCS_URL ARG VCS_URL
LABEL org.label-schema.build-date=$BUILD_DATE \ LABEL org.label-schema.build-date=$BUILD_DATE \
org.label-schema.name=$IMAGE \ org.label-schema.name=$IMAGE \
org.label-schema.version=$VERSION \
org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-ref=$VCS_REF \
org.label-schema.vcs-url=$VCS_URL \ org.label-schema.vcs-url=$VCS_URL \
org.label-schema.schema-version="1.0" org.label-schema.schema-version="1.0"
ENV DEFAULT_DOCKCROSS_IMAGE ${IMAGE}:${VERSION}

6
linux-ppc64le/Dockerfile
View File

@ -35,7 +35,6 @@ ENV AS=/usr/bin/${CROSS_TRIPLE}-as \
LD=/usr/bin/${CROSS_TRIPLE}-ld \ LD=/usr/bin/${CROSS_TRIPLE}-ld \
FC=/usr/bin/${CROSS_TRIPLE}-gfortran FC=/usr/bin/${CROSS_TRIPLE}-gfortran
ENV DEFAULT_DOCKCROSS_IMAGE dockcross/linux-ppc64le
WORKDIR /work WORKDIR /work
# Note: Toolchain file support is currently in debian Experimental according to: # Note: Toolchain file support is currently in debian Experimental according to:
@ -46,11 +45,14 @@ ENV CMAKE_TOOLCHAIN_FILE /usr/lib/${CROSS_TRIPLE}/Toolchain.cmake
# Build-time metadata as defined at http://label-schema.org # Build-time metadata as defined at http://label-schema.org
ARG BUILD_DATE ARG BUILD_DATE
ARG IMAGE ARG IMAGE=dockcross/linux-ppc64le
ARG VERSION=latest
ARG VCS_REF ARG VCS_REF
ARG VCS_URL ARG VCS_URL
LABEL org.label-schema.build-date=$BUILD_DATE \ LABEL org.label-schema.build-date=$BUILD_DATE \
org.label-schema.name=$IMAGE \ org.label-schema.name=$IMAGE \
org.label-schema.version=$VERSION \
org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-ref=$VCS_REF \
org.label-schema.vcs-url=$VCS_URL \ org.label-schema.vcs-url=$VCS_URL \
org.label-schema.schema-version="1.0" org.label-schema.schema-version="1.0"
ENV DEFAULT_DOCKCROSS_IMAGE ${IMAGE}:${VERSION}

7
linux-s390x/Dockerfile.in
View File

@ -26,18 +26,19 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
ENV QEMU_LD_PREFIX "${CROSS_ROOT}/${CROSS_TRIPLE}/sysroot" ENV QEMU_LD_PREFIX "${CROSS_ROOT}/${CROSS_TRIPLE}/sysroot"
ENV QEMU_SET_ENV "LD_LIBRARY_PATH=${CROSS_ROOT}/lib:${QEMU_LD_PREFIX}" ENV QEMU_SET_ENV "LD_LIBRARY_PATH=${CROSS_ROOT}/lib:${QEMU_LD_PREFIX}"
ENV DEFAULT_DOCKCROSS_IMAGE dockcross/linux-s390x
COPY Toolchain.cmake ${CROSS_ROOT}/ COPY Toolchain.cmake ${CROSS_ROOT}/
ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake
# Build-time metadata as defined at http://label-schema.org # Build-time metadata as defined at http://label-schema.org
ARG BUILD_DATE ARG BUILD_DATE
ARG IMAGE ARG IMAGE=dockcross/linux-s390x
ARG VERSION=latest
ARG VCS_REF ARG VCS_REF
ARG VCS_URL ARG VCS_URL
LABEL org.label-schema.build-date=$BUILD_DATE \ LABEL org.label-schema.build-date=$BUILD_DATE \
org.label-schema.name=$IMAGE \ org.label-schema.name=$IMAGE \
org.label-schema.version=$VERSION \
org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-ref=$VCS_REF \
org.label-schema.vcs-url=$VCS_URL \ org.label-schema.vcs-url=$VCS_URL \
org.label-schema.schema-version="1.0" org.label-schema.schema-version="1.0"
ENV DEFAULT_DOCKCROSS_IMAGE ${IMAGE}:${VERSION}

6
linux-x64/Dockerfile
View File

@ -15,15 +15,17 @@ COPY ${CROSS_TRIPLE}-noop.sh /usr/bin/${CROSS_TRIPLE}-noop
COPY Toolchain.cmake /usr/lib/${CROSS_TRIPLE}/ COPY Toolchain.cmake /usr/lib/${CROSS_TRIPLE}/
ENV CMAKE_TOOLCHAIN_FILE /usr/lib/${CROSS_TRIPLE}/Toolchain.cmake ENV CMAKE_TOOLCHAIN_FILE /usr/lib/${CROSS_TRIPLE}/Toolchain.cmake
ENV DEFAULT_DOCKCROSS_IMAGE dockcross/linux-x64
# Build-time metadata as defined at http://label-schema.org # Build-time metadata as defined at http://label-schema.org
ARG BUILD_DATE ARG BUILD_DATE
ARG IMAGE ARG IMAGE=dockcross/linux-x64
ARG VERSION=latest
ARG VCS_REF ARG VCS_REF
ARG VCS_URL ARG VCS_URL
LABEL org.label-schema.build-date=$BUILD_DATE \ LABEL org.label-schema.build-date=$BUILD_DATE \
org.label-schema.name=$IMAGE \ org.label-schema.name=$IMAGE \
org.label-schema.version=$VERSION \
org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-ref=$VCS_REF \
org.label-schema.vcs-url=$VCS_URL \ org.label-schema.vcs-url=$VCS_URL \
org.label-schema.schema-version="1.0" org.label-schema.schema-version="1.0"
ENV DEFAULT_DOCKCROSS_IMAGE ${IMAGE}:${VERSION}

8
linux-x86/Dockerfile
View File

@ -33,9 +33,6 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gcc \ CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gcc \
CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-g++ CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-g++
ENV DEFAULT_DOCKCROSS_IMAGE dockcross/linux-x86
# Note: Toolchain file support is currently in debian Experimental: # Note: Toolchain file support is currently in debian Experimental:
# https://wiki.debian.org/CrossToolchains#In_jessie_.28Debian_8.29 # https://wiki.debian.org/CrossToolchains#In_jessie_.28Debian_8.29
COPY Toolchain.cmake /usr/lib/${CROSS_TRIPLE}/ COPY Toolchain.cmake /usr/lib/${CROSS_TRIPLE}/
@ -46,11 +43,14 @@ ENTRYPOINT ["/dockcross/linux32-entrypoint.sh"]
# Build-time metadata as defined at http://label-schema.org # Build-time metadata as defined at http://label-schema.org
ARG BUILD_DATE ARG BUILD_DATE
ARG IMAGE ARG IMAGE=dockcross/linux-x86
ARG VERSION=latest
ARG VCS_REF ARG VCS_REF
ARG VCS_URL ARG VCS_URL
LABEL org.label-schema.build-date=$BUILD_DATE \ LABEL org.label-schema.build-date=$BUILD_DATE \
org.label-schema.name=$IMAGE \ org.label-schema.name=$IMAGE \
org.label-schema.version=$VERSION \
org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-ref=$VCS_REF \
org.label-schema.vcs-url=$VCS_URL \ org.label-schema.vcs-url=$VCS_URL \
org.label-schema.schema-version="1.0" org.label-schema.schema-version="1.0"
ENV DEFAULT_DOCKCROSS_IMAGE ${IMAGE}:${VERSION}

5
manylinux-x64/Dockerfile.in
View File

@ -24,11 +24,14 @@ ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/../lib/Toolchain.cmake
# Build-time metadata as defined at http://label-schema.org # Build-time metadata as defined at http://label-schema.org
ARG BUILD_DATE ARG BUILD_DATE
ARG IMAGE ARG IMAGE=dockcross/manylinux-x64
ARG VERSION=latest
ARG VCS_REF ARG VCS_REF
ARG VCS_URL ARG VCS_URL
LABEL org.label-schema.build-date=$BUILD_DATE \ LABEL org.label-schema.build-date=$BUILD_DATE \
org.label-schema.name=$IMAGE \ org.label-schema.name=$IMAGE \
org.label-schema.version=$VERSION \
org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-ref=$VCS_REF \
org.label-schema.vcs-url=$VCS_URL \ org.label-schema.vcs-url=$VCS_URL \
org.label-schema.schema-version="1.0" org.label-schema.schema-version="1.0"
ENV DEFAULT_DOCKCROSS_IMAGE ${IMAGE}:${VERSION}

5
manylinux-x86/Dockerfile.in
View File

@ -27,11 +27,14 @@ ENTRYPOINT ["/dockcross/linux32-entrypoint.sh"]
# Build-time metadata as defined at http://label-schema.org # Build-time metadata as defined at http://label-schema.org
ARG BUILD_DATE ARG BUILD_DATE
ARG IMAGE ARG IMAGE=dockcross/manylinux-x86
ARG VERSION=latest
ARG VCS_REF ARG VCS_REF
ARG VCS_URL ARG VCS_URL
LABEL org.label-schema.build-date=$BUILD_DATE \ LABEL org.label-schema.build-date=$BUILD_DATE \
org.label-schema.name=$IMAGE \ org.label-schema.name=$IMAGE \
org.label-schema.version=$VERSION \
org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-ref=$VCS_REF \
org.label-schema.vcs-url=$VCS_URL \ org.label-schema.vcs-url=$VCS_URL \
org.label-schema.schema-version="1.0" org.label-schema.schema-version="1.0"
ENV DEFAULT_DOCKCROSS_IMAGE ${IMAGE}:${VERSION}

7
windows-x64-posix/Dockerfile.in
View File

@ -7,15 +7,16 @@ ARG MXE_TARGET_THREAD=.posix
#include "common.windows" #include "common.windows"
ENV DEFAULT_DOCKCROSS_IMAGE dockcross/windows-x64-posix
# Build-time metadata as defined at http://label-schema.org # Build-time metadata as defined at http://label-schema.org
ARG BUILD_DATE ARG BUILD_DATE
ARG IMAGE ARG IMAGE=dockcross/windows-x64-posix
ARG VERSION=latest
ARG VCS_REF ARG VCS_REF
ARG VCS_URL ARG VCS_URL
LABEL org.label-schema.build-date=$BUILD_DATE \ LABEL org.label-schema.build-date=$BUILD_DATE \
org.label-schema.name=$IMAGE \ org.label-schema.name=$IMAGE \
org.label-schema.version=$VERSION \
org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-ref=$VCS_REF \
org.label-schema.vcs-url=$VCS_URL \ org.label-schema.vcs-url=$VCS_URL \
org.label-schema.schema-version="1.0" org.label-schema.schema-version="1.0"
ENV DEFAULT_DOCKCROSS_IMAGE ${IMAGE}:${VERSION}

7
windows-x64/Dockerfile.in
View File

@ -7,15 +7,16 @@ ARG MXE_TARGET_THREAD=
#include "common.windows" #include "common.windows"
ENV DEFAULT_DOCKCROSS_IMAGE dockcross/windows-x64
# Build-time metadata as defined at http://label-schema.org # Build-time metadata as defined at http://label-schema.org
ARG BUILD_DATE ARG BUILD_DATE
ARG IMAGE ARG IMAGE=dockcross/windows-x64
ARG VERSION=latest
ARG VCS_REF ARG VCS_REF
ARG VCS_URL ARG VCS_URL
LABEL org.label-schema.build-date=$BUILD_DATE \ LABEL org.label-schema.build-date=$BUILD_DATE \
org.label-schema.name=$IMAGE \ org.label-schema.name=$IMAGE \
org.label-schema.version=$VERSION \
org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-ref=$VCS_REF \
org.label-schema.vcs-url=$VCS_URL \ org.label-schema.vcs-url=$VCS_URL \
org.label-schema.schema-version="1.0" org.label-schema.schema-version="1.0"
ENV DEFAULT_DOCKCROSS_IMAGE ${IMAGE}:${VERSION}

6
windows-x86/Dockerfile.in
View File

@ -7,16 +7,18 @@ ARG MXE_TARGET_THREAD=
#include "common.windows" #include "common.windows"
ENV DEFAULT_DOCKCROSS_IMAGE dockcross/windows-x86
WORKDIR /work WORKDIR /work
# Build-time metadata as defined at http://label-schema.org # Build-time metadata as defined at http://label-schema.org
ARG BUILD_DATE ARG BUILD_DATE
ARG IMAGE ARG IMAGE=dockcross/windows-x86
ARG VERSION=latest
ARG VCS_REF ARG VCS_REF
ARG VCS_URL ARG VCS_URL
LABEL org.label-schema.build-date=$BUILD_DATE \ LABEL org.label-schema.build-date=$BUILD_DATE \
org.label-schema.name=$IMAGE \ org.label-schema.name=$IMAGE \
org.label-schema.version=$VERSION \
org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-ref=$VCS_REF \
org.label-schema.vcs-url=$VCS_URL \ org.label-schema.vcs-url=$VCS_URL \
org.label-schema.schema-version="1.0" org.label-schema.schema-version="1.0"
ENV DEFAULT_DOCKCROSS_IMAGE ${IMAGE}:${VERSION}