From 834367f90af4594fd2ab16965b39f03782fa2c98 Mon Sep 17 00:00:00 2001
From: Markus Kreth <markus.kreth@web.de>
Date: Sat, 28 May 2022 12:50:06 +0200
Subject: [PATCH] added workingdir to docker setup.l

---
 Dockerfile          | 23 +++++++++++++++++++++--
 docker-compose.yaml |  5 +++++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b3c5774..edbb586 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,33 @@
 FROM adoptopenjdk:11-jre-hotspot as builder
 ARG JAR_FILE=trainerinvoice*.jar
 COPY ${JAR_FILE} application.jar
+RUN true
 RUN java -Djarmode=layertools -jar application.jar extract
- 
+RUN true
+
 FROM adoptopenjdk:11-jre-hotspot
+RUN apt-get install -y locales
+RUN true
+RUN locale-gen en_US.UTF-8
+RUN true
+RUN locale-gen de_DE.UTF-8
+RUN true
+ENV LANG='de_DE.UTF-8' LANGUAGE='de_DE:de' LC_ALL='de_DE.UTF-8'
+RUN true
 RUN echo "Europe/Berlin" > /etc/timezone
+RUN true
+ENV TZ=Europe/Berlin
+RUN true
 COPY --from=builder dependencies/ ./
+RUN true
 COPY --from=builder snapshot-dependencies/ ./
+RUN true
 COPY --from=builder spring-boot-loader/ ./
+RUN true
 COPY --from=builder application/ ./
+RUN true
+
+WORKDIR /app
+
 ENV JAVA_OPTS="-Duser.language=de -Duser.country=DE -Duser.region=DE"
-ENV TZ=Europe/Berlin
 ENTRYPOINT ["java", "org.springframework.boot.loader.JarLauncher"]
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 790b44d..b359c81 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -9,6 +9,8 @@ services:
       - "<WUNSCH_PORT>"
     networks:
       - <nginx_Network>
+    volumes:
+      - workdir-volume:/app
     environment:
       - VIRTUAL_HOST=<Einstellungen für nginx und letsencrype>
       - VIRTUAL_PORT=<WUNSCH_PORT>
@@ -22,6 +24,7 @@ services:
       - SPRING_DATASOURCE_URL=jdbc:postgresql://<DBHOST>:<DBPORT>/<DBNAME>
       - SPRING_DATASOURCE_USERNAME=<DBUSER>
       - SPRING_DATASOURCE_PASSWORD=<DBPASSWORD>
+      - SPRING_JPA_DATABASE-PLATFORM=org.hibernate.dialect.PostgreSQLDialect
       - LANG=de_DE.UTF-8
       - LANGUAGE=de_DE:de
       - LC_ALL=de_DE.UTF-8
@@ -30,3 +33,5 @@ services:
 networks:
   <nginx_Network>:
     external: true
+volumes:
+  workdir-volume:
\ No newline at end of file