Skip to content

Commit

Permalink
Update Emscripten Dockerfile.
Browse files Browse the repository at this point in the history
  • Loading branch information
ScottTodd committed Aug 16, 2023
1 parent d1a6f9d commit e246109
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -907,7 +907,7 @@ jobs:
- platform: emscripten
arch: wasm32
abi: wasm32
docker_image: "gcr.io/iree-oss/emscripten@sha256:7652907cef454d08211e2bc08da6d27d6e9d6e9df06508224dadc2d5ba6c1873"
docker_image: "gcr.io/iree-oss/emscripten@sha256:3569560116a0de257f43961361640c636e6d92f5249a799dabebd7cf7ecedad1"
build_script: "./build_tools/cmake/build_runtime_emscripten.sh"
# No test script

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/samples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,5 +72,5 @@ jobs:
./build_tools/github_actions/docker_run.sh \
--env "IREE_HOST_BUILD_DIR=${HOST_BUILD_DIR}" \
--env "IREE_EMPSCRIPTEN_BUILD_DIR=${IREE_EMPSCRIPTEN_BUILD_DIR}" \
gcr.io/iree-oss/emscripten@sha256:7652907cef454d08211e2bc08da6d27d6e9d6e9df06508224dadc2d5ba6c1873 \
gcr.io/iree-oss/emscripten@sha256:3569560116a0de257f43961361640c636e6d92f5249a799dabebd7cf7ecedad1 \
./experimental/web/build_and_test_samples.sh
6 changes: 3 additions & 3 deletions build_tools/docker/dockerfiles/emscripten.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ FROM gcr.io/iree-oss/base@sha256:d6c426d1fe55947a4afe7669abae6c7e6aa44fa94e84804
# * https://github.com/emscripten-core/emsdk/blob/main/docker/Dockerfile
# * https://hub.docker.com/r/emscripten/emsdk

ARG EMSDK_COMMIT=21611d2a507fad73385120d89e05a794666070ae
ARG SDK_VERSION=3.1.20
ARG EMSDK_COMMIT=a896e3d066448b3530dbcaa48869fafefd738f57
ARG SDK_VERSION=3.1.44

WORKDIR /

Expand Down Expand Up @@ -43,4 +43,4 @@ RUN mkdir -p "${EM_CACHE}" && chmod -R 777 "${EM_CACHE}"
# Normally we'd run `source emsdk_env.sh`, but that doesn't integrate with
# Docker's environment properties model. Instead, we directly extend the path
# to include the directories suggested by `emsdk activate`.
ENV PATH="${EMSDK}:${EMSDK}/node/14.18.2_64bit/bin:${EMSDK}/upstream/emscripten:$PATH"
ENV PATH="${EMSDK}:${EMSDK}/upstream/emscripten:$PATH"
2 changes: 1 addition & 1 deletion build_tools/docker/prod_digests.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ gcr.io/iree-oss/frontends-swiftshader@sha256:eb0063d640d8402b077fcec5533f247ba34
gcr.io/iree-oss/gradle-android@sha256:5df113f9993a3f4515275bd5ab902a1d9c3dc6ff9682cd5e9806b20dc26fc15c
gcr.io/iree-oss/riscv@sha256:c4c3f409ab6461ccca920bce2f2c30285a17a61979b54570459f76797e381cb5
gcr.io/iree-oss/nvidia@sha256:de6e4453614aa48059fd611d7e7255f4d6ac27ac29a47aabdc04191ec1758533
gcr.io/iree-oss/emscripten@sha256:7652907cef454d08211e2bc08da6d27d6e9d6e9df06508224dadc2d5ba6c1873
gcr.io/iree-oss/emscripten@sha256:3569560116a0de257f43961361640c636e6d92f5249a799dabebd7cf7ecedad1
gcr.io/iree-oss/android@sha256:c05cb80509c818132378c04e638d5908ce961250a90dd60281b2f582378df063
gcr.io/iree-oss/manylinux2014_x86_64-release@sha256:e83893d35be4ce3558c989e9d5ccc4ff88d058bc3e74a83181059cc76e2cf1f8
gcr.io/iree-oss/shark@sha256:2b2e41dbf909194b598e226144a2fb1e74d31851d41fe519d0fcb6d071b77461
Expand Down

0 comments on commit e246109

Please sign in to comment.