Skip to content
Snippets Groups Projects
Commit 6ef73bf9 authored by Léo Banno-Cloutier's avatar Léo Banno-Cloutier
Browse files

jams-react-client: fix prod Dockerfile

Change-Id: I84178407a12909498febb4402b6441335168efc3
parent 40fd22fe
No related branches found
No related tags found
No related merge requests found
...@@ -37,7 +37,7 @@ CMD java -jar jams-launcher.jar & npm start --prefix ../jams-react-client ...@@ -37,7 +37,7 @@ CMD java -jar jams-launcher.jar & npm start --prefix ../jams-react-client
FROM build as prod FROM build as prod
WORKDIR /app/jams-react-client WORKDIR /app/jams-react-client
RUN npm run build RUN npm run build
RUN mv build ../jams-server/src/main/resources/webapp RUN mv build/* ../jams-server/src/main/resources/webapp
WORKDIR /app WORKDIR /app
RUN mvn package RUN mvn package
...@@ -49,4 +49,5 @@ RUN python3 generate-versions.py net.jami.jams.ad.connector.ADConnector $JAMS_VE ...@@ -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 python3 generate-versions.py net.jami.jams.ldap.connector.LDAPConnector $JAMS_VERSION libs/ldap-connector.jar
RUN ./build-doc.sh RUN ./build-doc.sh
CMD ["cp", "-r", "jams/.", "/jams"] WORKDIR /app/jams
CMD ["java", "-jar", "jams-launcher.jar"]
...@@ -75,12 +75,12 @@ will need to restart the server. ...@@ -75,12 +75,12 @@ will need to restart the server.
## Generate jams with Docker ## Generate jams with Docker
The following commands will generate the userguide and the jars needed: The following commands will generate the userguide and the jars needed:
``` ```
docker build -f Dockerfile -t jams:latest --target prod . docker build -f Dockerfile -t jams:latest --target prod . \
docker run -v $(pwd)/jams:/jams --rm jams:latest && CONTAINER=$(docker create jams:latest) \
USER=$(whoami) && docker cp $CONTAINER:/app/jams jams \
sudo chown -R $USER jams && docker rm -v $CONTAINER \
cd jams && cd jams \
java -jar jams-launcher.jar && java -jar jams-launcher.jar
``` ```
## About jams-server/src/main/java/net/jami/jams/server/filters ## About jams-server/src/main/java/net/jami/jams/server/filters
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment