Skip to content

Commit

Permalink
Update docker image
Browse files Browse the repository at this point in the history
  • Loading branch information
hoodmane committed Oct 23, 2024
1 parent ac107e0 commit 5d1c571
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ defaults: &defaults
# Note: when updating the docker image version,
# make sure there are no extra old versions lying around.
# (e.g. `rg -F --hidden <old_tag>`)
- image: pyodide/pyodide-env:20240928-chrome127-firefox128
- image: pyodide/pyodide-env:20241023-chrome130-firefox131
environment:
- EMSDK_NUM_CORES: 3
EMCC_CORES: 3
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "Docker",
// keep in sync with "run_docker"
"image": "pyodide/pyodide-env:20240928-chrome127-firefox128",
"image": "pyodide/pyodide-env:20241023-chrome130-firefox131",
"remoteUser": "root",
"onCreateCommand": ".devcontainer/onCreate-docker.sh"
}
38 changes: 19 additions & 19 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,25 @@ RUN pip3 --no-cache-dir install -r requirements.txt \
&& pip3 --no-cache-dir install -r requirements-doc.txt \
&& rm -rf requirements.txt requirements-doc.txt

RUN cd / \
&& git clone --recursive https://github.com/WebAssembly/wabt \
&& cd wabt \
&& git submodule update --init \
&& make install-gcc-release-no-tests \
&& cd ~ \
&& rm -rf /wabt

COPY --from=node-image /usr/local/bin/node /usr/local/bin/
COPY --from=node-image /usr/local/lib/node_modules /usr/local/lib/node_modules
RUN ln -s ../lib/node_modules/npm/bin/npm-cli.js /usr/local/bin/npm \
&& ln -s ../lib/node_modules/npm/bin/npx-cli.js /usr/local/bin/npx

RUN npm install -g \
jsdoc \
prettier \
rollup \
rollup-plugin-terser

# Get Chrome and Firefox (borrowed from https://github.com/SeleniumHQ/docker-selenium)

ARG CHROME_VERSION="latest"
Expand Down Expand Up @@ -99,24 +118,5 @@ RUN if [ $CHROME_VERSION = "latest" ]; \
&& echo "Using Chrome version: $(google-chrome --version)" \
&& echo "Using Chrome Driver version: $(chromedriver --version)"

COPY --from=node-image /usr/local/bin/node /usr/local/bin/
COPY --from=node-image /usr/local/lib/node_modules /usr/local/lib/node_modules
RUN ln -s ../lib/node_modules/npm/bin/npm-cli.js /usr/local/bin/npm \
&& ln -s ../lib/node_modules/npm/bin/npx-cli.js /usr/local/bin/npx

RUN npm install -g \
jsdoc \
prettier \
rollup \
rollup-plugin-terser

RUN cd / \
&& git clone --recursive https://github.com/WebAssembly/wabt \
&& cd wabt \
&& git submodule update --init \
&& make install-gcc-release-no-tests \
&& cd ~ \
&& rm -rf /wabt

CMD ["/bin/sh"]
WORKDIR /src
2 changes: 1 addition & 1 deletion run_docker
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash

PYODIDE_IMAGE_REPO="pyodide"
PYODIDE_IMAGE_TAG="20240928-chrome127-firefox128"
PYODIDE_IMAGE_TAG="20241023-chrome130-firefox131"
DEFAULT_PYODIDE_DOCKER_IMAGE="${PYODIDE_IMAGE_REPO}/pyodide-env:${PYODIDE_IMAGE_TAG}"
DEFAULT_PYODIDE_SYSTEM_PORT="none"
DOCKER_COMMAND="/bin/bash"
Expand Down

0 comments on commit 5d1c571

Please sign in to comment.