Skip to content

Commit 946dcf5

Browse files
StefanVanDyckStefanVanDyck
committed
Fix translation folders in docker images
1 parent b33fbc4 commit 946dcf5

File tree

19 files changed

+59
-62
lines changed

19 files changed

+59
-62
lines changed

‎.github/workflows/update-translations.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
owner: 'inbo',
5959
repo: 'vlaams-biodiversiteitsportaal',
6060
head: 'update-translations',
61-
base: 'main',
61+
base: '${{ github.ref_name }}',
6262
body: 'This PR is auto-generated by [a github action](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}) in [inbo/vlaams-biodiversiteitsportaal](https://github.com/inbo/vlaams-biodiversiteitsportaal).'
6363
});
6464
github.rest.issues.addLabels({

‎config/alerts/i18n/override/messages_nl.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
admin.functions=VBP admin-functies

‎docker/alerts/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ COPY --from=builder /project/build/libs/alerts-${VERSION}-plain.war ${CATALINA_H
3434
COPY alerts.xml ${CATALINA_HOME}/conf/portal/localhost/alerts.xml
3535

3636
# Symlink to i18n files location
37-
RUN mkdir -p /opt/atlas/i18n/alerts \
38-
&& ln -s /config/config/alerts/i18n/crowdin /opt/atlas/i18n/alerts
39-
RUN mkdir -p /var/opt/atlas/i18n/alerts \
37+
RUN mkdir -p /opt/atlas/i18n \
38+
&& ln -s /config/config/alerts/i18n/crowdin /opt/atlas/i18n/alerts \
39+
&& mkdir -p /var/opt/atlas/i18n \
4040
&& ln -s /config/config/alerts/i18n/override /var/opt/atlas/i18n/alerts
4141

4242
HEALTHCHECK CMD curl --fail --silent http://localhost:8080/alerts/actuator/health || exit 1

‎docker/apikey/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ COPY --from=builder /project/build/libs/apikey-${VERSION}-plain.war ${CATALINA_H
3131
COPY apikey.xml ${CATALINA_HOME}/conf/portal/localhost/apikey.xml
3232

3333
# Symlink to i18n files location
34-
RUN mkdir -p /opt/atlas/i18n/apikey \
35-
&& ln -s /config/config/apikey/i18n/crowdin /opt/atlas/i18n/apikey
36-
RUN mkdir -p /var/opt/atlas/i18n/apikey \
34+
RUN mkdir -p /opt/atlas/i18n \
35+
&& ln -s /config/config/apikey/i18n/crowdin /opt/atlas/i18n/apikey \
36+
&& mkdir -p /var/opt/atlas/i18n \
3737
&& ln -s /config/config/apikey/i18n/override /var/opt/atlas/i18n/apikey
3838

3939
HEALTHCHECK CMD curl --fail --silent http://localhost:8080/apikey/actuator/health || exit 1

‎docker/bie-hub/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ COPY --from=builder /project/build/libs/ala-bie-hub-${VERSION}-plain.war ${CATAL
3434
COPY bie-hub.xml ${CATALINA_HOME}/conf/portal/localhost/bie-hub.xml
3535

3636
# Symlink to i18n files location
37-
RUN mkdir -p /opt/atlas/i18n/bie-plugin \
38-
&& ln -s /config/config/bie-plugin/i18n/crowdin /opt/atlas/i18n/bie-plugin
39-
RUN mkdir -p /var/opt/atlas/i18n/bie-plugin \
40-
&& ln -s /config/config/bie-hub/i18n/override /var/opt/atlas/i18n/bie-plugin
37+
RUN mkdir -p /opt/atlas/i18n \
38+
&& ln -s /config/config/bie-plugin/i18n/crowdin /opt/atlas/i18n/bie-plugin \
39+
&& mkdir -p /var/opt/atlas/i18n \
40+
&& ln -s /config/config/bie-plugin/i18n/override /var/opt/atlas/i18n/bie-plugin
4141

4242
HEALTHCHECK CMD curl --fail --silent http://localhost:8080/apikey/actuator/health || exit 1

‎docker/bie-index/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ COPY --from=builder /project/build/libs/bie-index-${VERSION}-plain.war ${CATALIN
3131
COPY bie-index.xml ${CATALINA_HOME}/conf/portal/localhost/bie-index.xml
3232

3333
# Symlink to i18n files location
34-
RUN mkdir -p /opt/atlas/i18n/bie-index \
35-
&& ln -s /config/config/bie-index/i18n/crowdin /opt/atlas/i18n/bie-index
36-
RUN mkdir -p /var/opt/atlas/i18n/bie-index \
34+
RUN mkdir -p /opt/atlas/i18n \
35+
&& ln -s /config/config/bie-index/i18n/crowdin /opt/atlas/i18n/bie-index \
36+
&& mkdir -p /var/opt/atlas/i18n \
3737
&& ln -s /config/config/bie-index/i18n/override /var/opt/atlas/i18n/bie-index
3838

3939
HEALTHCHECK CMD curl --fail --silent http://localhost:8080/apikey/actuator/health || exit 1

‎docker/biocache-hub/Dockerfile

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,11 @@ COPY --from=builder /project/ala-hub/build/libs/ala-hub-${VERSION}-plain.war ${C
4949
COPY biocache-hub.xml ${CATALINA_HOME}/conf/portal/localhost/biocache-hub.xml
5050

5151
# Symlink to i18n files location
52-
RUN mkdir -p /opt/atlas/i18n/downloads-plugin \
53-
&& ln -s /config/config/biocache-hub/i18n/crowdin/downloads-plugin /opt/atlas/i18n/downloads-plugin
54-
RUN mkdir -p /var/opt/atlas/i18n/downloads-plugin \
55-
&& ln -s /config/config/biocache-hub/i18n/downloads-plugin/override /var/opt/atlas/i18n/downloads-plugin
56-
RUN mkdir -p /opt/atlas/i18n/biocache-hubs \
57-
&& ln -s /config/config/biocache-hubs/i18n/crowdin /opt/atlas/i18n/biocache-hubs
58-
RUN mkdir -p /var/opt/atlas/i18n/biocache-hubs \
59-
&& ln -s /config/config/biocache-hub/i18n/override /var/opt/atlas/i18n/biocache-hubs
52+
RUN mkdir -p /opt/atlas/i18n \
53+
&& mkdir -p /var/opt/atlas/i18n \
54+
&& ln -s /config/config/biocache-hub/i18n/crowdin/downloads-plugin /opt/atlas/i18n/downloads-plugin \
55+
&& ln -s /config/config/biocache-hub/i18n/downloads-plugin/override /var/opt/atlas/i18n/downloads-plugin \
56+
&& ln -s /config/config/biocache-hubs/i18n/crowdin /opt/atlas/i18n/biocache-hubs \
57+
&& ln -s /config/config/biocache-hubs/i18n/override /var/opt/atlas/i18n/biocache-hubs
6058

6159
HEALTHCHECK CMD curl --fail --silent http://localhost:8080/biocache-hub/actuator/health || exit 1

‎docker/biocache-service/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ COPY --from=builder /project/build/libs/biocache-service-${VERSION}.war ${CATALI
2727
COPY biocache-service.xml ${CATALINA_HOME}/conf/portal/localhost/biocache-service.xml
2828

2929
# Symlink to i18n files location
30-
RUN mkdir -p /opt/atlas/i18n/biocache-service \
31-
&& ln -s /config/config/biocache-service/i18n/crowdin /opt/atlas/i18n/biocache-service
32-
RUN mkdir -p /var/opt/atlas/i18n/biocache-service \
30+
RUN mkdir -p /opt/atlas/i18n \
31+
&& ln -s /config/config/biocache-service/i18n/crowdin /opt/atlas/i18n/biocache-service \
32+
&& mkdir -p /var/opt/atlas/i18n \
3333
&& ln -s /config/config/biocache-service/i18n/override /var/opt/atlas/i18n/biocache-service
3434

3535
HEALTHCHECK CMD curl --fail --silent http://localhost:8080/biocache-service/actuator/health || exit 1

‎docker/collectory/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ COPY --from=builder /project/build/libs/collectory-${VERSION}-plain.war ${CATALI
3535
COPY collectory.xml ${CATALINA_HOME}/conf/portal/localhost/collectory.xml
3636

3737
# Symlink to i18n files location
38-
RUN mkdir -p /opt/atlas/i18n/collectory-plugin \
39-
&& ln -s /config/config/collectory-plugin/i18n/crowdin /opt/atlas/i18n/collectory-plugin
40-
RUN mkdir -p /var/opt/atlas/i18n/collectory-plugin \
41-
&& ln -s /config/config/collectory/i18n/override /var/opt/atlas/i18n/collectory-plugin
38+
RUN mkdir -p /opt/atlas/i18n \
39+
&& ln -s /config/config/collectory-plugin/i18n/crowdin /opt/atlas/i18n/collectory-plugin \
40+
&& mkdir -p /var/opt/atlas/i18n \
41+
&& ln -s /config/config/collectory-plugin/i18n/override /var/opt/atlas/i18n/collectory-plugin
4242

4343
HEALTHCHECK CMD curl --fail --silent http://localhost:8080/collectory/actuator/health || exit 1

‎docker/doi-service/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ COPY --from=builder /project/build/libs/doi-service-${VERSION}-plain.war ${CATAL
2929
COPY doi-service.xml ${CATALINA_HOME}/conf/portal/localhost/doi-service.xml
3030

3131
# Symlink to i18n files location
32-
RUN mkdir -p /opt/atlas/i18n/doi \
33-
&& ln -s /config/config/doi/i18n/crowdin /opt/atlas/i18n/doi
34-
RUN mkdir -p /var/opt/atlas/i18n/doi \
32+
RUN mkdir -p /opt/atlas/i18n \
33+
&& ln -s /config/config/doi-service/i18n/crowdin /opt/atlas/i18n/doi \
34+
&& mkdir -p /var/opt/atlas/i18n \
3535
&& ln -s /config/config/doi-service/i18n/override /var/opt/atlas/i18n/doi
3636

3737
HEALTHCHECK CMD curl --fail --silent http://localhost:8080/doi-service/actuator/health || exit 1

‎docker/image-service/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ COPY --from=builder /project/build/libs/image-service-${VERSION}-plain.war ${CAT
3030
COPY image-service.xml ${CATALINA_HOME}/conf/portal/localhost/image-service.xml
3131

3232
# Symlink to i18n files location
33-
RUN mkdir -p /opt/atlas/i18n/image-service \
34-
&& ln -s /config/config/image-service/i18n/crowdin /opt/atlas/i18n/image-service
35-
RUN mkdir -p /var/opt/atlas/i18n/image-service \
33+
RUN mkdir -p /opt/atlas/i18n \
34+
&& ln -s /config/config/image-service/i18n/crowdin /opt/atlas/i18n/image-service \
35+
&& mkdir -p /var/opt/atlas/i18n \
3636
&& ln -s /config/config/image-service/i18n/override /var/opt/atlas/i18n/image-service
3737

3838
HEALTHCHECK CMD curl --fail --silent http://localhost:8080/image-service/actuator/health || exit 1

‎docker/logger/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ LABEL ala.version=${VERSION}
3030

3131
COPY --from=builder /project/build/libs/logger-service-${VERSION}-plain.war ${CATALINA_HOME}/webapps/logger.war
3232
COPY logger.xml ${CATALINA_HOME}/conf/portal/localhost/logger.xml
33-
RUN mkdir -p /opt/atlas/i18n/logger \
34-
&& ln -s /config/config/logger/i18n/crowdin /opt/atlas/i18n/logger
35-
RUN mkdir -p /var/opt/atlas/i18n/logger \
33+
RUN mkdir -p /opt/atlas/i18n \
34+
&& ln -s /config/config/logger/i18n/crowdin /opt/atlas/i18n/logger \
35+
&& mkdir -p /var/opt/atlas/i18n \
3636
&& ln -s /config/config/logger/i18n/override /var/opt/atlas/i18n/logger
3737

3838
HEALTHCHECK CMD curl --fail --silent http://localhost:8080/logger/actuator/health || exit 1

‎docker/regions/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ COPY --from=builder /project/build/libs/regions-${VERSION}-plain.war ${CATALINA_
3535
COPY regions.xml ${CATALINA_HOME}/conf/portal/localhost/regions.xml
3636

3737
# Symlink to i18n files location
38-
RUN mkdir -p /opt/atlas/i18n/regions \
39-
&& ln -s /config/config/regions/i18n/crowdin /opt/atlas/i18n/regions
40-
RUN mkdir -p /var/opt/atlas/i18n/regions \
38+
RUN mkdir -p /opt/atlas/i18n \
39+
&& ln -s /config/config/regions/i18n/crowdin /opt/atlas/i18n/regions \
40+
&& mkdir -p /var/opt/atlas/i18n \
4141
&& ln -s /config/config/regions/i18n/override /var/opt/atlas/i18n/regions
4242

4343
HEALTHCHECK CMD curl --fail --silent http://localhost:8080/regions/actuator/health || exit 1

‎docker/sensitive-data-service/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ RUN groupadd --gid 1000 app \
2323

2424
RUN mkdir /data && mkdir /data/lucene && chown -R app:app /data
2525

26+
# Link to hardcoded config location
27+
RUN mkdir -p /config/config \
28+
&& ln -s /data/sds/config/sds-config.properties /config/config/sds-config.properties
29+
2630
USER app
2731
WORKDIR /data/lucene
2832

@@ -37,8 +41,6 @@ WORKDIR /app
3741
COPY --from=builder --chown=app \
3842
/project/ala-sensitive-data-server/target/ala-sensitive-data-server-${VERSION}.jar /app/app.jar
3943

40-
RUN ln -s /data/sds/config/sds-config.properties /config/config/sds-config.properties
41-
4244
ENTRYPOINT ["java", "-jar", "/app/app.jar", "server"]
4345
CMD ["config.yml"]
4446

‎docker/spatial-hub/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ COPY --from=builder /project/build/libs/project-${VERSION}-plain.war ${CATALINA_
3838
COPY spatial-hub.xml ${CATALINA_HOME}/conf/portal/localhost/spatial-hub.xml
3939

4040
# Symlink to i18n files location
41-
RUN mkdir -p /opt/atlas/i18n/spatial-hub \
42-
&& ln -s /config/config/spatial-hub/i18n/crowdin /opt/atlas/i18n/spatial-hub
43-
RUN mkdir -p /var/opt/atlas/i18n/spatial-hub \
41+
RUN mkdir -p /opt/atlas/i18n \
42+
&& ln -s /config/config/spatial-hub/i18n/crowdin /opt/atlas/i18n/spatial-hub \
43+
&& mkdir -p /var/opt/atlas/i18n \
4444
&& ln -s /config/config/spatial-hub/i18n/override /var/opt/atlas/i18n/spatial-hub
4545

4646
HEALTHCHECK CMD curl --fail --silent http://localhost:8080/spatial-hub/actuator/health || exit 1

‎docker/spatial-service/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ COPY --from=builder /project/build/libs/project-${VERSION}-plain.war ${CATALINA_
4141
COPY spatial-service.xml ${CATALINA_HOME}/conf/portal/localhost/spatial-service.xml
4242

4343
# Symlink to i18n files location
44-
RUN mkdir -p /opt/atlas/i18n/spatial-service \
45-
&& ln -s /config/config/spatial-service/i18n/crowdin /opt/atlas/i18n/spatial-service
46-
RUN mkdir -p /var/opt/atlas/i18n/spatial-service \
44+
RUN mkdir -p /opt/atlas/i18n \
45+
&& ln -s /config/config/spatial-service/i18n/crowdin /opt/atlas/i18n/spatial-service \
46+
&& mkdir -p /var/opt/atlas/i18n \
4747
&& ln -s /config/config/spatial-service/i18n/override /var/opt/atlas/i18n/spatial-service
4848

4949
HEALTHCHECK CMD curl --fail --silent http://localhost:8080/spatial-service/actuator/health || exit 1

‎docker/species-list/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ COPY --from=builder /project/build/libs/specieslist-webapp-${VERSION}-plain.war
2929
COPY species-list.xml ${CATALINA_HOME}/conf/portal/localhost/species-list.xml
3030

3131
# Symlink to i18n files location
32-
RUN mkdir -p /opt/atlas/i18n/species-list \
33-
&& ln -s /config/config/species-list/i18n/crowdin /opt/atlas/i18n/species-list
34-
RUN mkdir -p /var/opt/atlas/i18n/species-list \
35-
&& ln -s /config/config/specieslist-webapp/i18n/override /var/opt/atlas/i18n/species-list
32+
RUN mkdir -p /opt/atlas/i18n \
33+
&& ln -s /config/config/species-list/i18n/crowdin /opt/atlas/i18n/specieslist-webapp \
34+
&& mkdir -p /var/opt/atlas/i18n \
35+
&& ln -s /config/config/species-list/i18n/override /var/opt/atlas/i18n/specieslist-webapp
3636

3737
HEALTHCHECK CMD curl --fail --silent http://localhost:8080/species-list/actuator/health || exit 1

‎docker/tomcat/Dockerfile

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,17 +71,13 @@ COPY --from=userdetails ${CATALINA_HOME}/conf/portal/localhost conf/portal/local
7171

7272
# Symlink to i18n files location (for loop for standard naming, additional special cases at the end)
7373
RUN sh -x \
74+
&& mkdir -p /opt/atlas/i18n \
75+
&& mkdir -p /var/opt/atlas/i18n \
7476
&& for service in alerts apikey bie-hub bie-index biocache-hub biocache-service collectory doi-service image-service logger regions spatial-hub spatial-service userdetails; do \
75-
mkdir -p /opt/atlas/i18n/${service}; \
7677
ln -s /config/config/${service}/i18n/crowdin /opt/atlas/i18n/${service}; \
77-
mkdir -p /var/opt/atlas/i18n/${service}; \
7878
ln -s /config/config/${service}/i18n/override /var/opt/atlas/i18n/${service}; \
7979
done \
80-
&& mkdir -p /opt/atlas/i18n/downloads-plugin \
8180
&& ln -s /config/config/biocache-hub/i18n/crowdin/downloads-plugin /opt/atlas/i18n/downloads-plugin \
82-
&& mkdir -p /var/opt/atlas/i18n/downloads-plugin \
8381
&& ln -s /config/config/biocache-hub/i18n/downloads-plugin/override /var/opt/atlas/i18n/downloads-plugin \
84-
&& mkdir -p /opt/atlas/i18n/species-list \
8582
&& ln -s /config/config/species-list/i18n/crowdin /opt/atlas/i18n/species-list \
86-
&& mkdir -p /var/opt/atlas/i18n/species-list \
8783
&& ln -s /config/config/specieslist-webapp/i18n/override /var/opt/atlas/i18n/species-list

‎docker/userdetails/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ COPY --from=builder /project/build/libs/userdetails-${VERSION}-plain.war ${CATAL
2929
COPY userdetails.xml ${CATALINA_HOME}/conf/portal/localhost/userdetails.xml
3030

3131
# Symlink to i18n files location
32-
RUN mkdir -p /opt/atlas/i18n/userdetails \
33-
&& ln -s /config/config/userdetails/i18n/crowdin /opt/atlas/i18n/userdetails
34-
RUN mkdir -p /var/opt/atlas/i18n/userdetails \
32+
RUN mkdir -p /opt/atlas/i18n \
33+
&& ln -s /config/config/userdetails/i18n/crowdin /opt/atlas/i18n/userdetails \
34+
&& mkdir -p /var/opt/atlas/i18n \
3535
&& ln -s /config/config/userdetails/i18n/override /var/opt/atlas/i18n/userdetails
3636

3737
HEALTHCHECK CMD curl --fail --silent http://localhost:8080/userdetails/actuator/health || exit 1

0 commit comments

Comments
 (0)