admin/ci-emsdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Docker fixes and updates (#461)

Browse Source 
Dockerfile:
- Use the most recent stable debian (buster) instead of the previous one
- Build version 1.39.11 by default instead of 1.38.43
- Fix small typo in the comments

Makefile and README.MD: Fix incorrect name of image on dockerhub.
This commit is contained in:
Nikolas Garofil
2020-04-06 17:58:16 +02:00
committed by GitHub
parent 009ab2c77f
commit 4dce416efa
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docker/Dockerfile
View File

@@ -1,9 +1,9 @@
FROM debian:stretch AS stage_build FROM debian:buster AS stage_build
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# Supports only 1.38.40+, accpets also '-upstream' variants # Supports only 1.38.40+, accepts also '-upstream' variants
ARG EMSCRIPTEN_VERSION=1.38.43 ARG EMSCRIPTEN_VERSION=1.39.11
ARG EMSDK_CHANGESET=master ARG EMSDK_CHANGESET=master
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------

8
docker/Makefile
View File

@@ -11,11 +11,11 @@ ifndef version
endif endif
build: .TEST build: .TEST
docker build --build-arg=EMSCRIPTEN_VERSION=${version} --tag emscripten/emscripten:${version} . docker build --build-arg=EMSCRIPTEN_VERSION=${version} --tag emscripten/emsdk:${version} .
push: .TEST push: .TEST
docker push emscripten/emscripten:${version} docker push emscripten/emsdk:${version}
ifdef alias ifdef alias
docker tag emscripten/emscripten:${version} emscripten/emscripten:${alias} docker tag emscripten/emsdk:${version} emscripten/emsdk:${alias}
docker push emscripten/emscripten:${alias} docker push emscripten/emsdk:${alias}
endif endif

20
docker/README.md
View File

@@ -3,7 +3,7 @@
This Dockerfile builds a self-contained version of emsdk that enables emscripten to be used without any This Dockerfile builds a self-contained version of emsdk that enables emscripten to be used without any
other installation on the host system. other installation on the host system.
It is published at https://hub.docker.com/u/emscripten/emscripten It is published at https://hub.docker.com/u/emscripten/emsdk
### Usage ### Usage
@@ -25,7 +25,7 @@ docker run \
--rm \ --rm \
-v $(pwd):$(pwd) \ -v $(pwd):$(pwd) \
-u $(id -u):$(id -g) \ -u $(id -u):$(id -g) \
emscripten/emscripten \ emscripten/emsdk \
emcc helloworld.cpp -o helloworld.js emcc helloworld.cpp -o helloworld.js
# execute on host machine # execute on host machine
@@ -40,7 +40,7 @@ Teardown of compilation command:
|`--rm`|remove a container after execution (optimization)| |`--rm`|remove a container after execution (optimization)|
|`-v $(pwd):$(pwd)`|Mounting current folder from the host system into mirrored path on the container<br>TIP: This helps to investigate possible problem as we preserve exactly the same paths like in host. In such case modern editors (like Sublime, Atom, VS Code) let us to CTRL+Click on a problematic file | |`-v $(pwd):$(pwd)`|Mounting current folder from the host system into mirrored path on the container<br>TIP: This helps to investigate possible problem as we preserve exactly the same paths like in host. In such case modern editors (like Sublime, Atom, VS Code) let us to CTRL+Click on a problematic file |
|`-u $(id -u):$(id -g)`| Run the container as a non-root user with the same UID and GID as local user. Hence all files produced by this are accessible to non-root users| |`-u $(id -u):$(id -g)`| Run the container as a non-root user with the same UID and GID as local user. Hence all files produced by this are accessible to non-root users|
|`emscripten/emscripten`|Get the latest tag of this container| |`emscripten/emsdk`|Get the latest tag of this container|
|`emcc helloworld.cpp -o helloworld.js`|Execute `emcc` command with following arguments inside container, effectively compile our source code| |`emcc helloworld.cpp -o helloworld.js`|Execute `emcc` command with following arguments inside container, effectively compile our source code|
@@ -60,7 +60,7 @@ This step will build Dockerfile as given tag on local machine
# using docker # using docker
docker build \ docker build \
--build-arg=EMSCRIPTEN_VERSION=1.38.43-upstream \ --build-arg=EMSCRIPTEN_VERSION=1.38.43-upstream \
--tag emscripten/emscripten:1.38.43-upstream \ --tag emscripten/emsdk:1.38.43-upstream \
. .
``` ```
```bash ```bash
@@ -78,7 +78,7 @@ This step will take local image and push to default docker registry. You need to
```bash ```bash
# using docker # using docker
docker push emscripten/emscripten:1.38.43-upstream docker push emscripten/emsdk:1.38.43-upstream
``` ```
```bash ```bash
# using predefined make target # using predefined make target
@@ -90,12 +90,12 @@ In case of pushing the most recent version, this version should be also tagged a
# using docker cli # using docker cli
# in case of fastcomp variant (default backend) # in case of fastcomp variant (default backend)
docker tag emscripten/emscripten:1.38.43 emscripten/emscripten:latest docker tag emscripten/emsdk:1.38.43 emscripten/emsdk:latest
docker push emscripten/emscripten:latest docker push emscripten/emsdk:latest
# in case of upstream variant # in case of upstream variant
docker tag emscripten/emscripten:1.38.43-upstream emscripten/emscripten:latest-upstream docker tag emscripten/emsdk:1.38.43-upstream emscripten/emsdk:latest-upstream
docker push emscripten/emscripten:latest-upstream docker push emscripten/emsdk:latest-upstream
``` ```
@@ -116,7 +116,7 @@ If your project uses packages that this image doesn't provide you might want to:
1. create own Dockerfile that holds: 1. create own Dockerfile that holds:
```dockerfile ```dockerfile
# Point at any base image that you find suitable to extend. # Point at any base image that you find suitable to extend.
FROM emscripten/emscripten:1.38.25 FROM emscripten/emsdk:1.38.25
# Install required tools that are useful for your project i.e. ninja-build # Install required tools that are useful for your project i.e. ninja-build
RUN apt update && apt install -y ninja-build RUN apt update && apt install -y ninja-build