Skip to content

Commit d4a8890

Browse files
authored
Use chg in LfMerge, only in local dev LF for now (#1842)
We'll start using `chg` for LfMerge in local LF development; once we know that it works, we'll add the relevant environment variable to the k8s deployment so that staging and then prod also start getting the same Send/Receive speedups.
1 parent 7fff094 commit d4a8890

File tree

6 files changed

+10
-1
lines changed

6 files changed

+10
-1
lines changed

docker-compose.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ services:
107107
- WAIT_HOSTS=db:27017
108108
- ENVIRONMENT=development
109109
- DATABASE=scriptureforge
110+
- CHORUS_HG_EXE=chg
110111
- MONGODB_CONN=mongodb://db:27017
111112
- MONGODB_AUTHSOURCE=admin
112113
- LANGUAGE_DEPOT_API_TOKEN=bogus-development-token

docker/app/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ WORKDIR /data
1010
# Copy in files needed for compilation, located in the repo root
1111
COPY package.json pnpm-lock.yaml ./
1212

13+
# Install latest corepack version to work around a bug with signatures
14+
RUN npm install -g corepack@latest
1315
RUN corepack enable
1416
RUN pnpm install
1517

docker/lfmerge/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
FROM ghcr.io/sillsdev/lfmerge:2.0.140
1+
FROM ghcr.io/sillsdev/lfmerge:2.0.141
22
# Do not add anything to this Dockerfile, it should stay empty

docker/next-app/Dockerfile.next-app

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ COPY tsconfig.json pnpm-lock.yaml package.json postcss.config.cjs svelte.config.
77
COPY src /app/src
88
COPY static /app/static
99

10+
# Install latest corepack version to work around a bug with signatures
11+
RUN npm install -g corepack@latest
1012
RUN corepack enable
1113
RUN pnpm install
1214
RUN pnpm run build

docker/next-app/dev/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ COPY tsconfig.json pnpm-lock.yaml package.json postcss.config.cjs svelte.config.
66
COPY src /app/src
77
COPY static /app/static
88

9+
# Install latest corepack version to work around a bug with signatures
10+
RUN npm install -g corepack@latest
911
RUN corepack enable
1012
RUN pnpm install
1113

docker/ui-builder/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ WORKDIR /data
55

66
COPY package.json pnpm-lock.yaml ./
77

8+
# Install latest corepack version to work around a bug with signatures
9+
RUN npm install -g corepack@latest
810
RUN corepack enable
911
RUN pnpm install
1012

0 commit comments

Comments
 (0)