From 42b0f70cacc01774df18c3ecd9d5ef1b4b8d6ea7 Mon Sep 17 00:00:00 2001 From: Johnny Hauser Date: Fri, 16 Jun 2023 19:13:02 -0500 Subject: [PATCH 1/2] use emscripten/emsdk image for newer emscripten version to support node 18.1+ --- bin/build.sh | 2 +- bin/build.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/build.sh b/bin/build.sh index a3b6cda..a78fab2 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -9,7 +9,7 @@ echo 'Installing pkg-config' apt-get install -y pkg-config echo 'Linking emsdk directory...' -ln -s /emsdk_portable /opt/emsdk +ln -s /emsdk /opt/emsdk echo 'Building MuPDF for wasm' cd /src/platform/wasm && make diff --git a/bin/build.ts b/bin/build.ts index 4d584c1..4e09a1c 100755 --- a/bin/build.ts +++ b/bin/build.ts @@ -19,7 +19,7 @@ async function runDockerBuildCommand() { console.log(`Running build command in docker container as user "${user}"`); await docker.run( - "trzeci/emscripten", + "emscripten/emsdk", ["/opt/mupdf-js/bin/build.sh"], process.stdout, { @@ -37,7 +37,7 @@ async function runDockerBuildCommand() { function pullImage(docker: Docker) { return new Promise((res, rej) => { - docker.pull("trzeci/emscripten", (err: any, stream: Stream) => { + docker.pull("emscripten/emsdk", (err: any, stream: Stream) => { if (err) { console.error("Error"); return rej(err); From 9d3adc76f78f1c8e955b4cea46da6b91c37dfaa1 Mon Sep 17 00:00:00 2001 From: Johnny Hauser Date: Fri, 30 Jun 2023 14:34:34 -0500 Subject: [PATCH 2/2] use emsdk 3.1.41 version explicitly, as building with emsdk 3.1.42 is broken --- bin/build.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/build.ts b/bin/build.ts index 4e09a1c..f0c5519 100755 --- a/bin/build.ts +++ b/bin/build.ts @@ -5,6 +5,7 @@ import { resolve } from "path"; import { Stream } from "stream"; const MUPDF_VERSION = "1.20.0"; +const EMSDK_VERSION = "3.1.41"; async function main() { await runDockerBuildCommand(); @@ -19,7 +20,7 @@ async function runDockerBuildCommand() { console.log(`Running build command in docker container as user "${user}"`); await docker.run( - "emscripten/emsdk", + `emscripten/emsdk:${EMSDK_VERSION}`, ["/opt/mupdf-js/bin/build.sh"], process.stdout, { @@ -37,7 +38,7 @@ async function runDockerBuildCommand() { function pullImage(docker: Docker) { return new Promise((res, rej) => { - docker.pull("emscripten/emsdk", (err: any, stream: Stream) => { + docker.pull(`emscripten/emsdk:${EMSDK_VERSION}`, (err: any, stream: Stream) => { if (err) { console.error("Error"); return rej(err);