From 59d4fdba7555f1c5aa1d0cc46ab0fe70ab180a20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 15 Feb 2022 10:58:24 +0100
Subject: [PATCH] wasm-rebuild: Switch to the latest version of our buildpack
 image

---
 .../wasm-rebuild/docker-scripts/rebuild_tags.sh   | 15 +++++++++++----
 scripts/wasm-rebuild/rebuild.sh                   | 11 ++++++++++-
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh b/scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh
index 9ef9caaa8..cab019908 100755
--- a/scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh
+++ b/scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh
@@ -207,10 +207,17 @@ else
 fi
 
 echo "Create symbolic links for backwards compatibility with older emscripten docker images."
-ln -sf /emsdk_portable/node/current/* /emsdk_portable/node/
-ln -sf /emsdk_portable/emscripten/sdk/ /emsdk_portable/
-ln -sf sdk /emsdk_portable/emscripten/bin
-ln -sf /emsdk_portable/emscripten/bin/* /usr/local/bin
+ln -s /emsdk/upstream/emscripten/ /emsdk_portable
+mkdir /emsdk_portable/node/
+ln -s /emsdk/node/* /emsdk_portable/node/current
+mkdir /emsdk_portable/emscripten/
+ln -s /emsdk/upstream/emscripten/ /emsdk_portable/emscripten/sdk
+ln -s /emsdk/upstream/bin/* /usr/local/bin/
+
+# This variable used to be defined when this script was running inside the trzeci/emscripten:sdk-tag-1.39.3-64bit
+# image but for some reason in solidity-buildpack-deps it no longer is.
+export EMSCRIPTEN=/emsdk/upstream/emscripten
+
 rm -rf /src
 ln -sf /root/project /src
 
diff --git a/scripts/wasm-rebuild/rebuild.sh b/scripts/wasm-rebuild/rebuild.sh
index b12940a5b..07f6c744a 100755
--- a/scripts/wasm-rebuild/rebuild.sh
+++ b/scripts/wasm-rebuild/rebuild.sh
@@ -25,4 +25,13 @@ if [ ! -d "${OUTPUTDIR}" ]; then
 fi
 OUTPUTDIR=$(realpath "${OUTPUTDIR}")
 
-docker run --rm -v "${OUTPUTDIR}":/tmp/output -v "${SCRIPTDIR}":/tmp/scripts:ro -it trzeci/emscripten:sdk-tag-1.39.3-64bit /tmp/scripts/docker-scripts/rebuild_tags.sh "${TAGS}" /tmp/output "$@"
+# solbuildpackpusher/solidity-buildpack-deps:emscripten-9
+DOCKER_IMAGE="solbuildpackpusher/solidity-buildpack-deps@sha256:d51534dfdd05ece86f69ed7beafd68c15b88606da00a4b7fe2873ccfbd0dce24"
+docker run \
+    --rm \
+    --interactive \
+    --tty \
+    --volume "${OUTPUTDIR}":/tmp/output \
+    --volume "${SCRIPTDIR}":/tmp/scripts:ro \
+    "${DOCKER_IMAGE}" \
+    /tmp/scripts/docker-scripts/rebuild_tags.sh "${TAGS}" /tmp/output "$@"