From 77782ee5f590fd176a69ad1577e9bb1d68b06098 Mon Sep 17 00:00:00 2001 From: etreschenkov Date: Tue, 27 Sep 2022 12:10:33 +0300 Subject: [PATCH] fix distibs --- z-distr/src/main/resources/distr/bin/account-service.sh | 4 ++-- z-distr/src/main/resources/distr/bin/backend-api.sh | 4 ++-- z-distr/src/main/resources/distr/bin/balance-service.sh | 4 ++-- z-distr/src/main/resources/distr/bin/company-service.sh | 4 ++-- z-distr/src/main/resources/distr/bin/dbf-exporter.sh | 4 ++-- z-distr/src/main/resources/distr/bin/dbf-importer.sh | 4 ++-- z-distr/src/main/resources/distr/bin/deploy.sh | 2 +- z-distr/src/main/resources/distr/bin/os.sh | 2 +- z-distr/src/main/resources/distr/bin/report-service.sh | 4 ++-- z-distr/src/main/resources/distr/bin/securities-service.sh | 4 ++-- z-distr/src/main/resources/distr/bin/utility-service.sh | 4 ++-- .../main/resources/distr/modules/account-service/Dockerfile | 4 ++-- .../main/resources/distr/modules/balance-service/Dockerfile | 4 ++-- .../main/resources/distr/modules/company-service/Dockerfile | 4 ++-- .../main/resources/distr/modules/reports-service/Dockerfile | 4 ++-- .../main/resources/distr/modules/utility-service/Dockerfile | 4 ++-- 16 files changed, 30 insertions(+), 30 deletions(-) diff --git a/z-distr/src/main/resources/distr/bin/account-service.sh b/z-distr/src/main/resources/distr/bin/account-service.sh index ee667c56e..7ec2c2bd8 100644 --- a/z-distr/src/main/resources/distr/bin/account-service.sh +++ b/z-distr/src/main/resources/distr/bin/account-service.sh @@ -1,3 +1,3 @@ -#!/bin/sh +#!/bin/bash docker build -t account-service:1.0.0 ../modules/account-service/ -docker run -p 8050:8080 -v /opt/clearing/logs:/opt/clearing/bin/logs account-service:1.0.0 & \ No newline at end of file +docker run -d -p 8055:8080 -v /opt/clearing/logs:/opt/clearing/bin/logs account-service:1.0.0 \ No newline at end of file diff --git a/z-distr/src/main/resources/distr/bin/backend-api.sh b/z-distr/src/main/resources/distr/bin/backend-api.sh index b6ed297ea..292b7f616 100644 --- a/z-distr/src/main/resources/distr/bin/backend-api.sh +++ b/z-distr/src/main/resources/distr/bin/backend-api.sh @@ -1,3 +1,3 @@ -#!/bin/sh +#!/bin/bash docker build -t backend-api:1.0.0 ../modules/backend-api/ -docker run -d -p 8090:8080 -v /opt/clearing/logs:/opt/clearing/bin/logs backend-api:1.0.0 \ No newline at end of file +docker run -d -p 8095:8080 -v /opt/clearing/logs:/opt/clearing/bin/logs backend-api:1.0.0 \ No newline at end of file diff --git a/z-distr/src/main/resources/distr/bin/balance-service.sh b/z-distr/src/main/resources/distr/bin/balance-service.sh index 3896fbc84..543801d68 100644 --- a/z-distr/src/main/resources/distr/bin/balance-service.sh +++ b/z-distr/src/main/resources/distr/bin/balance-service.sh @@ -1,3 +1,3 @@ -#!/bin/sh +#!/bin/bash docker build -t balance-service:1.0.0 ../modules/balance-service/ -docker run -p 8040:8080 -v /opt/clearing/logs:/opt/clearing/bin/logs balance-service:1.0.0 & \ No newline at end of file +docker run -d -p 8040:8080 -v /opt/clearing/logs:/opt/clearing/bin/logs balance-service:1.0.0 \ No newline at end of file diff --git a/z-distr/src/main/resources/distr/bin/company-service.sh b/z-distr/src/main/resources/distr/bin/company-service.sh index 1a165f555..4005003fc 100644 --- a/z-distr/src/main/resources/distr/bin/company-service.sh +++ b/z-distr/src/main/resources/distr/bin/company-service.sh @@ -1,3 +1,3 @@ -#!/bin/sh +#!/bin/bash docker build -t company-service:1.0.0 ../modules/company-service/ -docker run -p 8030:8080 -v /opt/clearing/logs:/opt/clearing/bin/logs company-service:1.0.0 & \ No newline at end of file +docker run -d -p 8030:8080 -v /opt/clearing/logs:/opt/clearing/bin/logs company-service:1.0.0 \ No newline at end of file diff --git a/z-distr/src/main/resources/distr/bin/dbf-exporter.sh b/z-distr/src/main/resources/distr/bin/dbf-exporter.sh index a8c5b380c..c00a1c3c0 100644 --- a/z-distr/src/main/resources/distr/bin/dbf-exporter.sh +++ b/z-distr/src/main/resources/distr/bin/dbf-exporter.sh @@ -1,3 +1,3 @@ -#!/bin/sh +#!/bin/bash docker build -t dbf-exporter:1.0.0 ../modules/dbf-exporter/ -docker run -p 8070:8080 -v /opt/clearing/logs:/opt/clearing/bin/logs dbf-exporter:1.0.0 & \ No newline at end of file +docker run -d -p 8065:8080 -v /opt/clearing/logs:/opt/clearing/bin/logs dbf-exporter:1.0.0 \ No newline at end of file diff --git a/z-distr/src/main/resources/distr/bin/dbf-importer.sh b/z-distr/src/main/resources/distr/bin/dbf-importer.sh index 909b00cdd..f7ca2bf5b 100644 --- a/z-distr/src/main/resources/distr/bin/dbf-importer.sh +++ b/z-distr/src/main/resources/distr/bin/dbf-importer.sh @@ -1,3 +1,3 @@ -#!/bin/sh +#!/bin/bash docker build -t dbf-importer:1.0.0 ../modules/dbf-importer/ -docker run -p 8060:8080 -v /opt/clearing/logs:/opt/clearing/bin/logs dbf-importer:1.0.0 & \ No newline at end of file +docker run -d -p 8060:8080 -v /opt/clearing/logs:/opt/clearing/bin/logs dbf-importer:1.0.0 \ No newline at end of file diff --git a/z-distr/src/main/resources/distr/bin/deploy.sh b/z-distr/src/main/resources/distr/bin/deploy.sh index 2ed33c187..260812a4d 100644 --- a/z-distr/src/main/resources/distr/bin/deploy.sh +++ b/z-distr/src/main/resources/distr/bin/deploy.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash ./os.sh sleep 60 ./backend-api.sh & diff --git a/z-distr/src/main/resources/distr/bin/os.sh b/z-distr/src/main/resources/distr/bin/os.sh index 72c4b51ad..417525c9a 100644 --- a/z-distr/src/main/resources/distr/bin/os.sh +++ b/z-distr/src/main/resources/distr/bin/os.sh @@ -1,2 +1,2 @@ -#!/bin/sh +#!/bin/bash docker build -t debian:stable-20220125-jdk17 ../modules/os/ \ No newline at end of file diff --git a/z-distr/src/main/resources/distr/bin/report-service.sh b/z-distr/src/main/resources/distr/bin/report-service.sh index bf7afc234..0d587301d 100644 --- a/z-distr/src/main/resources/distr/bin/report-service.sh +++ b/z-distr/src/main/resources/distr/bin/report-service.sh @@ -1,3 +1,3 @@ -#!/bin/sh +#!/bin/bash docker build -t reports-service:1.0.0 ../modules/reports-service/ -docker run -p 8020:8080 -v /opt/clearing/logs:/opt/clearing/bin/logs reports-service:1.0.0 & \ No newline at end of file +docker run -d -p 8020:8080 -v /opt/clearing/logs:/opt/clearing/bin/logs reports-service:1.0.0 \ No newline at end of file diff --git a/z-distr/src/main/resources/distr/bin/securities-service.sh b/z-distr/src/main/resources/distr/bin/securities-service.sh index f12309928..48629c6f1 100644 --- a/z-distr/src/main/resources/distr/bin/securities-service.sh +++ b/z-distr/src/main/resources/distr/bin/securities-service.sh @@ -1,3 +1,3 @@ -#!/bin/sh +#!/bin/bash docker build -t securities-service:1.0.0 ../modules/securities-service/ -docker run -v /opt/clearing/logs:/opt/clearing/bin/logs securities-service:1.0.0 & \ No newline at end of file +docker run -d -p 8010:8080 -v /opt/clearing/logs:/opt/clearing/bin/logs securities-service:1.0.0 \ No newline at end of file diff --git a/z-distr/src/main/resources/distr/bin/utility-service.sh b/z-distr/src/main/resources/distr/bin/utility-service.sh index 09beaefc2..cc1434fbc 100644 --- a/z-distr/src/main/resources/distr/bin/utility-service.sh +++ b/z-distr/src/main/resources/distr/bin/utility-service.sh @@ -1,3 +1,3 @@ -#!/bin/sh +#!/bin/bash docker build -t utility-service:1.0.0 ../modules/utility-service/ -docker run -p 8010:8080 -v /opt/clearing/logs:/opt/clearing/bin/logs utility-service:1.0.0 & \ No newline at end of file +docker run -d -p 8015:8080 -v /opt/clearing/logs:/opt/clearing/bin/logs utility-service:1.0.0 \ No newline at end of file diff --git a/z-distr/src/main/resources/distr/modules/account-service/Dockerfile b/z-distr/src/main/resources/distr/modules/account-service/Dockerfile index 7d00d41ce..c9d49599c 100644 --- a/z-distr/src/main/resources/distr/modules/account-service/Dockerfile +++ b/z-distr/src/main/resources/distr/modules/account-service/Dockerfile @@ -1,6 +1,6 @@ FROM debian:stable-20220125-jdk17 ADD account-service.jar /opt/clearing/bin/account-service.jar -ADD application.properties /opt/clearing/bin/account-service.properties +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/ --spring.config.name=account-service.properties \ No newline at end of file +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/balance-service/Dockerfile b/z-distr/src/main/resources/distr/modules/balance-service/Dockerfile index ba09f0936..d06190e49 100644 --- a/z-distr/src/main/resources/distr/modules/balance-service/Dockerfile +++ b/z-distr/src/main/resources/distr/modules/balance-service/Dockerfile @@ -1,6 +1,6 @@ FROM debian:stable-20220125-jdk17 ADD balance-service.jar /opt/clearing/bin/balance-service.jar -ADD application.properties /opt/clearing/bin/balance-service.properties +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/ --spring.config.name=balance-service.properties \ No newline at end of file +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 index bcc0c5d4f..51b04e98c 100644 --- a/z-distr/src/main/resources/distr/modules/company-service/Dockerfile +++ b/z-distr/src/main/resources/distr/modules/company-service/Dockerfile @@ -1,6 +1,6 @@ FROM debian:stable-20220125-jdk17 ADD company-service.jar /opt/clearing/bin/company-service.jar -ADD application.properties /opt/clearing/bin/company-service.properties +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/ --spring.config.name=company-service.properties \ No newline at end of file +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/reports-service/Dockerfile b/z-distr/src/main/resources/distr/modules/reports-service/Dockerfile index fd11df416..b533fe630 100644 --- a/z-distr/src/main/resources/distr/modules/reports-service/Dockerfile +++ b/z-distr/src/main/resources/distr/modules/reports-service/Dockerfile @@ -1,6 +1,6 @@ FROM debian:stable-20220125-jdk17 ADD reports-service.jar /opt/clearing/bin/reports-service.jar -ADD application.properties /opt/clearing/bin/reports-service.properties +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/ --spring.config.name=reports-service.properties \ No newline at end of file +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/utility-service/Dockerfile b/z-distr/src/main/resources/distr/modules/utility-service/Dockerfile index b2d10def1..e2eb6d7f0 100644 --- a/z-distr/src/main/resources/distr/modules/utility-service/Dockerfile +++ b/z-distr/src/main/resources/distr/modules/utility-service/Dockerfile @@ -1,6 +1,6 @@ FROM debian:stable-20220125-jdk17 ADD utility-service.jar /opt/clearing/bin/utility-service.jar -ADD application.properties /opt/clearing/bin/utility-service.properties +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/ --spring.config.name=utility-service.properties \ No newline at end of file +ENTRYPOINT java -jar /opt/clearing/bin/utility-service.jar --spring.config.location=/opt/clearing/bin/ \ No newline at end of file