Merge pull request #37 from privacybydesign/docker-webapp-locales

Improvement: include all webapp locales in Dockerfile
privacybydesign · Dec 1, 2023 · 39dce87 · 39dce87
2 parents a99b9e1 + 89a5109
commit 39dce87
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 build/
 .gradle/
+src/main/resources/config.js
 src/main/resources/config.json
 *.der
 *.pem

diff --git a/Dockerfile b/Dockerfile
@@ -1,12 +1,16 @@
 
-FROM yarnpkg/node-yarn:latest as webappbuild
-
-ARG LANGUAGE=en
+FROM node:20 as webappbuild
 
 # Build the webapp
 COPY ./webapp/ /webapp/
+RUN mkdir -p /www
+
 WORKDIR /webapp
-RUN yarn install && ./build.sh ${LANGUAGE}
+RUN yarn install
+RUN ./build.sh en && mv build /www/en
+RUN ./build.sh nl && mv build /www/nl
+# Let root redirect to the english version
+RUN cp /webapp/redirect-en.html /www/index.html
 
 FROM gradle:7.6-jdk11 as javabuild
 
@@ -18,9 +22,13 @@ RUN gradle build
 FROM tomee:9.0-jre11
 
 # Copy the webapp to the webapps directory
-COPY --from=webappbuild /webapp/build/ /usr/local/tomee/webapps/ROOT/
+RUN rm -rf /usr/local/tomee/webapps/ROOT
+COPY --from=webappbuild /www/ /usr/local/tomee/webapps/ROOT/
 
 # Copy the war file to the webapps directory
 COPY --from=javabuild /app/build/libs/irma_email_issuer-1.1.0.war /usr/local/tomee/webapps/
 
-EXPOSE 8080
+EXPOSE 8080
+
+# Copy the config file to the webapp. This is done at runtime so that the config file can be mounted as a volume.
+CMD [ "/bin/sh", "-c", "for lang in 'en' 'nl'; do cp /config/config.js /usr/local/tomee/webapps/ROOT/$lang/assets/config.js; done && catalina.sh run" ]
diff --git a/README.md b/README.md
@@ -29,6 +29,8 @@ By default, docker-compose caches docker images, so on a second run the previous
 $ IP=192.168.1.105 docker-compose up --build
 ```
 
+The configuration should be mounted in the `/config` directory of the container. The `docker-compose.yml` file already contains this configuration.
+
 ## Manual
 The Java api and JavaScript frontend can be built and run manually using the following commands:
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -4,7 +4,7 @@ name: irma_email_issuer
 services:
   # Irma issuer service
   irmaserver:
-    image: ghcr.io/privacybydesign/irma:v0.13.2
+    image: ghcr.io/privacybydesign/irma:v0.14.2
     working_dir: /irmago
     ports:
       - 8088:8088
@@ -45,7 +45,7 @@ services:
         # Make keys and config files available for Java app
         - ./src/main/resources/:/config/
         # Make config.js available for webapp
-        - ./webapp/config.example.js:/usr/local/tomee/webapps/ROOT/assets/config.js:ro"
+        - ./webapp/config.example.js:/config/config.js:ro"
       ports:
         - 8080:8080
       expose:

diff --git a/webapp/redirect-en.html b/webapp/redirect-en.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="refresh" content="0;url=/en/">
+    <title>Redirecting...</title>
+</head>
+<body>
+    <p>If you are not redirected, <a href="/en/">click here</a>.</p>
+</body>
+</html>