Skip to content

Fix docker build to not depend on emsdk_set_env.sh #554

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sbc100 merged 1 commit into from
Jul 14, 2020
Merged

Fix docker build to not depend on emsdk_set_env.sh #554

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,14 @@ RUN echo "## Install Emscripten" \
RUN cd ${EMSDK} \
&& echo "## Generate standard configuration" \
&& ./emsdk activate ${EMSCRIPTEN_VERSION} \
&& ./emsdk construct_env \
&& cat ${EMSDK}/emsdk_set_env.sh \
&& chmod -R 777 ${EMSDK}/upstream/emscripten/cache \
&& echo "## Done"

# Clean up emscripten installation and strip some symbols
RUN echo "## Aggresive optimization: Remove debug symbols" \
&& apt-get -qq -y update && apt-get -qq install -y --no-install-recommends \
binutils \
&& . ${EMSDK}/emsdk_set_env.sh \
&& cd ${EMSDK} && . ./emsdk_env.sh \
# Remove debugging symbols from embedded node (extra 7MB)
&& strip -s `which node` \
# Tests consume ~80MB disc space
Expand All @@ -56,7 +54,7 @@ RUN echo "## Aggresive optimization: Remove debug symbols" \
# TODO(sbc): We should be able to use just emcc -v here but it doesn't
# currently create the sanity file.
RUN echo "## Generate sanity" \
&& . ${EMSDK}/emsdk_set_env.sh \
&& cd ${EMSDK} && . ./emsdk_env.sh \
&& echo "int main() { return 0; }" > hello.c \
&& emcc -c hello.c \
&& cat ${EMSDK}/.emscripten_sanity \
Expand Down Expand Up @@ -90,7 +88,7 @@ RUN echo "## Create emscripten user (1000:1000)" \
&& groupadd --gid 1000 emscripten \
&& useradd --uid 1000 --gid emscripten --shell /bin/bash --create-home emscripten \
&& echo "umask 0000" >> /etc/bash.bashrc \
&& echo ". /emsdk/emsdk_set_env.sh" >> /etc/bash.bashrc \
&& echo ". /emsdk/emsdk_env.sh" >> /etc/bash.bashrc \
&& echo "## Done"

# ------------------------------------------------------------------------------
Expand Down