From c2a0a22c67fd01b0df03faeea660b94c9e8ca6f0 Mon Sep 17 00:00:00 2001 From: Bartek Wrona <wrona@syncad.com> Date: Mon, 17 Feb 2025 21:11:12 +0100 Subject: [PATCH] emsdk image extended by zopfli tool to support pure inflate/deflate compression --- Dockerfile.emscripten | 4 +++- docker-bake.hcl | 2 +- scripts/bash/build_emscripten_image.sh | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Dockerfile.emscripten b/Dockerfile.emscripten index a5717f6..72c7749 100644 --- a/Dockerfile.emscripten +++ b/Dockerfile.emscripten @@ -18,7 +18,9 @@ RUN apt-get update && \ ninja-build \ autoconf \ libtool \ - protobuf-compiler && \ + protobuf-compiler \ + zopfli \ + && \ apt-get clean && rm -r /var/lib/apt/lists/* FROM supplemented_emscripten_sdk AS supplemented_node_sdk diff --git a/docker-bake.hcl b/docker-bake.hcl index af7f56c..6be5818 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -83,7 +83,7 @@ target "tox-test-runner" { target "emsdk" { dockerfile = "Dockerfile.emscripten" - tags = generate-tags("emsdk", "${EMSCRIPTEN_VERSION}-1") + tags = generate-tags("emsdk", "${EMSCRIPTEN_VERSION}-2") cache-from = generate-cache-from("emsdk", "${EMSCRIPTEN_VERSION}") cache-to = generate-cache-to("emsdk", "${EMSCRIPTEN_VERSION}") args = { diff --git a/scripts/bash/build_emscripten_image.sh b/scripts/bash/build_emscripten_image.sh index 60386fe..abb3eb3 100755 --- a/scripts/bash/build_emscripten_image.sh +++ b/scripts/bash/build_emscripten_image.sh @@ -11,5 +11,5 @@ export DOCKER_BUILDKIT=1 docker build --target=supplemented_emscripten_builder \ --build-arg "EMSCRIPTEN_VERSION=${EMSDK_VERSION}" \ - --tag "${REGISTRY}emsdk:${EMSDK_VERSION}-1" \ + --tag "${REGISTRY}emsdk:${EMSDK_VERSION}-2" \ --file "${SRCDIR}/Dockerfile.emscripten" "${SRCDIR}" -- GitLab