Merge branch 'develop' into 'main'

Fixes

See merge request !52

docker-compose.override.yml

@@ -25,7 +25,7 @@ services:
       - '8081:8081'
       - '9000:8000'
     volumes:
-      - '${SUBATO2_DATA_DIR}:/usr/local/tomcat/subato2-data'
+      - '${SUBATO2_DATA_DIR}:/subato2-data'
     env_file: .env
     environment:
       - 'JPDA_ADDRESS=*:8000'

docker-compose.prod.yml

@@ -25,7 +25,7 @@ services:
     ports:
       - '8081:8443'
     volumes:
-      - '${SUBATO2_DATA_DIR}:/usr/local/tomcat/subato2-data'
+      - '${SUBATO2_DATA_DIR}:/subato2-data'
       - '/data/volumes/certs/subato-backend.p12:/subato-backend.p12'
     env_file: .env
     environment:

docker-compose.test.yml

@@ -24,7 +24,7 @@ services:
       - '8081:8081'
       - '9000:8000'
     volumes:
-      - '${SUBATO2_DATA_DIR}:/usr/local/tomcat/subato2-data'
+      - '${SUBATO2_DATA_DIR}:/subato2-data'
     env_file: .env
     environment:
       - VIRTUAL_HOST=api.subato-test2.local.cs.hs-rm.de

subato/Dockerfile

@@ -14,5 +14,5 @@ RUN apk add --no-cache tzdata
 RUN chmod u+x gradle-build.sh && ./gradle-build.sh "$HTTP_PROXY" bootJar
 
 FROM openjdk:17-jdk-alpine as final
-COPY --from=pre /app/build/libs/subato-*.jar /app/app.jar
-ENTRYPOINT ["java","-jar","/app/app.jar"]
\ No newline at end of file
+COPY --from=pre /app/build/libs/subato-*.jar /app.jar
+ENTRYPOINT ["java","-jar","/app.jar"]
\ No newline at end of file