From 532822c60fe32b878a297fcefae9c64a17cb9d1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B0=D0=BB=D1=82=D0=BE=D0=B1=D0=B8=D0=BD=20=D0=95?= =?UTF-8?q?=D0=B2=D0=B3=D0=B5=D0=BD=D0=B8=D0=B9?= Date: Wed, 18 Dec 2024 21:12:39 +0300 Subject: [PATCH] updated --- config/ervu-decision-document-service.env | 19 +++++++ config/ervu-journal-service.env | 19 +++++++ config/ervu-object-diff-calc.env | 13 +++++ config/ervu-object-history-service.env | 21 ++++++++ config/ervu-subpoena-registry.env | 19 +++++++ docker-compose.yaml | 64 ++++++++++++++++++++++- 6 files changed, 153 insertions(+), 2 deletions(-) create mode 100644 config/ervu-decision-document-service.env create mode 100644 config/ervu-journal-service.env create mode 100644 config/ervu-object-diff-calc.env create mode 100644 config/ervu-object-history-service.env create mode 100644 config/ervu-subpoena-registry.env diff --git a/config/ervu-decision-document-service.env b/config/ervu-decision-document-service.env new file mode 100644 index 0000000..88491f1 --- /dev/null +++ b/config/ervu-decision-document-service.env @@ -0,0 +1,19 @@ +PG_HOST=10.10.31.119 +PG_PORT=5432 +PG_DATABASE=ervu_decision_document_local +PG_USER=ervu_decision_document +PG_PASSWORD=ervu_decision_document + +KAFKA_HOSTS=local-kafka:9094 +KAFKA_AUTH_SASL_MODULE=org.apache.kafka.common.security.plain.PlainLoginModule +KAFKA_AUTH_SEC_PROTO=PLAINTEXT +KAFKA_AUTH_SASL_MECH=PLAIN +KAFKA_USER=user2 +KAFKA_PASS=Blfi9d2OFG + +EXTERNAL_KAFKA_HOSTS=local-kafka:9094 +EXTERNAL_KAFKA_AUTH_SASL_MODULE=org.apache.kafka.common.security.plain.PlainLoginModule +EXTERNAL_KAFKA_AUTH_SEC_PROTO=PLAINTEXT +EXTERNAL_KAFKA_AUTH_SASL_MECH=PLAIN +EXTERNAL_KAFKA_USER=user2 +EXTERNAL_KAFKA_PASS=Blfi9d2OFG \ No newline at end of file diff --git a/config/ervu-journal-service.env b/config/ervu-journal-service.env new file mode 100644 index 0000000..ed1df02 --- /dev/null +++ b/config/ervu-journal-service.env @@ -0,0 +1,19 @@ +PG_HOST=10.10.31.119 +PG_PORT=5432 +PG_DATABASE=ervu_journal +PG_USER=ervu_journal +PG_PASSWORD=ervu_journal + +KAFKA_HOSTS=local-kafka:9094 +KAFKA_AUTH_SASL_MODULE=org.apache.kafka.common.security.plain.PlainLoginModule +KAFKA_AUTH_SEC_PROTO=PLAINTEXT +KAFKA_AUTH_SASL_MECH=PLAIN +KAFKA_USER=user2 +KAFKA_PASS=Blfi9d2OFG + +EXTERNAL_KAFKA_HOSTS=local-kafka:9094 +EXTERNAL_KAFKA_AUTH_SASL_MODULE=org.apache.kafka.common.security.plain.PlainLoginModule +EXTERNAL_KAFKA_AUTH_SEC_PROTO=PLAINTEXT +EXTERNAL_KAFKA_AUTH_SASL_MECH=PLAIN +EXTERNAL_KAFKA_USER=user2 +EXTERNAL_KAFKA_PASS=Blfi9d2OFG \ No newline at end of file diff --git a/config/ervu-object-diff-calc.env b/config/ervu-object-diff-calc.env new file mode 100644 index 0000000..41d0a68 --- /dev/null +++ b/config/ervu-object-diff-calc.env @@ -0,0 +1,13 @@ +KAFKA_HOSTS=local-kafka:9094 +KAFKA_AUTH_SASL_MODULE=org.apache.kafka.common.security.plain.PlainLoginModule +KAFKA_AUTH_SEC_PROTO=PLAINTEXT +KAFKA_AUTH_SASL_MECH=PLAIN +KAFKA_USER=user2 +KAFKA_PASS=Blfi9d2OFG + +EXTERNAL_KAFKA_HOSTS=local-kafka:9094 +EXTERNAL_KAFKA_AUTH_SASL_MODULE=org.apache.kafka.common.security.plain.PlainLoginModule +EXTERNAL_KAFKA_AUTH_SEC_PROTO=PLAINTEXT +EXTERNAL_KAFKA_AUTH_SASL_MECH=PLAIN +EXTERNAL_KAFKA_USER=user2 +EXTERNAL_KAFKA_PASS=Blfi9d2OFG \ No newline at end of file diff --git a/config/ervu-object-history-service.env b/config/ervu-object-history-service.env new file mode 100644 index 0000000..9dbfaa2 --- /dev/null +++ b/config/ervu-object-history-service.env @@ -0,0 +1,21 @@ +PG_HOST=10.10.31.119 +PG_PORT=5432 +PG_DATABASE=ervu_journal +PG_USER=ervu_journal +PG_PASSWORD=ervu_journal + +KAFKA_HOSTS=local-kafka:9094 +KAFKA_AUTH_SASL_MODULE=org.apache.kafka.common.security.plain.PlainLoginModule +KAFKA_AUTH_SEC_PROTO=PLAINTEXT +KAFKA_AUTH_SASL_MECH=PLAIN +KAFKA_USER=user2 +KAFKA_PASS=Blfi9d2OFG + +EXTERNAL_KAFKA_HOSTS=local-kafka:9094 +EXTERNAL_KAFKA_AUTH_SASL_MODULE=org.apache.kafka.common.security.plain.PlainLoginModule +EXTERNAL_KAFKA_AUTH_SEC_PROTO=PLAINTEXT +EXTERNAL_KAFKA_AUTH_SASL_MECH=PLAIN +EXTERNAL_KAFKA_USER=user2 +EXTERNAL_KAFKA_PASS=Blfi9d2OFG + +OBJECT_DIFF_CALC_URL=http://ervu-object-diff-calc:8080/ \ No newline at end of file diff --git a/config/ervu-subpoena-registry.env b/config/ervu-subpoena-registry.env new file mode 100644 index 0000000..96125f0 --- /dev/null +++ b/config/ervu-subpoena-registry.env @@ -0,0 +1,19 @@ +PG_HOST=10.10.31.119 +PG_PORT=5432 +PG_DATABASE=ervu_subpoena_registry_local +PG_USER=ervu_subpoena_registry +PG_PASSWORD=ervu_subpoena_registry + +KAFKA_HOSTS=local-kafka:9094 +KAFKA_AUTH_SASL_MODULE=org.apache.kafka.common.security.plain.PlainLoginModule +KAFKA_AUTH_SEC_PROTO=PLAINTEXT +KAFKA_AUTH_SASL_MECH=PLAIN +KAFKA_USER=user2 +KAFKA_PASS=Blfi9d2OFG + +EXTERNAL_KAFKA_HOSTS=local-kafka:9094 +EXTERNAL_KAFKA_AUTH_SASL_MODULE=org.apache.kafka.common.security.plain.PlainLoginModule +EXTERNAL_KAFKA_AUTH_SEC_PROTO=PLAINTEXT +EXTERNAL_KAFKA_AUTH_SASL_MECH=PLAIN +EXTERNAL_KAFKA_USER=user2 +EXTERNAL_KAFKA_PASS=Blfi9d2OFG \ No newline at end of file diff --git a/docker-compose.yaml b/docker-compose.yaml index e8d7b12..ea3131c 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -73,18 +73,78 @@ services: env_file: - config/printer.env + ervu-object-diff-calc: + container_name: object-diff-calc + image: registry-dev.pgs.rtlabs.ru/ervu/ervu-object-diff-calc:0.0.1-sha4142b581 + env_file: + - config/ervu-subpoena-registry.env + depends_on: + local-kafka: + condition: service_healthy + ports: + - 8080 + ervu-extract-from-registry-provider: container_name: extract-from-registry-provider image: registry-dev.pgs.rtlabs.ru/ervu/ervu-extract-from-registry-provider:0.0.1-shaa6a2261f env_file: - config/ervu-extract-from-registry-provider.env depends_on: - crypto-gateway: - condition: service_started local-kafka: condition: service_healthy + ervu-person-registry: + condition: service_started + ervu-subpoena-registry: + condition: service_started + ervu-decision-document-service: + condition: service_started + ervu-object-history-service: + condition: service_started + crypto-gateway: + condition: service_started printer: condition: service_started + ervu-object-diff-calc: + condition: service_started + + ervu-subpoena-registry: + container_name: subpoena-registry + image: registry-dev.pgs.rtlabs.ru/ervu/ervu-subpoena-registry:0.0.1-shacb5d0dbb + env_file: + - config/ervu-subpoena-registry.env + depends_on: + local-kafka: + condition: service_healthy + + ervu-decision-document-service: + container_name: decision-document-service + image: registry-dev.pgs.rtlabs.ru/ervu/ervu-decision-document-service:0.0.1-sha238f27f3 + env_file: + - config/ervu-decision-document-service.env + depends_on: + local-kafka: + condition: service_healthy + + # ervu-object-history-service uses database, created in this service + ervu-journal-service: + container_name: journal-service + image: registry-dev.pgs.rtlabs.ru/ervu/ervu-journal-service:0.0.1-sha74f87e3c + env_file: + - config/ervu-journal-service.env + depends_on: + local-kafka: + condition: service_healthy + + ervu-object-history-service: + container_name: object-history-service + image: registry-dev.pgs.rtlabs.ru/ervu/ervu-object-history-service:0.0.1-shae5cd29cc + env_file: + - config/ervu-object-history-service.env + depends_on: + local-kafka: + condition: service_healthy + ervu-journal-service: + condition: service_started lkrp-fl: container_name: lkrp-fl