From 5f0582baa3df472aa958f80d6f1b725c4e13c5f4 Mon Sep 17 00:00:00 2001 From: metalicn20 Date: Mon, 29 Nov 2021 10:44:02 +0330 Subject: [PATCH 1/8] Extract ports from docker-compose.yml --- Deployment/docker-compose.override.yml | 76 ++++++++++++++++++++++++++ Deployment/docker-compose.yml | 53 ------------------ 2 files changed, 76 insertions(+), 53 deletions(-) create mode 100644 Deployment/docker-compose.override.yml diff --git a/Deployment/docker-compose.override.yml b/Deployment/docker-compose.override.yml new file mode 100644 index 000000000..1041863d0 --- /dev/null +++ b/Deployment/docker-compose.override.yml @@ -0,0 +1,76 @@ +version: '3.8' +services: + zookeeper: + ports: + - '127.0.0.1:2181:2181' + kafka: + ports: + - '127.0.0.1:9092:9092' + consul: + ports: + - '127.0.0.1:8500:8500' + - '127.0.0.1:8300:8300' + - '127.0.0.1:8600:8600' + redis: + ports: + - "127.0.0.1:6379:6379" + postgres-accountant: + ports: + - 127.0.0.1:5433:5432 + postgres-eventlog: + ports: + - 127.0.0.1:5434:5432 + postgres-auth: + ports: + - 127.0.0.1:5435:5432 + postgres-wallet: + ports: + - 127.0.0.1:5436:5432 + postgres-api: + ports: + - 127.0.0.1:5437:5432 + postgres-bc-gateway: + ports: + - 127.0.0.1:5438:5432 + accountant: + ports: + - 127.0.0.1:8089:8089 + - 127.0.0.1:1045:1044 + eventlog: + ports: + - 127.0.0.1:8090:8090 + matching-engine: + ports: + - 127.0.0.1:8092:8092 + - 127.0.0.1:1046:1044 + matching-gateway: + ports: + - 127.0.0.1:8093:8093 + - 127.0.0.1:1047:1044 + auth: + ports: + - 127.0.0.1:8083:8083 + - 127.0.0.1:1048:1044 + wallet: + ports: + - 127.0.0.1:8091:8091 + - 127.0.0.1:1049:1044 + api: + ports: + - 127.0.0.1:8094:8094 + - 127.0.0.1:1050:1044 + websocket: + ports: + - 127.0.0.1:8097:8097 + - 127.0.0.1:1054:1044 + bc-gateway: + ports: + - 127.0.0.1:8095:8095 + - 127.0.0.1:1052:1044 + storage: + ports: + - 127.0.0.1:8096:8096 + - 127.0.0.1:1053:1044 + nginx: + ports: + - 80:80 diff --git a/Deployment/docker-compose.yml b/Deployment/docker-compose.yml index f34b167d0..83af38883 100644 --- a/Deployment/docker-compose.yml +++ b/Deployment/docker-compose.yml @@ -2,8 +2,6 @@ version: '3.8' services: zookeeper: image: 'docker.io/bitnami/zookeeper:3-debian-10' - ports: - - '127.0.0.1:2181:2181' volumes: - $DATA/zookeeper_data:/bitnami environment: @@ -15,8 +13,6 @@ services: condition: on-failure kafka: image: 'docker.io/bitnami/kafka:2-debian-10' - ports: - - '127.0.0.1:9092:9092' volumes: - $DATA/kafka-data:/bitnami environment: @@ -32,10 +28,6 @@ services: condition: on-failure consul: image: 'consul' - ports: - - '127.0.0.1:8500:8500' - - '127.0.0.1:8300:8300' - - '127.0.0.1:8600:8600' environment: - CONSUL_BIND_INTERFACE=eth0 networks: @@ -46,8 +38,6 @@ services: redis: image: "redis:alpine" command: redis-server - ports: - - "127.0.0.1:6379:6379" volumes: - $DATA/redis-data:/var/lib/redis - $DATA/redis.conf:/usr/local/etc/redis/redis.conf @@ -60,8 +50,6 @@ services: condition: on-failure postgres-accountant: image: "postgres" - ports: - - 127.0.0.1:5433:5432 environment: - POSTGRES_USER=opex - POSTGRES_PASSWORD=hiopex @@ -72,8 +60,6 @@ services: - opex postgres-eventlog: image: "postgres" - ports: - - 127.0.0.1:5434:5432 environment: - POSTGRES_USER=opex - POSTGRES_PASSWORD=hiopex @@ -84,8 +70,6 @@ services: - opex postgres-auth: image: "postgres" - ports: - - 127.0.0.1:5435:5432 environment: - POSTGRES_USER=opex - POSTGRES_PASSWORD=hiopex @@ -99,8 +83,6 @@ services: condition: on-failure postgres-wallet: image: "postgres" - ports: - - 127.0.0.1:5436:5432 environment: - POSTGRES_USER=opex - POSTGRES_PASSWORD=hiopex @@ -114,8 +96,6 @@ services: condition: on-failure postgres-api: image: "postgres" - ports: - - 127.0.0.1:5437:5432 environment: - POSTGRES_USER=opex - POSTGRES_PASSWORD=hiopex @@ -129,8 +109,6 @@ services: condition: on-failure postgres-bc-gateway: image: "postgres" - ports: - - 127.0.0.1:5438:5432 environment: - POSTGRES_USER=opex - POSTGRES_PASSWORD=hiopex @@ -147,9 +125,6 @@ services: build: context: ../accountant/accountant-app dockerfile: Dockerfile - ports: - - 127.0.0.1:8089:8089 - - 127.0.0.1:1045:1044 environment: - JAVA_OPTS=-Xmx256m -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=1044 - SPRING_PROFILES_ACTIVE=docker,demo,scheduled @@ -170,8 +145,6 @@ services: build: context: ../eventlog/eventlog-app dockerfile: Dockerfile - ports: - - 127.0.0.1:8090:8090 environment: - JAVA_OPTS=-Xmx256m - SPRING_PROFILES_ACTIVE=docker,demo @@ -192,9 +165,6 @@ services: build: context: ../matching-engine/matching-engine-app dockerfile: Dockerfile - ports: - - 127.0.0.1:8092:8092 - - 127.0.0.1:1046:1044 environment: - JAVA_OPTS=-Xmx256m -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=1044 - SPRING_PROFILES_ACTIVE=docker,demo @@ -211,9 +181,6 @@ services: build: context: ../matching-gateway/matching-gateway-app dockerfile: Dockerfile - ports: - - 127.0.0.1:8093:8093 - - 127.0.0.1:1047:1044 environment: - JAVA_OPTS=-Xmx256m -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=1044 - SPRING_PROFILES_DEFAULT=docker,demo @@ -231,9 +198,6 @@ services: build: context: ../user-management/keycloak-gateway dockerfile: Dockerfile - ports: - - 127.0.0.1:8083:8083 - - 127.0.0.1:1048:1044 environment: - JAVA_OPTS=-Xmx256m -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=1044 - SPRING_PROFILES_ACTIVE=docker,demo @@ -259,9 +223,6 @@ services: build: context: ../wallet/wallet-app dockerfile: Dockerfile - ports: - - 127.0.0.1:8091:8091 - - 127.0.0.1:1049:1044 environment: - JAVA_OPTS=-Xmx256m -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=1044 - SPRING_PROFILES_DEFAULT=docker,demo @@ -285,9 +246,6 @@ services: build: context: ../api/api-app dockerfile: Dockerfile - ports: - - 127.0.0.1:8094:8094 - - 127.0.0.1:1050:1044 environment: - JAVA_OPTS=-Xmx256m -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=1044 - SPRING_PROFILES_DEFAULT=docker,demo @@ -311,9 +269,6 @@ services: build: context: ../websocket/websocket-app dockerfile: Dockerfile - ports: - - 127.0.0.1:8097:8097 - - 127.0.0.1:1054:1044 environment: - JAVA_OPTS=-Xmx256m -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=1044 - SPRING_PROFILES_DEFAULT=docker @@ -335,9 +290,6 @@ services: build: context: ../bc-gateway/bc-gateway-app dockerfile: Dockerfile - ports: - - 127.0.0.1:8095:8095 - - 127.0.0.1:1052:1044 environment: - JAVA_OPTS=-Xmx256m -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=1044 - SPRING_PROFILES_DEFAULT=docker,demo,scheduled @@ -361,9 +313,6 @@ services: build: context: ../storage/storage-app dockerfile: Dockerfile - ports: - - 127.0.0.1:8096:8096 - - 127.0.0.1:1053:1044 environment: - JAVA_OPTS=-Xmx256m -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=1044 - SPRING_PROFILES_DEFAULT=docker @@ -381,8 +330,6 @@ services: volumes: - ./nginx.conf:/etc/nginx/nginx.conf - $DATA/www:/data/www - ports: - - 80:80 depends_on: - wallet - auth From 0e34841dd65171238cd7839eaa8f985bc293eeb4 Mon Sep 17 00:00:00 2001 From: metalicn20 Date: Mon, 29 Nov 2021 11:14:02 +0330 Subject: [PATCH 2/8] Separate deploy configs --- Deployment/docker-compose.dev.yml | 75 ++++++++++++++++++++++++++ Deployment/docker-compose.override.yml | 1 - Jenkins/Jenkinsfile.deploy.dev.groovy | 57 ++++++++++++++++++++ Jenkins/Jenkinsfile.deploy.groovy | 5 +- 4 files changed, 134 insertions(+), 4 deletions(-) create mode 100644 Deployment/docker-compose.dev.yml create mode 100644 Jenkins/Jenkinsfile.deploy.dev.groovy diff --git a/Deployment/docker-compose.dev.yml b/Deployment/docker-compose.dev.yml new file mode 100644 index 000000000..d0d3f2e88 --- /dev/null +++ b/Deployment/docker-compose.dev.yml @@ -0,0 +1,75 @@ +services: + zookeeper: + ports: + - '127.0.0.1:2181:2181' + kafka: + ports: + - '127.0.0.1:9092:9092' + consul: + ports: + - '127.0.0.1:8500:8500' + - '127.0.0.1:8300:8300' + - '127.0.0.1:8600:8600' + redis: + ports: + - "127.0.0.1:6379:6379" + postgres-accountant: + ports: + - 127.0.0.1:5433:5432 + postgres-eventlog: + ports: + - 127.0.0.1:5434:5432 + postgres-auth: + ports: + - 127.0.0.1:5435:5432 + postgres-wallet: + ports: + - 127.0.0.1:5436:5432 + postgres-api: + ports: + - 127.0.0.1:5437:5432 + postgres-bc-gateway: + ports: + - 127.0.0.1:5438:5432 + accountant: + ports: + - 127.0.0.1:8089:8089 + - 127.0.0.1:1045:1044 + eventlog: + ports: + - 127.0.0.1:8090:8090 + matching-engine: + ports: + - 127.0.0.1:8092:8092 + - 127.0.0.1:1046:1044 + matching-gateway: + ports: + - 127.0.0.1:8093:8093 + - 127.0.0.1:1047:1044 + auth: + ports: + - 127.0.0.1:8083:8083 + - 127.0.0.1:1048:1044 + wallet: + ports: + - 127.0.0.1:8091:8091 + - 127.0.0.1:1049:1044 + api: + ports: + - 127.0.0.1:8094:8094 + - 127.0.0.1:1050:1044 + websocket: + ports: + - 127.0.0.1:8097:8097 + - 127.0.0.1:1054:1044 + bc-gateway: + ports: + - 127.0.0.1:8095:8095 + - 127.0.0.1:1052:1044 + storage: + ports: + - 127.0.0.1:8096:8096 + - 127.0.0.1:1053:1044 + nginx: + ports: + - 80:80 diff --git a/Deployment/docker-compose.override.yml b/Deployment/docker-compose.override.yml index 1041863d0..d0d3f2e88 100644 --- a/Deployment/docker-compose.override.yml +++ b/Deployment/docker-compose.override.yml @@ -1,4 +1,3 @@ -version: '3.8' services: zookeeper: ports: diff --git a/Jenkins/Jenkinsfile.deploy.dev.groovy b/Jenkins/Jenkinsfile.deploy.dev.groovy new file mode 100644 index 000000000..ad35f15ea --- /dev/null +++ b/Jenkins/Jenkinsfile.deploy.dev.groovy @@ -0,0 +1,57 @@ +pipeline { + agent any + + stages('Deploy - Stage') { + stage('Build') { + steps { + setBuildStatus("?", "PENDING") + withMaven( + maven: 'maven-latest' + ) { + sh 'mvn -B clean install' + } + } + } + stage('Deliver') { + environment { + DATA = '/var/opex/runtime-stage' + } + steps { + dir("Deployment") { + sh 'docker-compose -f docker-compose.yml -f docker-compose.dev.yml up -d --build' + } + } + } + } + + post { + always { + echo 'One way or another, I have finished' + } + success { + echo ':)' + setBuildStatus(":)", "SUCCESS") + } + unstable { + echo ':/' + setBuildStatus(":/", "UNSTABLE") + } + failure { + echo ':(' + setBuildStatus(":(", "FAILURE") + } + changed { + echo 'Things were different before...' + } + } +} + +void setBuildStatus(String message, String state) { + step([ + $class : "GitHubCommitStatusSetter", + reposSource : [$class: "ManuallyEnteredRepositorySource", url: "https://github.com/opexdev/OPEX-Core"], + contextSource : [$class: "ManuallyEnteredCommitContextSource", context: "ci/jenkins/build-status"], + errorHandlers : [[$class: "ChangingBuildStatusErrorHandler", result: "UNSTABLE"]], + statusResultSource: [$class: "ConditionalStatusResultSource", results: [[$class: "AnyBuildResult", message: message, state: state]]] + ]) +} diff --git a/Jenkins/Jenkinsfile.deploy.groovy b/Jenkins/Jenkinsfile.deploy.groovy index e5c4e0885..0e6c50bea 100644 --- a/Jenkins/Jenkinsfile.deploy.groovy +++ b/Jenkins/Jenkinsfile.deploy.groovy @@ -1,7 +1,7 @@ pipeline { agent any - stages { + stages('Deploy - Production') { stage('Build') { steps { setBuildStatus("?", "PENDING") @@ -18,8 +18,7 @@ pipeline { } steps { dir("Deployment") { - sh 'docker-compose build' - sh 'docker-compose up -d' + sh 'docker-compose up -d --build' } } } From 9c6249180b84fa9d1d01c491ae7f661e1b3727bb Mon Sep 17 00:00:00 2001 From: metalicn20 Date: Tue, 30 Nov 2021 11:59:20 +0330 Subject: [PATCH 3/8] Update dev ports --- Deployment/docker-compose.dev.yml | 64 +++++++++++++++---------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/Deployment/docker-compose.dev.yml b/Deployment/docker-compose.dev.yml index d0d3f2e88..bdbfad42d 100644 --- a/Deployment/docker-compose.dev.yml +++ b/Deployment/docker-compose.dev.yml @@ -1,75 +1,75 @@ services: zookeeper: ports: - - '127.0.0.1:2181:2181' + - '127.0.0.1:2182:2181' kafka: ports: - - '127.0.0.1:9092:9092' + - '127.0.0.1:9093:9092' consul: ports: - - '127.0.0.1:8500:8500' - - '127.0.0.1:8300:8300' - - '127.0.0.1:8600:8600' + - '127.0.0.1:8501:8500' + - '127.0.0.1:8302:8300' + - '127.0.0.1:8603:8600' redis: ports: - - "127.0.0.1:6379:6379" + - "127.0.0.1:6380:6379" postgres-accountant: ports: - - 127.0.0.1:5433:5432 + - 127.0.0.1:5633:5432 postgres-eventlog: ports: - - 127.0.0.1:5434:5432 + - 127.0.0.1:5634:5432 postgres-auth: ports: - - 127.0.0.1:5435:5432 + - 127.0.0.1:5635:5432 postgres-wallet: ports: - - 127.0.0.1:5436:5432 + - 127.0.0.1:5636:5432 postgres-api: ports: - - 127.0.0.1:5437:5432 + - 127.0.0.1:5637:5432 postgres-bc-gateway: ports: - - 127.0.0.1:5438:5432 + - 127.0.0.1:5638:5432 accountant: ports: - - 127.0.0.1:8089:8089 - - 127.0.0.1:1045:1044 + - 127.0.0.1:8289:8089 + - 127.0.0.1:1146:1044 eventlog: ports: - - 127.0.0.1:8090:8090 + - 127.0.0.1:8290:8090 matching-engine: ports: - - 127.0.0.1:8092:8092 - - 127.0.0.1:1046:1044 + - 127.0.0.1:8292:8092 + - 127.0.0.1:1246:1044 matching-gateway: ports: - - 127.0.0.1:8093:8093 - - 127.0.0.1:1047:1044 + - 127.0.0.1:8293:8093 + - 127.0.0.1:1147:1044 auth: ports: - - 127.0.0.1:8083:8083 - - 127.0.0.1:1048:1044 + - 127.0.0.1:8283:8083 + - 127.0.0.1:1148:1044 wallet: ports: - - 127.0.0.1:8091:8091 - - 127.0.0.1:1049:1044 + - 127.0.0.1:8291:8091 + - 127.0.0.1:1149:1044 api: ports: - - 127.0.0.1:8094:8094 - - 127.0.0.1:1050:1044 + - 127.0.0.1:8294:8094 + - 127.0.0.1:1150:1044 websocket: ports: - - 127.0.0.1:8097:8097 - - 127.0.0.1:1054:1044 + - 127.0.0.1:8297:8097 + - 127.0.0.1:1154:1044 bc-gateway: ports: - - 127.0.0.1:8095:8095 - - 127.0.0.1:1052:1044 + - 127.0.0.1:8295:8095 + - 127.0.0.1:1152:1044 storage: ports: - - 127.0.0.1:8096:8096 - - 127.0.0.1:1053:1044 + - 127.0.0.1:8296:8096 + - 127.0.0.1:1153:1044 nginx: ports: - - 80:80 + - 8086:80 From 29221d3a271ea005129ec45d863ce87443fea5a5 Mon Sep 17 00:00:00 2001 From: metalicn20 Date: Tue, 30 Nov 2021 12:36:05 +0330 Subject: [PATCH 4/8] Separate networks in docker compose --- Deployment/docker-compose.dev.yml | 67 ++++++++++++++++++++++++++ Deployment/docker-compose.override.yml | 67 ++++++++++++++++++++++++++ Deployment/docker-compose.yml | 35 ++------------ 3 files changed, 137 insertions(+), 32 deletions(-) diff --git a/Deployment/docker-compose.dev.yml b/Deployment/docker-compose.dev.yml index bdbfad42d..0e8bb31ff 100644 --- a/Deployment/docker-compose.dev.yml +++ b/Deployment/docker-compose.dev.yml @@ -2,74 +2,141 @@ services: zookeeper: ports: - '127.0.0.1:2182:2181' + networks: + - opex-dev kafka: ports: - '127.0.0.1:9093:9092' + networks: + - opex-dev consul: ports: - '127.0.0.1:8501:8500' - '127.0.0.1:8302:8300' - '127.0.0.1:8603:8600' + networks: + - opex-dev redis: ports: - "127.0.0.1:6380:6379" + networks: + - opex-dev postgres-accountant: ports: - 127.0.0.1:5633:5432 + networks: + - opex-dev postgres-eventlog: ports: - 127.0.0.1:5634:5432 + networks: + - opex-dev postgres-auth: ports: - 127.0.0.1:5635:5432 + networks: + - opex-dev postgres-wallet: ports: - 127.0.0.1:5636:5432 + networks: + - opex-dev postgres-api: ports: - 127.0.0.1:5637:5432 + networks: + - opex-dev postgres-bc-gateway: ports: - 127.0.0.1:5638:5432 + networks: + - opex-dev accountant: ports: - 127.0.0.1:8289:8089 - 127.0.0.1:1146:1044 + networks: + opex-dev: + aliases: + - accountant eventlog: ports: - 127.0.0.1:8290:8090 + networks: + opex-dev: + aliases: + - eventlog matching-engine: ports: - 127.0.0.1:8292:8092 - 127.0.0.1:1246:1044 + networks: + opex-dev: + aliases: + - matching-engine matching-gateway: ports: - 127.0.0.1:8293:8093 - 127.0.0.1:1147:1044 + networks: + opex-dev: + aliases: + - matching-gateway auth: ports: - 127.0.0.1:8283:8083 - 127.0.0.1:1148:1044 + networks: + opex-dev: + aliases: + - auth wallet: ports: - 127.0.0.1:8291:8091 - 127.0.0.1:1149:1044 + networks: + opex-dev: + aliases: + - wallet api: ports: - 127.0.0.1:8294:8094 - 127.0.0.1:1150:1044 + networks: + opex-dev: + aliases: + - api websocket: ports: - 127.0.0.1:8297:8097 - 127.0.0.1:1154:1044 + networks: + opex-dev: + aliases: + - websocket bc-gateway: ports: - 127.0.0.1:8295:8095 - 127.0.0.1:1152:1044 + networks: + opex-dev: + aliases: + - bc-gateway storage: ports: - 127.0.0.1:8296:8096 - 127.0.0.1:1153:1044 + networks: + opex-dev: + aliases: + - storage nginx: ports: - 8086:80 + networks: + opex-dev: + aliases: + - opex_nginx +networks: + opex-dev: + driver: bridge diff --git a/Deployment/docker-compose.override.yml b/Deployment/docker-compose.override.yml index d0d3f2e88..27cfb9eeb 100644 --- a/Deployment/docker-compose.override.yml +++ b/Deployment/docker-compose.override.yml @@ -2,74 +2,141 @@ services: zookeeper: ports: - '127.0.0.1:2181:2181' + networks: + - opex kafka: ports: - '127.0.0.1:9092:9092' + networks: + - opex consul: ports: - '127.0.0.1:8500:8500' - '127.0.0.1:8300:8300' - '127.0.0.1:8600:8600' + networks: + - opex redis: ports: - "127.0.0.1:6379:6379" + networks: + - opex postgres-accountant: ports: - 127.0.0.1:5433:5432 + networks: + - opex postgres-eventlog: ports: - 127.0.0.1:5434:5432 + networks: + - opex postgres-auth: ports: - 127.0.0.1:5435:5432 + networks: + - opex postgres-wallet: ports: - 127.0.0.1:5436:5432 + networks: + - opex postgres-api: ports: - 127.0.0.1:5437:5432 + networks: + - opex postgres-bc-gateway: ports: - 127.0.0.1:5438:5432 + networks: + - opex accountant: ports: - 127.0.0.1:8089:8089 - 127.0.0.1:1045:1044 + networks: + opex: + aliases: + - accountant eventlog: ports: - 127.0.0.1:8090:8090 + networks: + opex: + aliases: + - eventlog matching-engine: ports: - 127.0.0.1:8092:8092 - 127.0.0.1:1046:1044 + networks: + opex: + aliases: + - matching-engine matching-gateway: ports: - 127.0.0.1:8093:8093 - 127.0.0.1:1047:1044 + networks: + opex: + aliases: + - matching-gateway auth: ports: - 127.0.0.1:8083:8083 - 127.0.0.1:1048:1044 + networks: + opex: + aliases: + - auth wallet: ports: - 127.0.0.1:8091:8091 - 127.0.0.1:1049:1044 + networks: + opex: + aliases: + - wallet api: ports: - 127.0.0.1:8094:8094 - 127.0.0.1:1050:1044 + networks: + opex: + aliases: + - api websocket: ports: - 127.0.0.1:8097:8097 - 127.0.0.1:1054:1044 + networks: + opex: + aliases: + - websocket bc-gateway: ports: - 127.0.0.1:8095:8095 - 127.0.0.1:1052:1044 + networks: + opex: + aliases: + - bc-gateway storage: ports: - 127.0.0.1:8096:8096 - 127.0.0.1:1053:1044 + networks: + opex: + aliases: + - storage nginx: ports: - 80:80 + networks: + opex: + aliases: + - opex_nginx +networks: + opex: + driver: bridge diff --git a/Deployment/docker-compose.yml b/Deployment/docker-compose.yml index 83af38883..9ba167dbe 100644 --- a/Deployment/docker-compose.yml +++ b/Deployment/docker-compose.yml @@ -121,7 +121,6 @@ services: restart_policy: condition: on-failure accountant: - container_name: accountant build: context: ../accountant/accountant-app dockerfile: Dockerfile @@ -133,7 +132,9 @@ services: - CONSUL_HOST=consul - DB_IP_PORT=postgres-accountant networks: - - opex + opex: + aliases: + - accountant depends_on: - zookeeper - kafka @@ -141,7 +142,6 @@ services: - consul - postgres-accountant eventlog: - container_name: eventlog build: context: ../eventlog/eventlog-app dockerfile: Dockerfile @@ -152,8 +152,6 @@ services: - REDIS_HOST=redis - CONSUL_HOST=consul - DB_IP_PORT=postgres-eventlog - networks: - - opex depends_on: - zookeeper - kafka @@ -161,7 +159,6 @@ services: - consul - postgres-eventlog matching-engine: - container_name: matching-engine build: context: ../matching-engine/matching-engine-app dockerfile: Dockerfile @@ -170,14 +167,11 @@ services: - SPRING_PROFILES_ACTIVE=docker,demo - KAFKA_IP_PORT=kafka:9092 - REDIS_HOST=redis - networks: - - opex depends_on: - zookeeper - kafka - redis matching-gateway: - container_name: matching-gateway build: context: ../matching-gateway/matching-gateway-app dockerfile: Dockerfile @@ -187,14 +181,11 @@ services: - KAFKA_IP_PORT=kafka:9092 - REDIS_HOST=redis - CONSUL_HOST=consul - networks: - - opex depends_on: - zookeeper - kafka - consul auth: - container_name: auth build: context: ../user-management/keycloak-gateway dockerfile: Dockerfile @@ -207,8 +198,6 @@ services: - DB_IP_PORT=postgres-auth - PROXY_ADDRESS_FORWARDING=true - WORKING_DIR=$DATA - networks: - - opex depends_on: - zookeeper - kafka @@ -219,7 +208,6 @@ services: restart_policy: condition: on-failure wallet: - container_name: wallet build: context: ../wallet/wallet-app dockerfile: Dockerfile @@ -230,8 +218,6 @@ services: - REDIS_HOST=redis - CONSUL_HOST=consul - DB_IP_PORT=postgres-wallet - networks: - - opex depends_on: - zookeeper - kafka @@ -242,7 +228,6 @@ services: restart_policy: condition: on-failure api: - container_name: API build: context: ../api/api-app dockerfile: Dockerfile @@ -253,8 +238,6 @@ services: - REDIS_HOST=redis - CONSUL_HOST=consul - DB_IP_PORT=postgres-api - networks: - - opex depends_on: - zookeeper - kafka @@ -265,7 +248,6 @@ services: restart_policy: condition: on-failure websocket: - container_name: websocket build: context: ../websocket/websocket-app dockerfile: Dockerfile @@ -275,8 +257,6 @@ services: - KAFKA_IP_PORT=kafka:9092 - CONSUL_HOST=consul - DB_IP_PORT=postgres-api - networks: - - opex depends_on: - zookeeper - kafka @@ -286,7 +266,6 @@ services: restart_policy: condition: on-failure bc-gateway: - container_name: bc-gateway build: context: ../bc-gateway/bc-gateway-app dockerfile: Dockerfile @@ -297,8 +276,6 @@ services: - REDIS_HOST=redis - CONSUL_HOST=consul - DB_IP_PORT=postgres-bc-gateway - networks: - - opex depends_on: - zookeeper - kafka @@ -309,7 +286,6 @@ services: restart_policy: condition: on-failure storage: - container_name: storage build: context: ../storage/storage-app dockerfile: Dockerfile @@ -317,8 +293,6 @@ services: - JAVA_OPTS=-Xmx256m -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=1044 - SPRING_PROFILES_DEFAULT=docker - CONSUL_HOST=consul - networks: - - opex depends_on: - consul deploy: @@ -326,7 +300,6 @@ services: condition: on-failure nginx: image: jboesl/docker-nginx-headers-more - container_name: opex_nginx volumes: - ./nginx.conf:/etc/nginx/nginx.conf - $DATA/www:/data/www @@ -335,8 +308,6 @@ services: - auth - matching-gateway - api - networks: - - opex networks: opex: driver: bridge From dadd22b33b0f13e1e6e16c120f4714a84364ebaa Mon Sep 17 00:00:00 2001 From: metalicn20 Date: Tue, 30 Nov 2021 12:55:48 +0330 Subject: [PATCH 5/8] Update jenkins configs --- Jenkins/Jenkinsfile.deploy.dev.groovy | 4 ++-- Jenkins/Jenkinsfile.deploy.groovy | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkins/Jenkinsfile.deploy.dev.groovy b/Jenkins/Jenkinsfile.deploy.dev.groovy index ad35f15ea..4c78c89b0 100644 --- a/Jenkins/Jenkinsfile.deploy.dev.groovy +++ b/Jenkins/Jenkinsfile.deploy.dev.groovy @@ -14,11 +14,11 @@ pipeline { } stage('Deliver') { environment { - DATA = '/var/opex/runtime-stage' + DATA = '/var/opex/runtime-dev' } steps { dir("Deployment") { - sh 'docker-compose -f docker-compose.yml -f docker-compose.dev.yml up -d --build' + sh 'COMPOSE_PROJECT_NAME=dev docker-compose -f docker-compose.yml -f docker-compose.dev.yml up -d --build' } } } diff --git a/Jenkins/Jenkinsfile.deploy.groovy b/Jenkins/Jenkinsfile.deploy.groovy index 0e6c50bea..bcd550e3c 100644 --- a/Jenkins/Jenkinsfile.deploy.groovy +++ b/Jenkins/Jenkinsfile.deploy.groovy @@ -18,7 +18,7 @@ pipeline { } steps { dir("Deployment") { - sh 'docker-compose up -d --build' + sh 'COMPOSE_PROJECT_NAME=prod docker-compose up -d --build' } } } From 92441dfb1acae9a0e6bf58033314564652a4f669 Mon Sep 17 00:00:00 2001 From: metalicn20 Date: Tue, 30 Nov 2021 13:33:35 +0330 Subject: [PATCH 6/8] Update github workflows --- .github/workflows/dev.yml | 19 +++++++++++++++++++ .github/workflows/main.yml | 6 +++--- 2 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/dev.yml diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml new file mode 100644 index 000000000..aa241b3bd --- /dev/null +++ b/.github/workflows/dev.yml @@ -0,0 +1,19 @@ +name: Deploy OPEX - Dev + +on: + push: + branches: + - dev + +jobs: + jenkinsJob: + name: Build OPEX new dev version + runs-on: ubuntu-latest + steps: + - name: Trigger opex-build-job on jenkins + uses: appleboy/jenkins-action@master + with: + url: ${{ secrets.JENKINS_URL }} + user: ${{ secrets.JENKINS_USER }} + token: ${{ secrets.JENKINS_TOKEN }} + job: "opex-core-dev-deploy" diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index dc4426a98..74a80f71d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,4 +1,4 @@ -name: Deploy OPEX +name: Deploy OPEX - Demo on: push: @@ -7,7 +7,7 @@ on: jobs: jenkinsJob: - name: build opex new version + name: Deploy OPEX new demo version runs-on: ubuntu-latest steps: - name: Trigger opex-build-job on jenkins @@ -16,4 +16,4 @@ jobs: url: ${{ secrets.JENKINS_URL }} user: ${{ secrets.JENKINS_USER }} token: ${{ secrets.JENKINS_TOKEN }} - job: "opex-build-job" + job: "opex-core-demo-deploy" From 1cab77494443d417b0c96cce9d90bc614c7bb562 Mon Sep 17 00:00:00 2001 From: metalicn20 Date: Tue, 30 Nov 2021 14:17:34 +0330 Subject: [PATCH 7/8] Update jenkins --- Jenkins/Jenkinsfile.deploy.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkins/Jenkinsfile.deploy.groovy b/Jenkins/Jenkinsfile.deploy.groovy index bcd550e3c..4e6c65f40 100644 --- a/Jenkins/Jenkinsfile.deploy.groovy +++ b/Jenkins/Jenkinsfile.deploy.groovy @@ -1,7 +1,7 @@ pipeline { agent any - stages('Deploy - Production') { + stages('Deploy - Demo') { stage('Build') { steps { setBuildStatus("?", "PENDING") From bd4987563c722b158bac074ccb2b662817d45285 Mon Sep 17 00:00:00 2001 From: metalicn20 Date: Tue, 30 Nov 2021 14:18:53 +0330 Subject: [PATCH 8/8] Update jenkins --- Jenkins/Jenkinsfile.deploy.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkins/Jenkinsfile.deploy.groovy b/Jenkins/Jenkinsfile.deploy.groovy index 4e6c65f40..f4ce7d7fb 100644 --- a/Jenkins/Jenkinsfile.deploy.groovy +++ b/Jenkins/Jenkinsfile.deploy.groovy @@ -18,7 +18,7 @@ pipeline { } steps { dir("Deployment") { - sh 'COMPOSE_PROJECT_NAME=prod docker-compose up -d --build' + sh 'COMPOSE_PROJECT_NAME=demo docker-compose up -d --build' } } }