Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2024-09-20 02:30:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

browser-asmjs: Use tagged version for the default dockcross image

Browse Source
This commit is contained in:
Matt McCormick 2019-01-01 21:15:02 -05:00
parent 9e57d19cea
commit 03931af69b
No known key found for this signature in database
GPG Key ID: 45DA982347954FA5
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.circleci/config.yml
View File

@ -73,7 +73,8 @@ jobs:
command: | command: |
docker load -i ~/docker/base.tar docker load -i ~/docker/base.tar
make browser-asmjs make browser-asmjs
docker save -o ~/docker/browser-asmjs.tar dockcross/browser-asmjs:latest tagged=$(docker images -q -f 'since=dockcross/browser-asmjs:latest' --format '{{.Repository}}:{{.Tag}}')
docker save -o ~/docker/browser-asmjs.tar dockcross/browser-asmjs:latest $tagged
- run: - run:
name: browser-asmjs test name: browser-asmjs test
command: | command: |
@ -399,10 +400,9 @@ jobs:
docker load -i ~/docker/browser-asmjs.tar docker load -i ~/docker/browser-asmjs.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/browser-asmjs:latest docker push dockcross/browser-asmjs:latest
docker tag dockcross/browser-asmjs:latest dockcross/browser-asmjs:${TAG} tagged=$(docker images -q -f 'since=dockcross/browser-asmjs:latest' --format '{{.Repository}}:{{.Tag}}')
docker push dockcross/browser-asmjs:${TAG} docker push $tagged
fi fi
- restore_cache: - restore_cache:
key: linux-arm64-assets-{{ .Revision }} key: linux-arm64-assets-{{ .Revision }}

8
Makefile
View File

@ -78,7 +78,13 @@ browser-asmjs: browser-asmjs/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"` \
browser-asmjs browser-asmjs
$(DOCKER) tag $(ORG)/browser-asmjs:latest $(ORG)/browser-asmjs:$(TAG) $(DOCKER) build -t $(ORG)/browser-asmjs:$(TAG) \
--build-arg IMAGE=$(ORG)/browser-asmjs \
--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"` \
browser-asmjs
rm -rf browser-asmjs/test rm -rf browser-asmjs/test
rm -rf $@/imagefiles rm -rf $@/imagefiles

6
browser-asmjs/Dockerfile.in
View File

@ -16,17 +16,19 @@ ENV CC=/emsdk_portable/sdk/emcc \
CXX=/emsdk_portable/sdk/em++ \ CXX=/emsdk_portable/sdk/em++ \
AR=/emsdk_portable/sdk/emar AR=/emsdk_portable/sdk/emar
ENV DEFAULT_DOCKCROSS_IMAGE dockcross/browser-asmjs
ENV CMAKE_TOOLCHAIN_FILE /emsdk_portable/sdk/cmake/Modules/Platform/Emscripten.cmake ENV CMAKE_TOOLCHAIN_FILE /emsdk_portable/sdk/cmake/Modules/Platform/Emscripten.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/browser-asmjs
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}