From 72ec94cb9adc3d0f6d7692d38ca902b308eea71b 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: Tue, 14 Jan 2025 13:48:11 +0300 Subject: [PATCH] to unix format --- Dockerfile | 40 +++--- docker-compose.yaml | 332 ++++++++++++++++++++++---------------------- 2 files changed, 186 insertions(+), 186 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3d8aae2..b0023de 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,20 +1,20 @@ -#Dockerfile for TeamCity build "run in docker" - -FROM repo.asd.center.cg:8082/alt/alt-tomcat:c10f1-9.0.59-20240917 - -USER root - -COPY config/tomcat / - -RUN cat /etc/tomcat/webbpm.properties >> /etc/tomcat/catalina.properties \ - && chown root:tomcat /var/lib/tomcat/webapps \ - && chmod g+rw /var/lib/tomcat/webapps - -COPY frontend/target/frontend*.war /var/lib/tomcat/webapps/ROOT.war -COPY backend/target/*.war /var/lib/tomcat/webapps/ - -USER tomcat - -EXPOSE 8080 - -ENTRYPOINT ["/entrypoint.sh"] +#Dockerfile for TeamCity build "run in docker" + +FROM repo.asd.center.cg:8082/alt/alt-tomcat:c10f1-9.0.59-20240917 + +USER root + +COPY config/tomcat / + +RUN cat /etc/tomcat/webbpm.properties >> /etc/tomcat/catalina.properties \ + && chown root:tomcat /var/lib/tomcat/webapps \ + && chmod g+rw /var/lib/tomcat/webapps + +COPY frontend/target/frontend*.war /var/lib/tomcat/webapps/ROOT.war +COPY backend/target/*.war /var/lib/tomcat/webapps/ + +USER tomcat + +EXPOSE 8080 + +ENTRYPOINT ["/entrypoint.sh"] diff --git a/docker-compose.yaml b/docker-compose.yaml index ea3131c..e8c1de3 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,166 +1,166 @@ -services: - local-kafka: - image: docker.io/bitnami/kafka:3.9.0 - container_name: kafka-fl - ports: - - 9092:9092 - - 9094:9094 - volumes: - - ./config/kafka_data:/bitnami/kafka - env_file: - - config/kafka.env - healthcheck: - test: ["CMD", "kafka-topics.sh", "--list", "--bootstrap-server", "localhost:9094"] - interval: 30s - timeout: 10s - retries: 4 - - kafdrop: - container_name: kafdrop-fl - image: obsidiandynamics/kafdrop - restart: "no" - ports: - - 9000:9000 - env_file: - config/kafdrop.env - depends_on: - local-kafka: - condition: service_healthy - - redis: - image: redis/redis-stack:latest - container_name: redis - ports: - - 6379:6379 - - ervu-rp-summons-service: - image: registry-dev.pgs.rtlabs.ru/ervu/ervu-rp-summons-service:0.0.1-sha05ea36ab - container_name: rp-summons-service - env_file: - - config/ervu-rp-summons-service.env - depends_on: - local-kafka: - condition: service_healthy - - ervu-person-registry: - container_name: person-registry - image: registry-dev.pgs.rtlabs.ru/ervu/ervu-person-registry:0.0.1-shad32a31f0 - env_file: - - config/ervu-person-registry.env - depends_on: - local-kafka: - condition: service_healthy - - crypto-gateway: - image: registry-dev.pgs.rtlabs.ru/ervu/crypto-gateway:0.0.1-shada76e6e7 - container_name: crypto-gateway - ports: - - 8080 - env_file: - config/crypto-gateway.env - - printer: - image: registry-dev.pgs.rtlabs.ru/ervu/printer:0.0.1-shabd591b88 - container_name: printer - depends_on: - redis: - condition: service_started - local-kafka: - condition: service_healthy - ports: - - 8080 - - 5005 - 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: - 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 - build: - context: . - dockerfile: Dockerfile - ports: - - 8080:8080 - env_file: - - config/local.env - depends_on: - local-kafka: - condition: service_healthy - ervu-extract-from-registry-provider: - condition: service_started - ervu-person-registry: - condition: service_started - ervu-rp-summons-service: - condition: service_started +services: + local-kafka: + image: docker.io/bitnami/kafka:3.9.0 + container_name: kafka-fl + ports: + - 9092:9092 + - 9094:9094 + volumes: + - ./config/kafka_data:/bitnami/kafka + env_file: + - config/kafka.env + healthcheck: + test: ["CMD", "kafka-topics.sh", "--list", "--bootstrap-server", "localhost:9094"] + interval: 30s + timeout: 10s + retries: 4 + + kafdrop: + container_name: kafdrop-fl + image: obsidiandynamics/kafdrop + restart: "no" + ports: + - 9000:9000 + env_file: + config/kafdrop.env + depends_on: + local-kafka: + condition: service_healthy + + redis: + image: redis/redis-stack:latest + container_name: redis + ports: + - 6379:6379 + + ervu-rp-summons-service: + image: registry-dev.pgs.rtlabs.ru/ervu/ervu-rp-summons-service:0.0.1-sha05ea36ab + container_name: rp-summons-service + env_file: + - config/ervu-rp-summons-service.env + depends_on: + local-kafka: + condition: service_healthy + + ervu-person-registry: + container_name: person-registry + image: registry-dev.pgs.rtlabs.ru/ervu/ervu-person-registry:0.0.1-shad32a31f0 + env_file: + - config/ervu-person-registry.env + depends_on: + local-kafka: + condition: service_healthy + + crypto-gateway: + image: registry-dev.pgs.rtlabs.ru/ervu/crypto-gateway:0.0.1-shada76e6e7 + container_name: crypto-gateway + ports: + - 8080 + env_file: + config/crypto-gateway.env + + printer: + image: registry-dev.pgs.rtlabs.ru/ervu/printer:0.0.1-shabd591b88 + container_name: printer + depends_on: + redis: + condition: service_started + local-kafka: + condition: service_healthy + ports: + - 8080 + - 5005 + 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: + 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 + build: + context: . + dockerfile: Dockerfile + ports: + - 8080:8080 + env_file: + - config/local.env + depends_on: + local-kafka: + condition: service_healthy + ervu-extract-from-registry-provider: + condition: service_started + ervu-person-registry: + condition: service_started + ervu-rp-summons-service: + condition: service_started