Use chg in LfMerge, only in local dev LF for now

rmunn · rmunn · commit 73c0b6565c6b · 2025-02-03T16:32:21.000-05:00
diff --git 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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-FROM ghcr.io/sillsdev/lfmerge:2.0.140`
	`1`	`+FROM ghcr.io/sillsdev/lfmerge:2.0.141`
`2`	`2`	`# Do not add anything to this Dockerfile, it should stay empty`