Skip to content

Commit 9b88a1b

Browse files
committed
Add docker image for wasm32-unknown-emscripten
- rename emscripten docker image to asmjs - create wasm32 docker image
1 parent 5fe923d commit 9b88a1b

File tree

6 files changed

+107
-95
lines changed

6 files changed

+107
-95
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ matrix:
3636
- env: IMAGE=dist-x86_64-linux DEPLOY=1 ALLOW_TRY=1
3737
- env: IMAGE=dist-x86_64-musl DEPLOY=1
3838
- env: IMAGE=dist-x86_64-netbsd DEPLOY=1
39-
- env: IMAGE=emscripten
39+
- env: IMAGE=asmjs
4040
- env: IMAGE=i686-gnu
4141
- env: IMAGE=i686-gnu-nopt
4242
- env: IMAGE=x86_64-gnu

src/ci/docker/asmjs/Dockerfile

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
FROM ubuntu:16.04
2+
3+
RUN apt-get update && apt-get install -y --no-install-recommends \
4+
g++ \
5+
make \
6+
file \
7+
curl \
8+
ca-certificates \
9+
python \
10+
git \
11+
cmake \
12+
sudo \
13+
gdb \
14+
xz-utils
15+
16+
# dumb-init
17+
COPY scripts/dumb-init.sh /scripts/
18+
RUN sh /scripts/dumb-init.sh
19+
20+
# emscripten
21+
COPY scripts/emscripten.sh /scripts/
22+
RUN bash /scripts/emscripten.sh
23+
24+
# env
25+
ENV PATH=$PATH:/emsdk-portable
26+
ENV PATH=$PATH:/emsdk-portable/clang/e1.37.13_64bit/
27+
ENV PATH=$PATH:/emsdk-portable/emscripten/1.37.13/
28+
ENV PATH=$PATH:/emsdk-portable/node/4.1.1_64bit/bin/
29+
ENV EMSCRIPTEN=/emsdk-portable/emscripten/1.37.13/
30+
ENV BINARYEN_ROOT=/emsdk-portable/clang/e1.37.13_64bit/binaryen/
31+
ENV EM_CONFIG=/emsdk-portable/.emscripten
32+
33+
ENV TARGETS=asmjs-unknown-emscripten
34+
35+
ENV RUST_CONFIGURE_ARGS --target=$TARGETS
36+
37+
ENV SCRIPT python2.7 ../x.py test --target $TARGETS
38+
39+
# cache
40+
COPY scripts/sccache.sh /scripts/
41+
RUN sh /scripts/sccache.sh
42+
43+
# init
44+
ENTRYPOINT ["/usr/bin/dumb-init", "--"]

src/ci/docker/emscripten/Dockerfile

Lines changed: 0 additions & 41 deletions
This file was deleted.

src/ci/docker/emscripten/build-emscripten.sh

Lines changed: 0 additions & 53 deletions
This file was deleted.

src/ci/docker/wasm32/Dockerfile

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
FROM ubuntu:16.04
2+
3+
RUN apt-get update && apt-get install -y --no-install-recommends \
4+
g++ \
5+
make \
6+
file \
7+
curl \
8+
ca-certificates \
9+
python \
10+
git \
11+
cmake \
12+
sudo \
13+
gdb \
14+
xz-utils
15+
16+
# dumb-init
17+
COPY scripts/dumb-init.sh /scripts/
18+
RUN sh /scripts/dumb-init.sh
19+
20+
# emscripten
21+
COPY scripts/emscripten.sh /scripts/
22+
RUN bash /scripts/emscripten.sh
23+
COPY wasm32/node /usr/local/bin/node
24+
25+
# env
26+
ENV PATH=$PATH:/emsdk-portable
27+
ENV PATH=$PATH:/emsdk-portable/clang/e1.37.13_64bit/
28+
ENV PATH=$PATH:/emsdk-portable/emscripten/1.37.13/
29+
ENV EMSCRIPTEN=/emsdk-portable/emscripten/1.37.13/
30+
ENV BINARYEN_ROOT=/emsdk-portable/clang/e1.37.13_64bit/binaryen/
31+
ENV EM_CONFIG=/emsdk-portable/.emscripten
32+
33+
ENV TARGETS=wasm32-unknown-emscripten
34+
35+
ENV RUST_CONFIGURE_ARGS --target=$TARGETS
36+
37+
ENV SCRIPT python2.7 ../x.py test --target $TARGETS
38+
39+
# cache
40+
COPY scripts/sccache.sh /scripts/
41+
RUN sh /scripts/sccache.sh
42+
43+
# init
44+
ENTRYPOINT ["/usr/bin/dumb-init", "--"]

src/ci/docker/wasm32/node

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#!/bin/bash
2+
# Copyright 2017 The Rust Project Developers. See the COPYRIGHT
3+
# file at the top-level directory of this distribution and at
4+
# http://rust-lang.org/COPYRIGHT.
5+
#
6+
# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
7+
# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
8+
# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
9+
# option. This file may not be copied, modified, or distributed
10+
# except according to those terms.
11+
12+
path="$(dirname $1)"
13+
file="$(basename $1)"
14+
15+
shift
16+
17+
cd "$path"
18+
exec /node-v8.0.0-linux-x64/bin/node "$file" "$@"

0 commit comments

Comments
 (0)