diff --git a/z-distr/pom.xml b/z-distr/pom.xml index 71e9d399d..340c30020 100644 --- a/z-distr/pom.xml +++ b/z-distr/pom.xml @@ -16,6 +16,8 @@ 17 ${project.basedir}/target/clearing ${project.basedir}/target/clearing/modules + ${project.basedir}/target/clearing/settings + ${project.basedir}/target/clearing/bin @@ -101,15 +103,15 @@ ${folder_root_clearing_backend-api}/target/backend-api.jar - ${folder.clearing.distr.modules}/backend-api/backend-api.jar + ${folder.clearing.distr.bin}/backend-api.jar ${folder_root_clearing_backend-api}/src/main/resources/application.properties - ${folder.clearing.distr.modules}/backend-api/application.properties + ${folder.clearing.distr.settings}/backend-api/application.properties ${folder_root_clearing_backend-api}/src/main/resources/keycloak.json - ${folder.clearing.distr.modules}/backend-api/keycloak.json + ${folder.clearing.distr.settings}/backend-api/keycloak.json @@ -124,11 +126,11 @@ ${folder_root_clearing_securities-service}/target/securities-service.jar - ${folder.clearing.distr.modules}/securities-service/securities-service.jar + ${folder.clearing.distr.bin}/securities-service.jar ${folder_root_clearing_securities-service}/src/main/resources/application.properties - ${folder.clearing.distr.modules}/securities-service/application.properties + ${folder.clearing.distr.settings}/securities-service/application.properties @@ -143,11 +145,11 @@ ${folder_root_clearing_imdg}/target/imdg.jar - ${folder.clearing.distr.modules}/imdg/imdg.jar + ${folder.clearing.distr.bin}/imdg.jar ${folder_root_clearing_imdg}/src/main/resources/application.properties - ${folder.clearing.distr.modules}/imdg/application.properties + ${folder.clearing.distr.settings}/imdg/application.properties @@ -163,11 +165,11 @@ ${folder_root_dbf-exporter}/target/dbf-exporter.jar - ${folder.clearing.distr.modules}/dbf-exporter/dbf-exporter.jar + ${folder.clearing.distr.bin}/dbf-exporter.jar ${folder_root_dbf-exporter}/src/main/resources/application.properties - ${folder.clearing.distr.modules}/dbf-exporter/application.properties + ${folder.clearing.distr.settings}/dbf-exporter/application.properties @@ -182,11 +184,11 @@ ${folder_root_dbf-importer}/target/dbf-importer.jar - ${folder.clearing.distr.modules}/dbf-importer/dbf-importer.jar + ${folder.clearing.distr.bin}/dbf-importer.jar ${folder_root_dbf-importer}/src/main/resources/application.properties - ${folder.clearing.distr.modules}/dbf-importer/application.properties + ${folder.clearing.distr.settings}/dbf-importer/application.properties @@ -202,11 +204,11 @@ ${folder_root_lim-exporter}/target/lim-exporter.jar - ${folder.clearing.distr.modules}/lim-exporter/lim-exporter.jar + ${folder.clearing.distr.bin}/lim-exporter.jar ${folder_root_lim-exporter}/src/main/resources/application.properties - ${folder.clearing.distr.modules}/lim-exporter/application.properties + ${folder.clearing.distr.settings}/lim-exporter/application.properties @@ -221,11 +223,11 @@ ${folder_root_swt-exporter}/target/swt-exporter.jar - ${folder.clearing.distr.modules}/swt-exporter/swt-exporter.jar + ${folder.clearing.distr.bin}/swt-exporter.jar ${folder_root_swt-exporter}/src/main/resources/application.properties - ${folder.clearing.distr.modules}/swt-exporter/application.properties + ${folder.clearing.distr.settings}/swt-exporter/application.properties @@ -240,11 +242,11 @@ ${folder_root_swt-importer}/target/swt-importer.jar - ${folder.clearing.distr.modules}/swt-importer/swt-importer.jar + ${folder.clearing.distr.bin}/swt-importer.jar ${folder_root_swt-importer}/src/main/resources/application.properties - ${folder.clearing.distr.modules}/swt-importer/application.properties + ${folder.clearing.distr.settings}/swt-importer/application.properties @@ -259,11 +261,11 @@ ${folder_root_trade-importer}/target/trade-importer.jar - ${folder.clearing.distr.modules}/trade-importer/trade-importer.jar + ${folder.clearing.distr.bin}/trade-importer.jar ${folder_root_trade-importer}/src/main/resources/application.properties - ${folder.clearing.distr.modules}/trade-importer/application.properties + ${folder.clearing.distr.settings}/trade-importer/application.properties @@ -278,11 +280,11 @@ ${folder_root_account-service}/target/account-service.jar - ${folder.clearing.distr.modules}/account-service/account-service.jar + ${folder.clearing.distr.bin}/account-service.jar ${folder_root_account-service}/src/main/resources/application.properties - ${folder.clearing.distr.modules}/account-service/application.properties + ${folder.clearing.distr.settings}/account-service/application.properties @@ -297,11 +299,11 @@ ${folder_root_company-service}/target/company-service.jar - ${folder.clearing.distr.modules}/company-service/company-service.jar + ${folder.clearing.distr.bin}/company-service.jar ${folder_root_company-service}/src/main/resources/application.properties - ${folder.clearing.distr.modules}/company-service/application.properties + ${folder.clearing.distr.settings}/company-service/application.properties @@ -316,11 +318,11 @@ ${folder_root_clearing-service}/target/clearing-service.jar - ${folder.clearing.distr.modules}/clearing-service/clearing-service.jar + ${folder.clearing.distr.bin}/clearing-service.jar ${folder_root_clearing-service}/src/main/resources/application.properties - ${folder.clearing.distr.modules}/clearing-service/application.properties + ${folder.clearing.distr.settings}/clearing-service/application.properties @@ -335,11 +337,11 @@ ${folder_root_scheduler-service}/target/scheduler-service.jar - ${folder.clearing.distr.modules}/scheduler-service/scheduler-service.jar + ${folder.clearing.distr.bin}/scheduler-service.jar ${folder_root_scheduler-service}/src/main/resources/application.properties - ${folder.clearing.distr.modules}/scheduler-service/application.properties + ${folder.clearing.distr.settings}/scheduler-service/application.properties @@ -354,11 +356,11 @@ ${folder_root_reports-service}/target/reports-service.jar - ${folder.clearing.distr.modules}/reports-service/reports-service.jar + ${folder.clearing.distr.bin}/reports-service.jar ${folder_root_reports-service}/src/main/resources/application.properties - ${folder.clearing.distr.modules}/reports-service/application.properties + ${folder.clearing.distr.settings}/reports-service/application.properties @@ -373,11 +375,11 @@ ${folder_root_registry-service}/target/registry-service.jar - ${folder.clearing.distr.modules}/registry-service/registry-service.jar + ${folder.clearing.distr.bin}/registry-service.jar ${folder_root_registry-service}/src/main/resources/application.properties - ${folder.clearing.distr.modules}/registry-service/application.properties + ${folder.clearing.distr.settings}/registry-service/application.properties @@ -392,11 +394,11 @@ ${folder_root_utility-service}/target/utility-service.jar - ${folder.clearing.distr.modules}/utility-service/utility-service.jar + ${folder.clearing.distr.bin}/utility-service.jar ${folder_root_utility-service}/src/main/resources/application.properties - ${folder.clearing.distr.modules}/utility-service/application.properties + ${folder.clearing.distr.settings}/utility-service/application.properties @@ -413,7 +415,7 @@ ${folder_root_gateway-api}/target/gateway-api.jar - ${folder.clearing.distr.modules}/gateway-api/gateway-api.jar + ${folder.clearing.distr.bin}/gateway-api.jar @@ -421,7 +423,7 @@ ${folder_root_gateway-api}/src/main/resources/application.properties - ${folder.clearing.distr.modules}/gateway-api/application.properties + ${folder.clearing.distr.settings}/gateway-api/application.properties diff --git a/z-distr/src/main/resources/distr/modules/account-service/Dockerfile b/z-distr/src/main/resources/distr/modules/account-service/Dockerfile deleted file mode 100644 index c9d49599c..000000000 --- a/z-distr/src/main/resources/distr/modules/account-service/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM debian:stable-20220125-jdk17 - -ADD account-service.jar /opt/clearing/bin/account-service.jar -ADD application.properties /opt/clearing/bin/application.properties -USER root -ENTRYPOINT java -jar /opt/clearing/bin/account-service.jar --spring.config.location=/opt/clearing/bin/ \ No newline at end of file diff --git a/z-distr/src/main/resources/distr/modules/backend-api/Dockerfile b/z-distr/src/main/resources/distr/modules/backend-api/Dockerfile deleted file mode 100644 index 79244b128..000000000 --- a/z-distr/src/main/resources/distr/modules/backend-api/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM debian:stable-20220125-jdk17 - -ADD backend-api.jar /opt/clearing/bin/backend-api.jar -ADD application.properties /opt/clearing/bin/application.properties -ADD keycloak.json /opt/clearing/bin/keycloak.json -USER root -ENTRYPOINT java -jar /opt/clearing/bin/backend-api.jar --spring.config.location=/opt/clearing/bin/ \ No newline at end of file diff --git a/z-distr/src/main/resources/distr/modules/balance-service/Dockerfile b/z-distr/src/main/resources/distr/modules/balance-service/Dockerfile deleted file mode 100644 index d06190e49..000000000 --- a/z-distr/src/main/resources/distr/modules/balance-service/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM debian:stable-20220125-jdk17 - -ADD balance-service.jar /opt/clearing/bin/balance-service.jar -ADD application.properties /opt/clearing/bin/application.properties -USER root -ENTRYPOINT java -jar /opt/clearing/bin/balance-service.jar --spring.config.location=/opt/clearing/bin/ \ No newline at end of file diff --git a/z-distr/src/main/resources/distr/modules/company-service/Dockerfile b/z-distr/src/main/resources/distr/modules/company-service/Dockerfile deleted file mode 100644 index 51b04e98c..000000000 --- a/z-distr/src/main/resources/distr/modules/company-service/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM debian:stable-20220125-jdk17 - -ADD company-service.jar /opt/clearing/bin/company-service.jar -ADD application.properties /opt/clearing/bin/application.properties -USER root -ENTRYPOINT java -jar /opt/clearing/bin/company-service.jar --spring.config.location=/opt/clearing/bin/ \ No newline at end of file diff --git a/z-distr/src/main/resources/distr/modules/dbf-exporter/Dockerfile b/z-distr/src/main/resources/distr/modules/dbf-exporter/Dockerfile deleted file mode 100644 index 807d556df..000000000 --- a/z-distr/src/main/resources/distr/modules/dbf-exporter/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM debian:stable-20220125-jdk17 - -ADD dbf-exporter.jar /opt/clearing/bin/dbf-exporter.jar -ADD application.properties /opt/clearing/bin/application.properties -USER root -ENTRYPOINT java -jar /opt/clearing/bin/dbf-exporter.jar --spring.config.location=/opt/clearing/bin/ diff --git a/z-distr/src/main/resources/distr/modules/dbf-importer/Dockerfile b/z-distr/src/main/resources/distr/modules/dbf-importer/Dockerfile deleted file mode 100644 index 943ab4d69..000000000 --- a/z-distr/src/main/resources/distr/modules/dbf-importer/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM debian:stable-20220125-jdk17 - -ADD dbf-importer.jar /opt/clearing/bin/dbf-importer.jar -ADD application.properties /opt/clearing/bin/application.properties -USER root -ENTRYPOINT java -jar /opt/clearing/bin/dbf-importer.jar --spring.config.location=/opt/clearing/bin/ diff --git a/z-distr/src/main/resources/distr/modules/gateway-api/Dockerfile b/z-distr/src/main/resources/distr/modules/gateway-api/Dockerfile deleted file mode 100644 index 643717be3..000000000 --- a/z-distr/src/main/resources/distr/modules/gateway-api/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM debian:stable-20220125-jdk17 - -ADD gateway-api.jar /opt/clearing/bin/gateway-api.jar -ADD application.properties /opt/clearing/bin/application.properties -USER root -ENTRYPOINT java -jar /opt/clearing/bin/gateway-api.jar --spring.config.location=/opt/clearing/bin/ \ No newline at end of file diff --git a/z-distr/src/main/resources/distr/modules/os/Dockerfile b/z-distr/src/main/resources/distr/modules/os/Dockerfile deleted file mode 100644 index b4de6ac23..000000000 --- a/z-distr/src/main/resources/distr/modules/os/Dockerfile +++ /dev/null @@ -1,19 +0,0 @@ -FROM debian:stable-20220125 - -COPY bellsoft-jre-17.0.2.tar.gz /tmp/ - -ENV JAVA_VERSION jdk17.0.2+9 - -RUN mkdir -p /opt/java/bellsoft-jre; \ - cd /opt/java/bellsoft-jre; \ - tar -xf /tmp/bellsoft-jre-17.0.2.tar.gz --strip-components=1; \ - rm -rf /tmp/bellsoft-jre-17.0.2.tar.gz; - -ENV JAVA_HOME=/opt/java/bellsoft-jre/ \ - PATH="/opt/java/bellsoft-jre/bin:$PATH" - -RUN mkdir -p /opt/clearing/bin; \ - mkdir -p /opt/clearing/bin/logs; - -WORKDIR /opt/clearing/bin - diff --git a/z-distr/src/main/resources/distr/modules/os/bellsoft-jre-17.0.2.tar.gz b/z-distr/src/main/resources/distr/modules/os/bellsoft-jre-17.0.2.tar.gz deleted file mode 100644 index 5f8b3333f..000000000 Binary files a/z-distr/src/main/resources/distr/modules/os/bellsoft-jre-17.0.2.tar.gz and /dev/null differ diff --git a/z-distr/src/main/resources/distr/modules/reports-service/Dockerfile b/z-distr/src/main/resources/distr/modules/reports-service/Dockerfile deleted file mode 100644 index b533fe630..000000000 --- a/z-distr/src/main/resources/distr/modules/reports-service/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM debian:stable-20220125-jdk17 - -ADD reports-service.jar /opt/clearing/bin/reports-service.jar -ADD application.properties /opt/clearing/bin/application.properties -USER root -ENTRYPOINT java -jar /opt/clearing/bin/reports-service.jar --spring.config.location=/opt/clearing/bin/ \ No newline at end of file diff --git a/z-distr/src/main/resources/distr/modules/securities-service/Dockerfile b/z-distr/src/main/resources/distr/modules/securities-service/Dockerfile deleted file mode 100644 index ad4b79646..000000000 --- a/z-distr/src/main/resources/distr/modules/securities-service/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM debian:stable-20220125-jdk17 - -ADD securities-service.jar /opt/clearing/bin/securities-service.jar -ADD application.properties /opt/clearing/bin/application.properties -USER root -ENTRYPOINT java -jar /opt/clearing/bin/securities-service.jar --spring.config.location=/opt/clearing/bin/ \ No newline at end of file diff --git a/z-distr/src/main/resources/distr/modules/utility-service/Dockerfile b/z-distr/src/main/resources/distr/modules/utility-service/Dockerfile deleted file mode 100644 index e2eb6d7f0..000000000 --- a/z-distr/src/main/resources/distr/modules/utility-service/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM debian:stable-20220125-jdk17 - -ADD utility-service.jar /opt/clearing/bin/utility-service.jar -ADD application.properties /opt/clearing/bin/application.properties -USER root -ENTRYPOINT java -jar /opt/clearing/bin/utility-service.jar --spring.config.location=/opt/clearing/bin/ \ No newline at end of file