Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2024-12-23 09:04:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #291 from thewtex/web-wasm

Browse Source 
web-wasm: Rename image from browser-asmjs
This commit is contained in:
Matt McCormick 2019-01-19 18:28:35 -05:00 committed by GitHub
commit c636cf0cec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
.circleci/config.yml
View File

@ -64,26 +64,26 @@ jobs:
- save_cache: - save_cache:
key: android-arm64-assets-{{ .Revision }} key: android-arm64-assets-{{ .Revision }}
paths: ~/docker/android-arm64.tar paths: ~/docker/android-arm64.tar
browser-asmjs: web-wasm:
<<: *build-settings <<: *build-settings
steps: steps:
- restore_cache: - restore_cache:
key: base-assets-{{ .Revision }} key: base-assets-{{ .Revision }}
- run: - run:
name: browser-asmjs build name: web-wasm build
no_output_timeout: 1.5h no_output_timeout: 1.5h
command: | command: |
docker load -i ~/docker/base.tar docker load -i ~/docker/base.tar
make browser-asmjs make web-wasm
tagged=$(docker images -q -f 'since=dockcross/browser-asmjs:latest' --format '{{.Repository}}:{{.Tag}}' | grep browser-asmjs) tagged=$(docker images -q -f 'since=dockcross/web-wasm:latest' --format '{{.Repository}}:{{.Tag}}' | grep web-wasm)
docker save -o ~/docker/browser-asmjs.tar dockcross/browser-asmjs:latest $tagged docker save -o ~/docker/web-wasm.tar dockcross/web-wasm:latest $tagged
- run: - run:
name: browser-asmjs test name: web-wasm test
command: | command: |
make browser-asmjs.test make web-wasm.test
- save_cache: - save_cache:
key: browser-asmjs-assets-{{ .Revision }} key: web-wasm-assets-{{ .Revision }}
paths: ~/docker/browser-asmjs.tar paths: ~/docker/web-wasm.tar
linux-arm64: linux-arm64:
<<: *build-settings <<: *build-settings
steps: steps:
@ -404,15 +404,15 @@ jobs:
docker push $tagged docker push $tagged
fi fi
- restore_cache: - restore_cache:
key: browser-asmjs-assets-{{ .Revision }} key: web-wasm-assets-{{ .Revision }}
- deploy: - deploy:
name: Deploy browser-asmjs name: Deploy web-wasm
command: | command: |
docker load -i ~/docker/browser-asmjs.tar docker load -i ~/docker/web-wasm.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
docker push dockcross/browser-asmjs:latest docker push dockcross/web-wasm:latest
tagged=$(docker images -q -f 'since=dockcross/browser-asmjs:latest' --format '{{.Repository}}:{{.Tag}}' | grep browser-asmjs) tagged=$(docker images -q -f 'since=dockcross/web-wasm:latest' --format '{{.Repository}}:{{.Tag}}' | grep web-wasm)
docker push $tagged docker push $tagged
fi fi
- restore_cache: - restore_cache:
@ -597,7 +597,7 @@ workflows:
- android-arm64: - android-arm64:
requires: requires:
- base - base
- browser-asmjs: - web-wasm:
requires: requires:
- base - base
- linux-arm64: - linux-arm64:
@ -649,7 +649,7 @@ workflows:
- base - base
- android-arm - android-arm
- android-arm64 - android-arm64
- browser-asmjs - web-wasm
- linux-arm64 - linux-arm64
- linux-armv5 - linux-armv5
- linux-armv6 - linux-armv6

2
.gitignore vendored
View File

@ -2,6 +2,6 @@ bin
dockcross dockcross
*/test/ */test/
Dockerfile Dockerfile
browser-asmjs/Dockerfile web-wasm/Dockerfile
*/imagefiles/* */imagefiles/*
!imagefiles/* !imagefiles/*

34
Makefile
View File

@ -16,11 +16,11 @@ BIN = ./bin
STANDARD_IMAGES = linux-s390x android-arm android-arm64 linux-x86 linux-x64 linux-arm64 linux-armv5 linux-armv6 linux-armv7 linux-mips linux-mipsel linux-ppc64le windows-x86 windows-x64 windows-x64-posix STANDARD_IMAGES = linux-s390x android-arm android-arm64 linux-x86 linux-x64 linux-arm64 linux-armv5 linux-armv6 linux-armv7 linux-mips linux-mipsel linux-ppc64le windows-x86 windows-x64 windows-x64-posix
# Generated Dockerfiles. # Generated Dockerfiles.
GEN_IMAGES = linux-s390x linux-mips manylinux-x86 manylinux-x64 browser-asmjs linux-arm64 windows-x86 windows-x64 windows-x64-posix linux-armv7 linux-armv5 GEN_IMAGES = linux-s390x linux-mips manylinux-x86 manylinux-x64 web-wasm linux-arm64 windows-x86 windows-x64 windows-x64-posix linux-armv7 linux-armv5
GEN_IMAGE_DOCKERFILES = $(addsuffix /Dockerfile,$(GEN_IMAGES)) GEN_IMAGE_DOCKERFILES = $(addsuffix /Dockerfile,$(GEN_IMAGES))
# These images are expected to have explicit rules for *both* build and testing # These images are expected to have explicit rules for *both* build and testing
NON_STANDARD_IMAGES = browser-asmjs manylinux-x64 manylinux-x86 NON_STANDARD_IMAGES = web-wasm manylinux-x64 manylinux-x86
DOCKER_COMPOSITE_SOURCES = common.docker common.debian common.manylinux common.crosstool common.windows DOCKER_COMPOSITE_SOURCES = common.docker common.debian common.manylinux common.crosstool common.windows
@ -67,32 +67,32 @@ $(GEN_IMAGE_DOCKERFILES) Dockerfile: %Dockerfile: %Dockerfile.in $(DOCKER_COMPOS
$< > $@ $< > $@
# #
# browser-asmjs # web-wasm
# #
browser-asmjs: browser-asmjs/Dockerfile web-wasm: web-wasm/Dockerfile
mkdir -p $@/imagefiles && cp -r imagefiles $@/ mkdir -p $@/imagefiles && cp -r imagefiles $@/
cp -r test browser-asmjs/ cp -r test web-wasm/
$(DOCKER) build -t $(ORG)/browser-asmjs:latest \ $(DOCKER) build -t $(ORG)/web-wasm:latest \
--build-arg IMAGE=$(ORG)/browser-asmjs \ --build-arg IMAGE=$(ORG)/web-wasm \
--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"` \
browser-asmjs web-wasm
$(DOCKER) build -t $(ORG)/browser-asmjs:$(TAG) \ $(DOCKER) build -t $(ORG)/web-wasm:$(TAG) \
--build-arg IMAGE=$(ORG)/browser-asmjs \ --build-arg IMAGE=$(ORG)/web-wasm \
--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` \
--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 web-wasm
rm -rf browser-asmjs/test rm -rf web-wasm/test
rm -rf $@/imagefiles rm -rf $@/imagefiles
browser-asmjs.test: browser-asmjs web-wasm.test: web-wasm
cp -r test browser-asmjs/ cp -r test web-wasm/
$(DOCKER) run $(RM) dockcross/browser-asmjs > $(BIN)/dockcross-browser-asmjs && chmod +x $(BIN)/dockcross-browser-asmjs $(DOCKER) run $(RM) dockcross/web-wasm > $(BIN)/dockcross-web-wasm && chmod +x $(BIN)/dockcross-web-wasm
$(BIN)/dockcross-browser-asmjs python test/run.py --exe-suffix ".js" $(BIN)/dockcross-web-wasm python test/run.py --exe-suffix ".js"
rm -rf browser-asmjs/test rm -rf web-wasm/test
# #
# manylinux-x64 # manylinux-x64

8
README.rst
View File

@ -103,11 +103,11 @@ dockcross/android-arm64
|android-arm64-images| The Android NDK standalone toolchain for the arm64 |android-arm64-images| The Android NDK standalone toolchain for the arm64
architecture. architecture.
.. |browser-asmjs-images| image:: https://images.microbadger.com/badges/image/dockcross/browser-asmjs.svg .. |web-wasm-images| image:: https://images.microbadger.com/badges/image/dockcross/web-wasm.svg
:target: https://microbadger.com/images/dockcross/browser-asmjs :target: https://microbadger.com/images/dockcross/web-wasm
dockcross/browser-asmjs dockcross/web-wasm
|browser-asmjs-images| The Emscripten JavaScript cross compiler. |web-wasm-images| The Emscripten WebAssembly/asm.js/JavaScript cross compiler.
.. |linux-arm64-images| image:: https://images.microbadger.com/badges/image/dockcross/linux-arm64.svg .. |linux-arm64-images| image:: https://images.microbadger.com/badges/image/dockcross/linux-arm64.svg

2
browser-asmjs/Dockerfile.in → web-wasm/Dockerfile.in
View File

@ -21,7 +21,7 @@ ENV CMAKE_TOOLCHAIN_FILE /emsdk_portable/sdk/cmake/Modules/Platform/Emscripten.c
# 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=dockcross/browser-asmjs ARG IMAGE=dockcross/web-wasm
ARG VERSION=latest ARG VERSION=latest
ARG VCS_REF ARG VCS_REF
ARG VCS_URL ARG VCS_URL