diff --git a/config/.env b/config/.env new file mode 100644 index 0000000..5c4558f --- /dev/null +++ b/config/.env @@ -0,0 +1 @@ +IMAGE=eks-app:latest diff --git a/config/docker-compose.tc.yaml b/config/docker-compose.tc.yaml index eab85ed..675bac4 100644 --- a/config/docker-compose.tc.yaml +++ b/config/docker-compose.tc.yaml @@ -2,28 +2,28 @@ services: eks-backend: build: - dockerfile: Dockerfile.tc + dockerfile: Dockerfile.ts entrypoint: ["java", "-jar", "/home/app/backend.jar"] environment: - TZ="Europe/Moscow" - CONFIG_DATA_EXECUTOR_URL=http://eks-cde:8080/api env_file: - - db.env + - tc.env eks-frontend: build: - dockerfile: Dockerfile.tc + dockerfile: Dockerfile.ts depends_on: - eks-backend ports: - - "80" + - "127.0.0.1:8080:80" entrypoint: ["nginx", "-g", "daemon off;"] environment: - TZ="Europe/Moscow" eks-cde: build: - dockerfile: Dockerfile.tc + dockerfile: Dockerfile.ts entrypoint: ["java", "-jar", "/home/app/cde.jar"] volumes: - ./cde-xml:/cde-xml diff --git a/config/docker-compose.yaml b/config/docker-compose.yaml index cfc2320..4e02b55 100644 --- a/config/docker-compose.yaml +++ b/config/docker-compose.yaml @@ -1,4 +1,3 @@ -#version: "3" services: db: image: postgres:15-bullseye @@ -14,7 +13,7 @@ services: - TZ="Europe/Moscow" eks-backend: - image: ervu-eks:latest + image: ${IMAGE:-eks-app:latest} depends_on: - db entrypoint: ["java", "-jar", "/home/app/backend.jar"] @@ -22,10 +21,10 @@ services: - TZ="Europe/Moscow" - CONFIG_DATA_EXECUTOR_URL=http://eks-cde:8080/api env_file: - - db.env + - eks.env eks-frontend: - image: ervu-eks:latest + image: ${IMAGE:-eks-app:latest} depends_on: - eks-backend ports: @@ -35,7 +34,7 @@ services: - TZ="Europe/Moscow" eks-cde: - image: ervu-eks:latest + image: ${IMAGE:-eks-app:latest} entrypoint: ["java", "-jar", "/home/app/cde.jar"] volumes: - ./cde-xml:/cde-xml diff --git a/config/db.env b/config/eks.env similarity index 95% rename from config/db.env rename to config/eks.env index 29348fe..9eba713 100644 --- a/config/db.env +++ b/config/eks.env @@ -22,7 +22,7 @@ SPRING_DATASOURCE_PERSON_SQLDIALECT=POSTGRES SPRING_DATASOURCE_PERSON_DEFAULT=false 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_PASSWORD=ervu_eks_sec SPRING_DATASOURCE_SECURITY_DRIVERCLASSNAME=org.postgresql.Driver