From 5d1c571bd5af48a635047978595de27386a290f5 Mon Sep 17 00:00:00 2001
From: Hood Chatham <roberthoodchatham@gmail.com>
Date: Wed, 23 Oct 2024 18:22:52 +0200
Subject: [PATCH] Update docker image

---
 .circleci/config.yml            |  2 +-
 .devcontainer/devcontainer.json |  2 +-
 Dockerfile                      | 38 ++++++++++++++++-----------------
 run_docker                      |  2 +-
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8d26d926412..ee851c48134 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -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
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 528cd57938c..ae32a7d4278 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -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"
 }
diff --git a/Dockerfile b/Dockerfile
index f3d47bfe141..ae5eb07b064 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -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"
@@ -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
diff --git a/run_docker b/run_docker
index 33907da1002..cef96ba83cb 100755
--- a/run_docker
+++ b/run_docker
@@ -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"