From 37715157c40954605226cb7bcc2c0d4574ccf67c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Banno-Cloutier?=
<leo.banno-cloutier@savoirfairelinux.com>
Date: Wed, 5 Jul 2023 10:37:58 -0400
Subject: [PATCH] Dockerfile: idempotent copy
Change-Id: I5c0ef71538c1b3886787401f82ef29739948e961
---
Dockerfile | 3 ++-
README.md | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 9c72b6ee..c0a41452 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -37,7 +37,8 @@ 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 mkdir -p ../jams-server/src/main/resources/webapp \
+ && mv build/* ../jams-server/src/main/resources/webapp
WORKDIR /app
RUN mvn package
diff --git a/README.md b/README.md
index a2fe2f49..b5abd33e 100644
--- a/README.md
+++ b/README.md
@@ -77,7 +77,7 @@ The following commands will generate the userguide and the jars needed:
```
docker build -f Dockerfile -t jams:latest --target prod . \
&& CONTAINER=$(docker create jams:latest) \
- && docker cp $CONTAINER:/app/jams jams \
+ && docker cp $CONTAINER:/app/jams/. jams \
&& docker rm -v $CONTAINER \
&& cd jams \
&& java -jar jams-launcher.jar
--
GitLab