From 7408796362964cc836795875c7b0d785a86a1681 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 28 May 2026 10:53:29 +0100 Subject: [PATCH] Fix element desktop dockerbuild utilities (#33641) Got broken by monorepo merge --- apps/desktop/dockerbuild/Dockerfile | 3 ++- apps/desktop/package.json | 2 +- apps/desktop/scripts/in-docker.sh | 7 ++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/apps/desktop/dockerbuild/Dockerfile b/apps/desktop/dockerbuild/Dockerfile index b0d345eba1..e2a9077e1a 100644 --- a/apps/desktop/dockerbuild/Dockerfile +++ b/apps/desktop/dockerbuild/Dockerfile @@ -16,8 +16,9 @@ RUN ln -s /usr/bin/python3 /usr/bin/python & ln -s /usr/bin/pip3 /usr/bin/pip ENV DEBUG_COLORS=true ENV FORCE_COLOR=true +ENV COREPACK_ENABLE_DOWNLOAD_PROMPT=0 -WORKDIR /project +WORKDIR /project/apps/desktop ARG TARGETOS ARG TARGETARCH diff --git a/apps/desktop/package.json b/apps/desktop/package.json index f69bdb91f3..178f2951a9 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -47,7 +47,7 @@ "docker:setup": "docker build --platform linux/amd64 -t element-desktop-dockerbuild -f dockerbuild/Dockerfile .", "docker:build:native": "scripts/in-docker.sh pnpm run hak", "docker:build": "scripts/in-docker.sh pnpm run build", - "docker:install": "scripts/in-docker.sh pnpm install", + "docker:install": "scripts/in-docker.sh pnpm install --filter=element-desktop --frozen-lockfile", "clean": "rimraf webapp.asar dist packages deploys lib", "hak": "node scripts/hak/index.ts", "test:unit": "vitest", diff --git a/apps/desktop/scripts/in-docker.sh b/apps/desktop/scripts/in-docker.sh index 3df278bcb5..7ccf9d0d3b 100755 --- a/apps/desktop/scripts/in-docker.sh +++ b/apps/desktop/scripts/in-docker.sh @@ -21,9 +21,10 @@ docker run --rm -ti \ --env-file <(env | grep -E '^INDOCKER_' | sed -e 's/^INDOCKER_//') \ --env ELECTRON_CACHE="/root/.cache/electron" \ --env ELECTRON_BUILDER_CACHE="/root/.cache/electron-builder" \ - -v ${PWD}:/project \ - -v ${PWD}/docker/node_modules:/project/node_modules \ - -v ${PWD}/docker/.hak:/project/.hak \ + -v ${PWD}/../../:/project \ + -v ${PWD}/docker/workspace_node_modules:/project/node_modules \ + -v ${PWD}/docker/node_modules:/project/apps/desktop/node_modules \ + -v ${PWD}/docker/.hak:/project/apps/desktop/.hak \ -v ${PWD}/docker/.gnupg:/root/.gnupg \ -v ~/.cache/electron:/root/.cache/electron \ -v ~/.cache/electron-builder:/root/.cache/electron-builder \