diff --git a/Dockerfile.emscripten b/Dockerfile.emscripten index c81f66f17abb79203ffda27a1f165b41d8f4d1c3..7d552035835da93f11a6ac8a1892695432d7e11f 100644 --- a/Dockerfile.emscripten +++ b/Dockerfile.emscripten @@ -5,6 +5,9 @@ FROM emscripten/emsdk:${EMSCRIPTEN_VERSION} AS pure_emscripten_sdk FROM pure_emscripten_sdk AS supplemented_emscripten_sdk +ARG PNPM_VERSION=9.0.6 +ENV PNPM_VERSION=9.0.6 + USER root RUN apt-get update && \ @@ -15,7 +18,7 @@ RUN apt-get update && \ autoconf \ libtool \ protobuf-compiler && \ - npm install -g pnpm && \ + npm install -g pnpm@${PNPM_VERSION} && \ apt-get clean && rm -r /var/lib/apt/lists/* FROM supplemented_emscripten_sdk AS supplemented_node_sdk @@ -70,7 +73,9 @@ ENV PNPM_HOME="/home/emscripten/.local/share/pnpm" ENV PLAYWRIGHT_BROWSERS_PATH="${HOME}/pw-browsers" ENV PATH="${PNPM_HOME}:${PATH}" -RUN pnpm playwright install-deps && apt-get clean && rm -r /var/lib/apt/lists/* +RUN [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \ + nvm use "${NODEJS_VERSION}" && \ + pnpm playwright install-deps && apt-get clean && rm -r /var/lib/apt/lists/* USER emscripten WORKDIR /home/emscripten