Skip to content

Commit a892d98

Browse files
committed
Merge branch 'develop'
2 parents 7556efd + c66a83e commit a892d98

22 files changed

+21
-10
lines changed

docker/deployment/base/db-deployment.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,17 @@ spec:
6969
cpu: 0.1
7070
limits:
7171
memory: 400Mi
72+
emv:
73+
- name: MONGO_INITDB_ROOT_USERNAME
74+
valueFrom:
75+
secretKeyRef:
76+
key: MONGODB_USER
77+
name: mongo-auth
78+
- name: MONGO_INITDB_ROOT_PASSWORD
79+
valueFrom:
80+
secretKeyRef:
81+
key: MONGODB_PASS
82+
name: mongo-auth
7283
volumeMounts:
7384
- mountPath: /data/db
7485
name: data

docker/deployment/prod/kustomization.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ resources:
1010
# because of that we have to do a bit of a workaround to allow setting the image tag for the correct container
1111
images:
1212
- name: sillsdev/web-languageforge
13-
newTag: 2023-11-13
13+
newTag: 2024-06-27
1414
- name: sillsdev/web-languageforge-next-proxy
1515
newName: sillsdev/web-languageforge
16-
newTag: next-proxy-2023-11-13
16+
newTag: next-proxy-2024-06-27
1717
- name: sillsdev/web-languageforge-next-app
1818
newName: sillsdev/web-languageforge
19-
newTag: next-app-2023-11-13
19+
newTag: next-app-2024-06-27
2020
- name: ghcr.io/sillsdev/lfmerge
21-
newTag: 2.0.136
21+
newTag: 2.0.139
2222

2323
patches:
2424
- path: app-config-patch.yaml

docker/deployment/staging/kustomization.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ resources:
1010
# because of that we have to do a bit of a workaround to allow setting the image tag for the correct container
1111
images:
1212
- name: sillsdev/web-languageforge
13-
newTag: develop-20231108-7256a1d48b45b6ea05afc954344911e786e4f61d
13+
newTag: develop-20240627-1654c1a7664cca5e694aed94bfd8aea593821859
1414
- name: sillsdev/web-languageforge-next-proxy
1515
newName: sillsdev/web-languageforge
16-
newTag: develop-next-proxy-20231108-7256a1d48b45b6ea05afc954344911e786e4f61d
16+
newTag: develop-next-proxy-20240627-1654c1a7664cca5e694aed94bfd8aea593821859
1717
- name: sillsdev/web-languageforge-next-app
1818
newName: sillsdev/web-languageforge
19-
newTag: develop-next-app-20231108-7256a1d48b45b6ea05afc954344911e786e4f61d
19+
newTag: develop-next-app-20240627-1654c1a7664cca5e694aed94bfd8aea593821859
2020
- name: ghcr.io/sillsdev/lfmerge
21-
newTag: 2.0.135
21+
newTag: 2.0.139
2222

2323
patches:
2424
- path: app-config-patch.yaml

src/Site/views/languageforge/theme/default/page/home/index.html.twig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,10 @@
116116
<!-- Footer -->
117117
<footer id="footer">
118118
<ul class="icons">
119-
<li><a href="https://inter.payap.ac.th/"><img style="margin-bottom: 28px" src="/Site/views/shared/image/payap_logo.png"
119+
<li><a href="https://li.payap.ac.th/"><img style="margin-bottom: 28px" src="/Site/views/shared/image/payap_logo.png"
120120
alt="Payap University Logo" width="170" height="50"/></a></li>
121121
<li><a href="http://www.sil.org"><img src="/Site/views/shared/image/sil_logo.png" alt="SIL International Logo"
122-
width="100" height="119"/></a></li>
122+
width="200" height="119"/></a></li>
123123
</ul>
124124

125125

Binary file not shown.
Binary file not shown.
-22.5 KB
Binary file not shown.
-95.4 KB
Binary file not shown.
-179 KB
Binary file not shown.
-701 Bytes
Binary file not shown.

src/Site/views/shared/image/globe.png

-37.3 KB
Binary file not shown.
-778 Bytes
Binary file not shown.
-4.08 KB
Binary file not shown.
-7.56 KB
Binary file not shown.
-7.42 KB
Binary file not shown.
-22 KB
Binary file not shown.
-6.78 KB
Loading
-1.24 KB
Binary file not shown.
Binary file not shown.
-1.66 KB
Binary file not shown.

src/Site/views/shared/image/tick.png

-537 Bytes
Binary file not shown.
-3.78 KB
Binary file not shown.

0 commit comments

Comments
 (0)