update lf merge version, configure staging to use lexbox

Author: hahn-kev

docker/deployment/base/app-config.yaml

@@ -4,4 +4,6 @@ metadata:
   name: app-config
 data:
   website: "localhost"
-  hg-domain: "hg-staging.languagforge.org"
+  hg-domain: "hg-staging.languageforge.org"
+  hg-protocol: "https"
+  hg-username: "lf-merge"

docker/deployment/base/lfmerge-deployment.yaml

@@ -108,8 +108,19 @@ spec:
               configMapKeyRef:
                 name: app-config
                 key: hg-domain
+          - name: LFMERGE_LANGUAGE_DEPOT_HG_PROTOCOL
+            valueFrom:
+              configMapKeyRef:
+                name: app-config
+                key: hg-protocol
           - name: LANGUAGE_DEPOT_TRUST_TOKEN
             valueFrom:
               secretKeyRef:
                 key: LD_TRUST_TOKEN
                 name: ld-trust-token
+          - name: LANGUAGE_DEPOT_HG_USERNAME
+            valueFrom:
+              configMapKeyRef:
+                name: app-config
+                key: hg-username
+

docker/deployment/staging/app-config-patch.yaml

@@ -4,4 +4,5 @@ metadata:
   name: app-config
 data:
   website: "staging.languageforge.org"
-
+  hg-domain: "lexbox.languagedepot:5158" #reference lexbox service in the same cluster
+  hg-protocol: "http"

docker/deployment/staging/kustomization.yaml

@@ -10,13 +10,13 @@ resources:
 # because of that we have to do a bit of a workaround to allow setting the image tag for the correct container
 images:
   - name: sillsdev/web-languageforge
-    newTag: develop-20231002-a33383741406cb1823c05a3f6e00d20f35d1ec4d
+    newTag: develop-20231108-7256a1d48b45b6ea05afc954344911e786e4f61d
   - name: sillsdev/web-languageforge-next-proxy
     newName: sillsdev/web-languageforge
-    newTag: develop-next-proxy-20231002-a33383741406cb1823c05a3f6e00d20f35d1ec4d
+    newTag: develop-next-proxy-20231108-7256a1d48b45b6ea05afc954344911e786e4f61d
   - name: sillsdev/web-languageforge-next-app
     newName: sillsdev/web-languageforge
-    newTag: develop-next-app-20231002-a33383741406cb1823c05a3f6e00d20f35d1ec4d
+    newTag: develop-next-app-20231108-7256a1d48b45b6ea05afc954344911e786e4f61d
   - name: ghcr.io/sillsdev/lfmerge
     newTag: 2.0.135
 

docker/lfmerge/Dockerfile

@@ -1,2 +1,2 @@
-FROM ghcr.io/sillsdev/lfmerge:2.0.135
+FROM ghcr.io/sillsdev/lfmerge:2.0.136
 # Do not add anything to this Dockerfile, it should stay empty