From 6ef73bf9cd267fed6b19c84ed2f98ff401fbfda7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Banno-Cloutier?=
 <leo.banno-cloutier@savoirfairelinux.com>
Date: Tue, 4 Jul 2023 15:34:29 -0400
Subject: [PATCH] jams-react-client: fix prod Dockerfile

Change-Id: I84178407a12909498febb4402b6441335168efc3
---
 Dockerfile |  5 +++--
 README.md  | 12 ++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2838d50e..9c72b6ee 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -37,7 +37,7 @@ CMD java -jar jams-launcher.jar & npm start --prefix ../jams-react-client
 FROM build as prod
 WORKDIR /app/jams-react-client
 RUN npm run build
-RUN mv build ../jams-server/src/main/resources/webapp
+RUN mv build/* ../jams-server/src/main/resources/webapp
 WORKDIR /app
 RUN mvn package
 
@@ -49,4 +49,5 @@ RUN python3 generate-versions.py net.jami.jams.ad.connector.ADConnector $JAMS_VE
 RUN python3 generate-versions.py net.jami.jams.ldap.connector.LDAPConnector $JAMS_VERSION libs/ldap-connector.jar
 
 RUN ./build-doc.sh
-CMD ["cp", "-r", "jams/.", "/jams"]
+WORKDIR /app/jams
+CMD ["java", "-jar", "jams-launcher.jar"]
diff --git a/README.md b/README.md
index 7a7e4f55..a2fe2f49 100644
--- a/README.md
+++ b/README.md
@@ -75,12 +75,12 @@ will need to restart the server.
 ## Generate jams with Docker
 The following commands will generate the userguide and the jars needed:
 ```
-docker build -f Dockerfile -t jams:latest --target prod .
-docker run -v $(pwd)/jams:/jams --rm jams:latest
-USER=$(whoami)
-sudo chown -R $USER jams
-cd jams
-java -jar jams-launcher.jar
+docker build -f Dockerfile -t jams:latest --target prod . \
+    && CONTAINER=$(docker create jams:latest) \
+    && docker cp $CONTAINER:/app/jams jams \
+    && docker rm -v $CONTAINER \
+    && cd jams \
+    && java -jar jams-launcher.jar
 ```
 
 ## About jams-server/src/main/java/net/jami/jams/server/filters
-- 
GitLab