micord/ervu-eks
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

DEVOPS-2210 Update docker-compose.yaml

Browse source
This commit is contained in:
Pavel Zilke 2025-10-22 16:59:17 +03:00
parent 842e06f874
commit 49cfff7ba6
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
config/.env Normal file
View file

@ -0,0 +1 @@
IMAGE=eks-app:latest

10
config/docker-compose.tc.yaml
View file

@ -2,28 +2,28 @@
services: services:
eks-backend: eks-backend:
build: build:
dockerfile: Dockerfile.tc dockerfile: Dockerfile.ts
entrypoint: ["java", "-jar", "/home/app/backend.jar"] entrypoint: ["java", "-jar", "/home/app/backend.jar"]
environment: environment:
- TZ="Europe/Moscow" - TZ="Europe/Moscow"
- CONFIG_DATA_EXECUTOR_URL=http://eks-cde:8080/api - CONFIG_DATA_EXECUTOR_URL=http://eks-cde:8080/api
env_file: env_file:
- db.env - tc.env
eks-frontend: eks-frontend:
build: build:
dockerfile: Dockerfile.tc dockerfile: Dockerfile.ts
depends_on: depends_on:
- eks-backend - eks-backend
ports: ports:
- "80" - "127.0.0.1:8080:80"
entrypoint: ["nginx", "-g", "daemon off;"] entrypoint: ["nginx", "-g", "daemon off;"]
environment: environment:
- TZ="Europe/Moscow" - TZ="Europe/Moscow"
eks-cde: eks-cde:
build: build:
dockerfile: Dockerfile.tc dockerfile: Dockerfile.ts
entrypoint: ["java", "-jar", "/home/app/cde.jar"] entrypoint: ["java", "-jar", "/home/app/cde.jar"]
volumes: volumes:
- ./cde-xml:/cde-xml - ./cde-xml:/cde-xml

9
config/docker-compose.yaml
View file

@ -1,4 +1,3 @@
#version: "3"
services: services:
db: db:
image: postgres:15-bullseye image: postgres:15-bullseye
@ -14,7 +13,7 @@ services:
- TZ="Europe/Moscow" - TZ="Europe/Moscow"
eks-backend: eks-backend:
image: ervu-eks:latest image: ${IMAGE:-eks-app:latest}
depends_on: depends_on:
- db - db
entrypoint: ["java", "-jar", "/home/app/backend.jar"] entrypoint: ["java", "-jar", "/home/app/backend.jar"]
@ -22,10 +21,10 @@ services:
- TZ="Europe/Moscow" - TZ="Europe/Moscow"
- CONFIG_DATA_EXECUTOR_URL=http://eks-cde:8080/api - CONFIG_DATA_EXECUTOR_URL=http://eks-cde:8080/api
env_file: env_file:
- db.env - eks.env
eks-frontend: eks-frontend:
image: ervu-eks:latest image: ${IMAGE:-eks-app:latest}
depends_on: depends_on:
- eks-backend - eks-backend
ports: ports:
@ -35,7 +34,7 @@ services:
- TZ="Europe/Moscow" - TZ="Europe/Moscow"
eks-cde: eks-cde:
image: ervu-eks:latest image: ${IMAGE:-eks-app:latest}
entrypoint: ["java", "-jar", "/home/app/cde.jar"] entrypoint: ["java", "-jar", "/home/app/cde.jar"]
volumes: volumes:
- ./cde-xml:/cde-xml - ./cde-xml:/cde-xml

2
config/db.env → config/eks.env
View file

@ -22,7 +22,7 @@ SPRING_DATASOURCE_PERSON_SQLDIALECT=POSTGRES
SPRING_DATASOURCE_PERSON_DEFAULT=false SPRING_DATASOURCE_PERSON_DEFAULT=false
SPRING_DATASOURCE_PERSON_MANUALLY=true SPRING_DATASOURCE_PERSON_MANUALLY=true
SPRING_DATASOURCE_SECURITY_URL=jdbc:postgresql://10.10.31.118:5432/ervu_eks SPRING_DATASOURCE_SECURITY_URL=jdbc:postgresql://db:5432/ervu_eks
SPRING_DATASOURCE_SECURITY_USERNAME=ervu_eks_sec SPRING_DATASOURCE_SECURITY_USERNAME=ervu_eks_sec
SPRING_DATASOURCE_SECURITY_PASSWORD=ervu_eks_sec SPRING_DATASOURCE_SECURITY_PASSWORD=ervu_eks_sec
SPRING_DATASOURCE_SECURITY_DRIVERCLASSNAME=org.postgresql.Driver SPRING_DATASOURCE_SECURITY_DRIVERCLASSNAME=org.postgresql.Driver