Merge branch 'develop'

sillsdev · Jul 5, 2024 · a892d98 · a892d98
2 parents 7556efd + c66a83e
commit a892d98
Show file tree

Hide file tree

Showing 22 changed files with 21 additions and 10 deletions.
diff --git a/docker/deployment/base/db-deployment.yaml b/docker/deployment/base/db-deployment.yaml
@@ -69,6 +69,17 @@ spec:
             cpu: 0.1
           limits:
             memory: 400Mi
+        emv:
+          - name: MONGO_INITDB_ROOT_USERNAME
+            valueFrom:
+              secretKeyRef:
+                key: MONGODB_USER
+                name: mongo-auth
+          - name: MONGO_INITDB_ROOT_PASSWORD
+            valueFrom:
+              secretKeyRef:
+                key: MONGODB_PASS
+                name: mongo-auth
         volumeMounts:
         - mountPath: /data/db
           name: data

diff --git a/docker/deployment/prod/kustomization.yaml b/docker/deployment/prod/kustomization.yaml
@@ -10,15 +10,15 @@ 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: 2023-11-13
+    newTag: 2024-06-27
   - name: sillsdev/web-languageforge-next-proxy
     newName: sillsdev/web-languageforge
-    newTag: next-proxy-2023-11-13
+    newTag: next-proxy-2024-06-27
   - name: sillsdev/web-languageforge-next-app
     newName: sillsdev/web-languageforge
-    newTag: next-app-2023-11-13
+    newTag: next-app-2024-06-27
   - name: ghcr.io/sillsdev/lfmerge
-    newTag: 2.0.136
+    newTag: 2.0.139
 
 patches:
   - path: app-config-patch.yaml

diff --git a/docker/deployment/staging/kustomization.yaml b/docker/deployment/staging/kustomization.yaml
@@ -10,15 +10,15 @@ 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-20231108-7256a1d48b45b6ea05afc954344911e786e4f61d
+    newTag: develop-20240627-1654c1a7664cca5e694aed94bfd8aea593821859
   - name: sillsdev/web-languageforge-next-proxy
     newName: sillsdev/web-languageforge
-    newTag: develop-next-proxy-20231108-7256a1d48b45b6ea05afc954344911e786e4f61d
+    newTag: develop-next-proxy-20240627-1654c1a7664cca5e694aed94bfd8aea593821859
   - name: sillsdev/web-languageforge-next-app
     newName: sillsdev/web-languageforge
-    newTag: develop-next-app-20231108-7256a1d48b45b6ea05afc954344911e786e4f61d
+    newTag: develop-next-app-20240627-1654c1a7664cca5e694aed94bfd8aea593821859
   - name: ghcr.io/sillsdev/lfmerge
-    newTag: 2.0.135
+    newTag: 2.0.139
 
 patches:
   - path: app-config-patch.yaml

diff --git a/src/Site/views/languageforge/theme/default/page/home/index.html.twig b/src/Site/views/languageforge/theme/default/page/home/index.html.twig
@@ -116,10 +116,10 @@
     <!-- Footer -->
     <footer id="footer">
         <ul class="icons">
-            <li><a href="https://inter.payap.ac.th/"><img style="margin-bottom: 28px" src="/Site/views/shared/image/payap_logo.png"
+            <li><a href="https://li.payap.ac.th/"><img style="margin-bottom: 28px" src="/Site/views/shared/image/payap_logo.png"
                                                       alt="Payap University Logo" width="170" height="50"/></a></li>
             <li><a href="http://www.sil.org"><img src="/Site/views/shared/image/sil_logo.png" alt="SIL International Logo"
-                                                  width="100" height="119"/></a></li>
+                                                  width="200" height="119"/></a></li>
         </ul>
 
 

diff --git a/src/Site/views/shared/image/SIL Logo 2014 TM Black.png b/src/Site/views/shared/image/SIL Logo 2014 TM Black.png
diff --git a/src/Site/views/shared/image/SIL Logo 2014 TM Blue.png b/src/Site/views/shared/image/SIL Logo 2014 TM Blue.png
diff --git a/src/Site/views/shared/image/SIL Logo 2014 TM.png b/src/Site/views/shared/image/SIL Logo 2014 TM.png
diff --git a/src/Site/views/shared/image/beach1.jpg b/src/Site/views/shared/image/beach1.jpg
diff --git a/src/Site/views/shared/image/empty_book.png b/src/Site/views/shared/image/empty_book.png
diff --git a/src/Site/views/shared/image/exclamation.png b/src/Site/views/shared/image/exclamation.png
diff --git a/src/Site/views/shared/image/globe.png b/src/Site/views/shared/image/globe.png
diff --git a/src/Site/views/shared/image/information.png b/src/Site/views/shared/image/information.png
diff --git a/src/Site/views/shared/image/loading.gif b/src/Site/views/shared/image/loading.gif
diff --git a/src/Site/views/shared/image/seed-company-logo.png b/src/Site/views/shared/image/seed-company-logo.png
diff --git a/src/Site/views/shared/image/sf_sprite.gif b/src/Site/views/shared/image/sf_sprite.gif
diff --git a/src/Site/views/shared/image/sf_sprite.png b/src/Site/views/shared/image/sf_sprite.png
diff --git a/src/Site/views/shared/image/sil_logo.png b/src/Site/views/shared/image/sil_logo.png
diff --git a/src/Site/views/shared/image/sil_logo_small.png b/src/Site/views/shared/image/sil_logo_small.png
diff --git a/src/Site/views/shared/image/superfish-arrows-ffffff.png b/src/Site/views/shared/image/superfish-arrows-ffffff.png
diff --git a/src/Site/views/shared/image/superfish-shadow.png b/src/Site/views/shared/image/superfish-shadow.png
diff --git a/src/Site/views/shared/image/tick.png b/src/Site/views/shared/image/tick.png
diff --git a/src/Site/views/shared/image/ubs-logo.png b/src/Site/views/shared/image/ubs-logo.png