From 2d85a0f04c6265edf27a4084ad3d9be6823505f5 Mon Sep 17 00:00:00 2001 From: ialbert Date: Tue, 2 Aug 2022 19:22:41 +0300 Subject: [PATCH] . --- clearing-parent/classes/pom.xml | 4 ++-- clearing-parent/storage/pom.xml | 4 ++-- z-distr/pom.xml | 4 ++-- .../src/main/resources/distr/modules/backend-api/Dockerfile | 5 ++--- z-distr/src/main/resources/distr/modules/os/Dockerfile | 5 +++++ 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/clearing-parent/classes/pom.xml b/clearing-parent/classes/pom.xml index 206e686c5..c47f2d5f3 100644 --- a/clearing-parent/classes/pom.xml +++ b/clearing-parent/classes/pom.xml @@ -16,8 +16,8 @@ - 8 - 8 + 17 + 17 diff --git a/clearing-parent/storage/pom.xml b/clearing-parent/storage/pom.xml index 56c029929..24f884ba4 100644 --- a/clearing-parent/storage/pom.xml +++ b/clearing-parent/storage/pom.xml @@ -17,8 +17,8 @@ - 11 - 11 + 17 + 17 diff --git a/z-distr/pom.xml b/z-distr/pom.xml index cb9c71113..00945f5ed 100644 --- a/z-distr/pom.xml +++ b/z-distr/pom.xml @@ -12,8 +12,8 @@ z-distr - 11 - 11 + 17 + 17 ${project.basedir}/target/clearing ${project.basedir}/target/clearing/modules diff --git a/z-distr/src/main/resources/distr/modules/backend-api/Dockerfile b/z-distr/src/main/resources/distr/modules/backend-api/Dockerfile index 67f1efcb5..57bdca9dd 100644 --- a/z-distr/src/main/resources/distr/modules/backend-api/Dockerfile +++ b/z-distr/src/main/resources/distr/modules/backend-api/Dockerfile @@ -1,6 +1,5 @@ FROM debian:stable-20220125-jdk17 -ADD backend-api.jar /deployments/backend-api.jar +ADD backend-api.jar /opt/clearing/bin/backend-api.jar USER root -RUN mkdir ./logs -ENTRYPOINT java -jar /deployments/backend-api.jar +ENTRYPOINT java -jar /opt/clearing/bin/backend-api.jar diff --git a/z-distr/src/main/resources/distr/modules/os/Dockerfile b/z-distr/src/main/resources/distr/modules/os/Dockerfile index 5d62e616d..aaf05c3d9 100644 --- a/z-distr/src/main/resources/distr/modules/os/Dockerfile +++ b/z-distr/src/main/resources/distr/modules/os/Dockerfile @@ -32,3 +32,8 @@ RUN set -eux; \ ENV JAVA_HOME=/opt/java/bellsoft-jdk/ \ PATH="/opt/java/bellsoft-jdk/bin:$PATH" + +RUN mkdir -p /opt/clearing/bin; \ + mkdir -p /opt/clearing/bin/logs; \ + cd /opt/clearing/bin; +