From 73c0b6565c6b5a3af0ed68654b419b6ccf86162f Mon Sep 17 00:00:00 2001 From: Robin Munn Date: Mon, 3 Feb 2025 16:32:21 -0500 Subject: [PATCH 1/2] Use chg in LfMerge, only in local dev LF for now --- docker-compose.yml | 1 + docker/lfmerge/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index bff83a4b97..35d8145697 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -107,6 +107,7 @@ services: - WAIT_HOSTS=db:27017 - ENVIRONMENT=development - DATABASE=scriptureforge + - CHORUS_HG_EXE=chg - MONGODB_CONN=mongodb://db:27017 - MONGODB_AUTHSOURCE=admin - LANGUAGE_DEPOT_API_TOKEN=bogus-development-token diff --git a/docker/lfmerge/Dockerfile b/docker/lfmerge/Dockerfile index 5bd0e3c9bd..401fedd22c 100644 --- a/docker/lfmerge/Dockerfile +++ b/docker/lfmerge/Dockerfile @@ -1,2 +1,2 @@ -FROM ghcr.io/sillsdev/lfmerge:2.0.140 +FROM ghcr.io/sillsdev/lfmerge:2.0.141 # Do not add anything to this Dockerfile, it should stay empty From 223c2fadcf71a5c191ac6196de3aad666d658075 Mon Sep 17 00:00:00 2001 From: Robin Munn Date: Tue, 4 Feb 2025 10:35:38 -0500 Subject: [PATCH 2/2] Work around corepack bug with NPM signatures --- docker/app/Dockerfile | 2 ++ docker/next-app/Dockerfile.next-app | 2 ++ docker/next-app/dev/Dockerfile | 2 ++ docker/ui-builder/Dockerfile | 2 ++ 4 files changed, 8 insertions(+) diff --git a/docker/app/Dockerfile b/docker/app/Dockerfile index 1df8b41a0d..d803423066 100644 --- a/docker/app/Dockerfile +++ b/docker/app/Dockerfile @@ -10,6 +10,8 @@ WORKDIR /data # Copy in files needed for compilation, located in the repo root COPY package.json pnpm-lock.yaml ./ +# Install latest corepack version to work around a bug with signatures +RUN npm install -g corepack@latest RUN corepack enable RUN pnpm install diff --git a/docker/next-app/Dockerfile.next-app b/docker/next-app/Dockerfile.next-app index fbd92bce79..d713585504 100644 --- a/docker/next-app/Dockerfile.next-app +++ b/docker/next-app/Dockerfile.next-app @@ -7,6 +7,8 @@ COPY tsconfig.json pnpm-lock.yaml package.json postcss.config.cjs svelte.config. COPY src /app/src COPY static /app/static +# Install latest corepack version to work around a bug with signatures +RUN npm install -g corepack@latest RUN corepack enable RUN pnpm install RUN pnpm run build diff --git a/docker/next-app/dev/Dockerfile b/docker/next-app/dev/Dockerfile index 0b52c4c8c9..6ff14d82c3 100644 --- a/docker/next-app/dev/Dockerfile +++ b/docker/next-app/dev/Dockerfile @@ -6,6 +6,8 @@ COPY tsconfig.json pnpm-lock.yaml package.json postcss.config.cjs svelte.config. COPY src /app/src COPY static /app/static +# Install latest corepack version to work around a bug with signatures +RUN npm install -g corepack@latest RUN corepack enable RUN pnpm install diff --git a/docker/ui-builder/Dockerfile b/docker/ui-builder/Dockerfile index 056773fde2..ad5c8cea87 100644 --- a/docker/ui-builder/Dockerfile +++ b/docker/ui-builder/Dockerfile @@ -5,6 +5,8 @@ WORKDIR /data COPY package.json pnpm-lock.yaml ./ +# Install latest corepack version to work around a bug with signatures +RUN npm install -g corepack@latest RUN corepack enable RUN pnpm install