From 172af939dbc075abf5590ec186ee3866063a5d16 Mon Sep 17 00:00:00 2001 From: metalicn20 Date: Wed, 26 Jan 2022 13:30:52 +0330 Subject: [PATCH 01/24] Remove nginx service and config file --- Deployment/docker-compose.yml | 10 ---- Deployment/nginx.conf | 107 ---------------------------------- 2 files changed, 117 deletions(-) delete mode 100644 Deployment/nginx.conf diff --git a/Deployment/docker-compose.yml b/Deployment/docker-compose.yml index bc7418e20..60ddbd042 100644 --- a/Deployment/docker-compose.yml +++ b/Deployment/docker-compose.yml @@ -277,13 +277,3 @@ services: deploy: restart_policy: condition: on-failure - nginx: - image: jboesl/docker-nginx-headers-more - volumes: - - ./nginx.conf:/etc/nginx/nginx.conf - - $DATA/www:/data/www - depends_on: - - wallet - - auth - - matching-gateway - - api diff --git a/Deployment/nginx.conf b/Deployment/nginx.conf deleted file mode 100644 index ef1e81ebe..000000000 --- a/Deployment/nginx.conf +++ /dev/null @@ -1,107 +0,0 @@ -worker_processes 1; - -events { - worker_connections 1024; -} - -http { - sendfile on; - - upstream docker-wallet { - server wallet:8091; - } - - upstream docker-auth { - server auth:8083; - } - - upstream docker-matching-gateway { - server matching-gateway:8093; - } - - upstream docker-api { - server api:8094; - } - - upstream docker-storage { - server storage:8096; - } - - upstream docker-websocket { - server websocket:8097; - } - - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Host $server_name; - - server { - server_name api.opex.dev; - - more_set_headers 'Access-Control-Allow-Origin: *'; - more_set_headers 'Access-Control-Allow-Headers: *'; - more_set_headers 'Access-Control-Allow-Methods: POST, PUT, PATCH, GET, DELETE, OPTIONS, HEAD'; - - if ($request_method = 'OPTIONS') { - return 204; - } - - location /auth { - proxy_pass http://docker-auth; - } - - location /wallet/transfer { - return 403; - } - - location /wallet/deposit { - return 403; - } - - location /wallet/payment/internal { - return 403; - } - - location /wallet { - proxy_pass http://docker-wallet; - rewrite ^/wallet(.*)$ $1 break; - } - - location /gateway { - proxy_pass http://docker-matching-gateway; - rewrite ^/gateway(.*)$ $1 break; - } - - location /storage { - proxy_pass http://docker-storage; - rewrite ^/storage/(.*)$ /$1 break; - } - - location /stream { - proxy_pass http://docker-websocket; - # WS config - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - ########### - rewrite ^/stream(.*)$ $1 break; - } - - location /api { - proxy_pass http://docker-api; - rewrite ^/api(.*)$ $1 break; - } - - location /sapi { - proxy_pass http://docker-api; - rewrite ^/sapi(.*)$ $1 break; - } - - location /binance { - proxy_set_header Host api.binance.com; - proxy_pass https://api.binance.com; - rewrite ^/binance/(.*)$ /$1 break; - } - } -} From 26bb457854c16745edc6fd38a9f6499a5ba3522c Mon Sep 17 00:00:00 2001 From: metalicn20 Date: Wed, 26 Jan 2022 13:56:41 +0330 Subject: [PATCH 02/24] Remove redundant network aliases --- Deployment/docker-compose.override.yml | 44 +++++++------------------- 1 file changed, 11 insertions(+), 33 deletions(-) diff --git a/Deployment/docker-compose.override.yml b/Deployment/docker-compose.override.yml index 27cfb9eeb..77346dcd3 100644 --- a/Deployment/docker-compose.override.yml +++ b/Deployment/docker-compose.override.yml @@ -56,87 +56,65 @@ services: - 127.0.0.1:8089:8089 - 127.0.0.1:1045:1044 networks: - opex: - aliases: - - accountant + - opex eventlog: ports: - 127.0.0.1:8090:8090 networks: - opex: - aliases: - - eventlog + - opex matching-engine: ports: - 127.0.0.1:8092:8092 - 127.0.0.1:1046:1044 networks: - opex: - aliases: - - matching-engine + - opex matching-gateway: ports: - 127.0.0.1:8093:8093 - 127.0.0.1:1047:1044 networks: - opex: - aliases: - - matching-gateway + - opex auth: ports: - 127.0.0.1:8083:8083 - 127.0.0.1:1048:1044 networks: - opex: - aliases: - - auth + - opex wallet: ports: - 127.0.0.1:8091:8091 - 127.0.0.1:1049:1044 networks: - opex: - aliases: - - wallet + - opex api: ports: - 127.0.0.1:8094:8094 - 127.0.0.1:1050:1044 networks: - opex: - aliases: - - api + - opex websocket: ports: - 127.0.0.1:8097:8097 - 127.0.0.1:1054:1044 networks: - opex: - aliases: - - websocket + - opex bc-gateway: ports: - 127.0.0.1:8095:8095 - 127.0.0.1:1052:1044 networks: - opex: - aliases: - - bc-gateway + - opex storage: ports: - 127.0.0.1:8096:8096 - 127.0.0.1:1053:1044 networks: - opex: - aliases: - - storage + - opex nginx: ports: - 80:80 networks: - opex: - aliases: - - opex_nginx + - opex networks: opex: driver: bridge From 9d87a6972b4e2863d8e48513fdbad69473da22c6 Mon Sep 17 00:00:00 2001 From: metalicn20 Date: Wed, 26 Jan 2022 15:47:27 +0330 Subject: [PATCH 03/24] Refactor jenkins configs and docker compose --- Deployment/.gitignore | 3 - Deployment/docker-compose.dev.yml | 120 ------------------ Deployment/docker-compose.override.yml | 120 ------------------ ...ev.groovy => Jenkinsfile.deploy.dev.groovy | 4 +- ...deploy.groovy => Jenkinsfile.deploy.groovy | 4 +- .../docker-compose.yml => docker-compose.yml | 96 +++++++++++--- .../src/main/resources/application-docker.yml | 4 +- 7 files changed, 80 insertions(+), 271 deletions(-) delete mode 100644 Deployment/.gitignore delete mode 100644 Deployment/docker-compose.dev.yml delete mode 100644 Deployment/docker-compose.override.yml rename Jenkins/Jenkinsfile.deploy.dev.groovy => Jenkinsfile.deploy.dev.groovy (89%) rename Jenkins/Jenkinsfile.deploy.groovy => Jenkinsfile.deploy.groovy (92%) rename Deployment/docker-compose.yml => docker-compose.yml (81%) diff --git a/Deployment/.gitignore b/Deployment/.gitignore deleted file mode 100644 index eaddd784f..000000000 --- a/Deployment/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -runtime/ -*.iml - diff --git a/Deployment/docker-compose.dev.yml b/Deployment/docker-compose.dev.yml deleted file mode 100644 index c1d0b27c0..000000000 --- a/Deployment/docker-compose.dev.yml +++ /dev/null @@ -1,120 +0,0 @@ -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 - eventlog: - ports: - - 127.0.0.1:8290:8090 - networks: - - opex-dev - matching-engine: - ports: - - 127.0.0.1:8292:8092 - - 127.0.0.1:1246:1044 - networks: - - opex-dev - matching-gateway: - ports: - - 127.0.0.1:8293:8093 - - 127.0.0.1:1147:1044 - networks: - - opex-dev - auth: - ports: - - 127.0.0.1:8283:8083 - - 127.0.0.1:1148:1044 - networks: - - opex-dev - wallet: - ports: - - 127.0.0.1:8291:8091 - - 127.0.0.1:1149:1044 - networks: - - opex-dev - api: - ports: - - 127.0.0.1:8294:8094 - - 127.0.0.1:1150:1044 - networks: - - opex-dev - websocket: - ports: - - 127.0.0.1:8297:8097 - - 127.0.0.1:1154:1044 - networks: - - opex-dev - bc-gateway: - ports: - - 127.0.0.1:8295:8095 - - 127.0.0.1:1152:1044 - networks: - - opex-dev - storage: - ports: - - 127.0.0.1:8296:8096 - - 127.0.0.1:1153:1044 - networks: - - opex-dev - nginx: - ports: - - 8086:80 - networks: - - opex-dev -networks: - opex-dev: - driver: bridge diff --git a/Deployment/docker-compose.override.yml b/Deployment/docker-compose.override.yml deleted file mode 100644 index 77346dcd3..000000000 --- a/Deployment/docker-compose.override.yml +++ /dev/null @@ -1,120 +0,0 @@ -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 - eventlog: - ports: - - 127.0.0.1:8090:8090 - networks: - - opex - matching-engine: - ports: - - 127.0.0.1:8092:8092 - - 127.0.0.1:1046:1044 - networks: - - opex - matching-gateway: - ports: - - 127.0.0.1:8093:8093 - - 127.0.0.1:1047:1044 - networks: - - opex - auth: - ports: - - 127.0.0.1:8083:8083 - - 127.0.0.1:1048:1044 - networks: - - opex - wallet: - ports: - - 127.0.0.1:8091:8091 - - 127.0.0.1:1049:1044 - networks: - - opex - api: - ports: - - 127.0.0.1:8094:8094 - - 127.0.0.1:1050:1044 - networks: - - opex - websocket: - ports: - - 127.0.0.1:8097:8097 - - 127.0.0.1:1054:1044 - networks: - - opex - bc-gateway: - ports: - - 127.0.0.1:8095:8095 - - 127.0.0.1:1052:1044 - networks: - - opex - storage: - ports: - - 127.0.0.1:8096:8096 - - 127.0.0.1:1053:1044 - networks: - - opex - nginx: - ports: - - 80:80 - networks: - - opex -networks: - opex: - driver: bridge diff --git a/Jenkins/Jenkinsfile.deploy.dev.groovy b/Jenkinsfile.deploy.dev.groovy similarity index 89% rename from Jenkins/Jenkinsfile.deploy.dev.groovy rename to Jenkinsfile.deploy.dev.groovy index 4c78c89b0..d3c13f40b 100644 --- a/Jenkins/Jenkinsfile.deploy.dev.groovy +++ b/Jenkinsfile.deploy.dev.groovy @@ -17,9 +17,7 @@ pipeline { DATA = '/var/opex/runtime-dev' } steps { - dir("Deployment") { - sh 'COMPOSE_PROJECT_NAME=dev docker-compose -f docker-compose.yml -f docker-compose.dev.yml up -d --build' - } + sh 'COMPOSE_PROJECT_NAME=dev DEFAULT_NETWORK_NAME=opex-dev docker-compose up -d --build' } } } diff --git a/Jenkins/Jenkinsfile.deploy.groovy b/Jenkinsfile.deploy.groovy similarity index 92% rename from Jenkins/Jenkinsfile.deploy.groovy rename to Jenkinsfile.deploy.groovy index f4ce7d7fb..bb6b2b16f 100644 --- a/Jenkins/Jenkinsfile.deploy.groovy +++ b/Jenkinsfile.deploy.groovy @@ -17,9 +17,7 @@ pipeline { DATA = '/var/opex/runtime' } steps { - dir("Deployment") { - sh 'COMPOSE_PROJECT_NAME=demo docker-compose up -d --build' - } + sh 'COMPOSE_PROJECT_NAME=demo DEFAULT_NETWORK_NAME=demo-opex docker-compose up -d --build' } } } diff --git a/Deployment/docker-compose.yml b/docker-compose.yml similarity index 81% rename from Deployment/docker-compose.yml rename to docker-compose.yml index 60ddbd042..7b3def1f5 100644 --- a/Deployment/docker-compose.yml +++ b/docker-compose.yml @@ -2,15 +2,21 @@ version: '3.8' services: zookeeper: image: 'docker.io/bitnami/zookeeper:3-debian-10' + ports: + - '127.0.0.1:2181-2191:2181' volumes: - $DATA/zookeeper_data:/bitnami environment: - ALLOW_ANONYMOUS_LOGIN=yes + networks: + - opex deploy: restart_policy: condition: on-failure kafka: image: 'docker.io/bitnami/kafka:2-debian-10' + ports: + - '127.0.0.1:9092-9192:9092' volumes: - $DATA/kafka-data:/bitnami environment: @@ -19,91 +25,126 @@ services: - KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092 depends_on: - zookeeper + networks: + - opex deploy: restart_policy: condition: on-failure consul: image: 'consul' + ports: + - '127.0.0.1:8500-8510:8500' + - '127.0.0.1:8300-8310:8300' + - '127.0.0.1:8600-8610:8600' environment: - CONSUL_BIND_INTERFACE=eth0 + networks: + - opex deploy: restart_policy: condition: on-failure redis: image: "redis:alpine" command: redis-server + ports: + - "127.0.0.1:6379-6389:6379" volumes: - $DATA/redis-data:/var/lib/redis - $DATA/redis.conf:/usr/local/etc/redis/redis.conf environment: - REDIS_REPLICATION_MODE=master + networks: + - opex deploy: restart_policy: condition: on-failure postgres-accountant: image: "postgres" + ports: + - "127.0.0.1:5432-5530:5432" environment: - POSTGRES_USER=opex - POSTGRES_PASSWORD=hiopex - POSTGRES_DB=opex_accountant volumes: - $DATA/accountant-data:/var/lib/postgresql/data/ + networks: + - opex postgres-eventlog: image: "postgres" + ports: + - "127.0.0.1:5432-5530:5432" environment: - POSTGRES_USER=opex - POSTGRES_PASSWORD=hiopex - POSTGRES_DB=opex_eventlog volumes: - $DATA/eventlog-data:/var/lib/postgresql/data/ + networks: + - opex postgres-auth: image: "postgres" + ports: + - "127.0.0.1:5432-5530:5432" environment: - POSTGRES_USER=opex - POSTGRES_PASSWORD=hiopex - POSTGRES_DB=opex_auth volumes: - $DATA/auth-data:/var/lib/postgresql/data/ + networks: + - opex deploy: restart_policy: condition: on-failure postgres-wallet: image: "postgres" + ports: + - "127.0.0.1:5432-5530:5432" environment: - POSTGRES_USER=opex - POSTGRES_PASSWORD=hiopex - POSTGRES_DB=opex_wallet volumes: - $DATA/wallet-data:/var/lib/postgresql/data/ + networks: + - opex deploy: restart_policy: condition: on-failure postgres-api: image: "postgres" + ports: + - "127.0.0.1:5432-5530:5432" environment: - POSTGRES_USER=opex - POSTGRES_PASSWORD=hiopex - POSTGRES_DB=opex_api volumes: - $DATA/api-data:/var/lib/postgresql/data/ + networks: + - opex deploy: restart_policy: condition: on-failure postgres-bc-gateway: image: "postgres" + ports: + - "127.0.0.1:5432-5530:5432" environment: - POSTGRES_USER=opex - POSTGRES_PASSWORD=hiopex - POSTGRES_DB=opex_bc_gateway volumes: - $DATA/bc-gateway-data:/var/lib/postgresql/data/ + networks: + - opex deploy: restart_policy: condition: on-failure accountant: build: - context: ../accountant/accountant-app - dockerfile: Dockerfile + context: accountant/accountant-app environment: - JAVA_OPTS=-Xmx256m -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=1044 - SPRING_PROFILES_ACTIVE=docker,demo,scheduled @@ -111,6 +152,8 @@ services: - REDIS_HOST=redis - CONSUL_HOST=consul - DB_IP_PORT=postgres-accountant + networks: + - opex depends_on: - zookeeper - kafka @@ -119,8 +162,7 @@ services: - postgres-accountant eventlog: build: - context: ../eventlog/eventlog-app - dockerfile: Dockerfile + context: eventlog/eventlog-app environment: - JAVA_OPTS=-Xmx256m - SPRING_PROFILES_ACTIVE=docker,demo @@ -128,6 +170,8 @@ services: - REDIS_HOST=redis - CONSUL_HOST=consul - DB_IP_PORT=postgres-eventlog + networks: + - opex depends_on: - zookeeper - kafka @@ -136,35 +180,36 @@ services: - postgres-eventlog matching-engine: build: - context: ../matching-engine/matching-engine-app - dockerfile: Dockerfile + context: matching-engine/matching-engine-app environment: - JAVA_OPTS=-Xmx256m -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=1044 - SPRING_PROFILES_ACTIVE=docker,demo - KAFKA_IP_PORT=kafka:9092 - REDIS_HOST=redis + networks: + - opex depends_on: - zookeeper - kafka - redis matching-gateway: build: - context: ../matching-gateway/matching-gateway-app - dockerfile: Dockerfile + context: matching-gateway/matching-gateway-app environment: - JAVA_OPTS=-Xmx256m -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=1044 - SPRING_PROFILES_DEFAULT=docker,demo - KAFKA_IP_PORT=kafka:9092 - REDIS_HOST=redis - CONSUL_HOST=consul + networks: + - opex depends_on: - zookeeper - kafka - consul auth: build: - context: ../user-management/keycloak-gateway - dockerfile: Dockerfile + context: user-management/keycloak-gateway environment: - JAVA_OPTS=-Xmx256m -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=1044 - SPRING_PROFILES_ACTIVE=docker,demo @@ -180,13 +225,14 @@ services: - redis - consul - postgres-auth + networks: + - opex deploy: restart_policy: condition: on-failure wallet: build: - context: ../wallet/wallet-app - dockerfile: Dockerfile + context: wallet/wallet-app environment: - JAVA_OPTS=-Xmx256m -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=1044 - SPRING_PROFILES_DEFAULT=docker,demo @@ -200,13 +246,14 @@ services: - redis - consul - postgres-wallet + networks: + - opex deploy: restart_policy: condition: on-failure api: build: - context: ../api/api-app - dockerfile: Dockerfile + context: api/api-app environment: - JAVA_OPTS=-Xmx256m -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=1044 - SPRING_PROFILES_DEFAULT=docker,demo @@ -220,13 +267,14 @@ services: - redis - consul - postgres-api + networks: + - opex deploy: restart_policy: condition: on-failure websocket: build: - context: ../websocket/websocket-app - dockerfile: Dockerfile + context: websocket/websocket-app environment: - JAVA_OPTS=-Xmx256m -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=1044 - SPRING_PROFILES_DEFAULT=docker @@ -238,13 +286,14 @@ services: - kafka - consul - postgres-api + networks: + - opex deploy: restart_policy: condition: on-failure bc-gateway: build: - context: ../bc-gateway/bc-gateway-app - dockerfile: Dockerfile + context: bc-gateway/bc-gateway-app environment: - JAVA_OPTS=-Xmx256m -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=1044 - SPRING_PROFILES_DEFAULT=docker,demo,scheduled @@ -258,13 +307,14 @@ services: - redis - consul - postgres-bc-gateway + networks: + - opex deploy: restart_policy: condition: on-failure storage: build: - context: ../storage/storage-app - dockerfile: Dockerfile + context: storage/storage-app environment: - JAVA_OPTS=-Xmx256m -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=1044 - SPRING_PROFILES_DEFAULT=docker @@ -274,6 +324,12 @@ services: - $DATA/storage-data:/storage depends_on: - consul + networks: + - opex deploy: restart_policy: condition: on-failure +networks: + opex: + name: ${DEFAULT_NETWORK_NAME} + driver: bridge diff --git a/user-management/keycloak-gateway/src/main/resources/application-docker.yml b/user-management/keycloak-gateway/src/main/resources/application-docker.yml index f52df428b..7f2dd762d 100644 --- a/user-management/keycloak-gateway/src/main/resources/application-docker.yml +++ b/user-management/keycloak-gateway/src/main/resources/application-docker.yml @@ -13,5 +13,5 @@ spring: keycloak: migration: file: /opex-master-realm.json - adminUrl: https://api.opex.dev/auth - frontendUrl: https://api.opex.dev/auth +# adminUrl: https://api.opex.dev/auth +# frontendUrl: https://api.opex.dev/auth From 0af7b5ce93c8f7052becc7afada981ec97658d4a Mon Sep 17 00:00:00 2001 From: metalicn20 Date: Wed, 26 Jan 2022 16:44:07 +0330 Subject: [PATCH 04/24] Set all app ports to 8080 --- accountant/accountant-app/src/main/resources/application.yml | 2 +- api/api-app/src/main/resources/application.yml | 2 +- bc-gateway/bc-gateway-app/src/main/resources/application.yml | 2 +- eventlog/eventlog-app/src/main/resources/application.yml | 2 +- .../matching-engine-app/src/main/resources/application.yml | 2 +- .../matching-gateway-app/src/main/resources/application.yml | 2 +- storage/storage-app/src/main/resources/application.yml | 2 +- .../src/main/resources/application-docker.yml | 4 ++-- .../keycloak-gateway/src/main/resources/application.yml | 2 +- wallet/wallet-app/src/main/resources/application.yml | 2 +- websocket/websocket-app/src/main/resources/application.yml | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/accountant/accountant-app/src/main/resources/application.yml b/accountant/accountant-app/src/main/resources/application.yml index eb96dcbd9..f850b0f64 100644 --- a/accountant/accountant-app/src/main/resources/application.yml +++ b/accountant/accountant-app/src/main/resources/application.yml @@ -1,4 +1,4 @@ -server.port: 8089 +server.port: 8080 logging: level: co.nilin: DEBUG diff --git a/api/api-app/src/main/resources/application.yml b/api/api-app/src/main/resources/application.yml index d2e031949..56200aa38 100644 --- a/api/api-app/src/main/resources/application.yml +++ b/api/api-app/src/main/resources/application.yml @@ -1,4 +1,4 @@ -server.port: 8094 +Seserver.port: 8080 logging: level: co.nilin: DEBUG diff --git a/bc-gateway/bc-gateway-app/src/main/resources/application.yml b/bc-gateway/bc-gateway-app/src/main/resources/application.yml index c1698dc75..9a5e94893 100644 --- a/bc-gateway/bc-gateway-app/src/main/resources/application.yml +++ b/bc-gateway/bc-gateway-app/src/main/resources/application.yml @@ -1,4 +1,4 @@ -server.port: 8095 +server.port: 8080 spring: application: name: opex-bc-gateway diff --git a/eventlog/eventlog-app/src/main/resources/application.yml b/eventlog/eventlog-app/src/main/resources/application.yml index 51929e3d6..84ad9a066 100644 --- a/eventlog/eventlog-app/src/main/resources/application.yml +++ b/eventlog/eventlog-app/src/main/resources/application.yml @@ -1,4 +1,4 @@ -server.port: 8090 +server.port: 8080 spring: kafka: bootstrap-servers: localhost:9092 diff --git a/matching-engine/matching-engine-app/src/main/resources/application.yml b/matching-engine/matching-engine-app/src/main/resources/application.yml index bfb7b297e..a5bfe5b81 100644 --- a/matching-engine/matching-engine-app/src/main/resources/application.yml +++ b/matching-engine/matching-engine-app/src/main/resources/application.yml @@ -1,4 +1,4 @@ -server.port: 8092 +server.port: 8080 spring: main: allow-bean-definition-overriding: false diff --git a/matching-gateway/matching-gateway-app/src/main/resources/application.yml b/matching-gateway/matching-gateway-app/src/main/resources/application.yml index 79c864f43..085d4471a 100644 --- a/matching-gateway/matching-gateway-app/src/main/resources/application.yml +++ b/matching-gateway/matching-gateway-app/src/main/resources/application.yml @@ -1,4 +1,4 @@ -server.port: 8093 +server.port: 8080 logging: level: co.nilin: DEBUG diff --git a/storage/storage-app/src/main/resources/application.yml b/storage/storage-app/src/main/resources/application.yml index d0a341d9e..38fa05b3e 100644 --- a/storage/storage-app/src/main/resources/application.yml +++ b/storage/storage-app/src/main/resources/application.yml @@ -1,4 +1,4 @@ -server.port: 8096 +server.port: 8080 logging: level: diff --git a/user-management/keycloak-gateway/src/main/resources/application-docker.yml b/user-management/keycloak-gateway/src/main/resources/application-docker.yml index 7f2dd762d..f52df428b 100644 --- a/user-management/keycloak-gateway/src/main/resources/application-docker.yml +++ b/user-management/keycloak-gateway/src/main/resources/application-docker.yml @@ -13,5 +13,5 @@ spring: keycloak: migration: file: /opex-master-realm.json -# adminUrl: https://api.opex.dev/auth -# frontendUrl: https://api.opex.dev/auth + adminUrl: https://api.opex.dev/auth + frontendUrl: https://api.opex.dev/auth diff --git a/user-management/keycloak-gateway/src/main/resources/application.yml b/user-management/keycloak-gateway/src/main/resources/application.yml index db3942635..8fc0d277f 100644 --- a/user-management/keycloak-gateway/src/main/resources/application.yml +++ b/user-management/keycloak-gateway/src/main/resources/application.yml @@ -1,4 +1,4 @@ -server.port: 8083 +server.port: 8080 spring: application: name: opex-auth diff --git a/wallet/wallet-app/src/main/resources/application.yml b/wallet/wallet-app/src/main/resources/application.yml index 4fba204a6..6f8b0ddc7 100644 --- a/wallet/wallet-app/src/main/resources/application.yml +++ b/wallet/wallet-app/src/main/resources/application.yml @@ -1,4 +1,4 @@ -server.port: 8091 +server.port: 8080 spring: application: name: opex-wallet diff --git a/websocket/websocket-app/src/main/resources/application.yml b/websocket/websocket-app/src/main/resources/application.yml index e7df088d6..099f9fd35 100644 --- a/websocket/websocket-app/src/main/resources/application.yml +++ b/websocket/websocket-app/src/main/resources/application.yml @@ -1,5 +1,5 @@ server: - port: 8097 + port: 8080 spring: application: name: opex-websocket From 08d20e8351bc51d11b261deaff3d9ae58f1f5370 Mon Sep 17 00:00:00 2001 From: metalicn20 Date: Wed, 26 Jan 2022 16:54:35 +0330 Subject: [PATCH 05/24] Add fallback value to network config --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 7b3def1f5..ef3a01fb9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -331,5 +331,5 @@ services: condition: on-failure networks: opex: - name: ${DEFAULT_NETWORK_NAME} + name: ${DEFAULT_NETWORK_NAME:-opex} driver: bridge From 2f7529f6e1704b5fc09e80c42000e205257045f7 Mon Sep 17 00:00:00 2001 From: metalicn20 Date: Wed, 26 Jan 2022 17:02:28 +0330 Subject: [PATCH 06/24] Rename network --- docker-compose.yml | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index ef3a01fb9..3bfc393cd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,7 +9,7 @@ services: environment: - ALLOW_ANONYMOUS_LOGIN=yes networks: - - opex + - default deploy: restart_policy: condition: on-failure @@ -26,7 +26,7 @@ services: depends_on: - zookeeper networks: - - opex + - default deploy: restart_policy: condition: on-failure @@ -39,7 +39,7 @@ services: environment: - CONSUL_BIND_INTERFACE=eth0 networks: - - opex + - default deploy: restart_policy: condition: on-failure @@ -54,7 +54,7 @@ services: environment: - REDIS_REPLICATION_MODE=master networks: - - opex + - default deploy: restart_policy: condition: on-failure @@ -69,7 +69,7 @@ services: volumes: - $DATA/accountant-data:/var/lib/postgresql/data/ networks: - - opex + - default postgres-eventlog: image: "postgres" ports: @@ -81,7 +81,7 @@ services: volumes: - $DATA/eventlog-data:/var/lib/postgresql/data/ networks: - - opex + - default postgres-auth: image: "postgres" ports: @@ -93,7 +93,7 @@ services: volumes: - $DATA/auth-data:/var/lib/postgresql/data/ networks: - - opex + - default deploy: restart_policy: condition: on-failure @@ -108,7 +108,7 @@ services: volumes: - $DATA/wallet-data:/var/lib/postgresql/data/ networks: - - opex + - default deploy: restart_policy: condition: on-failure @@ -123,7 +123,7 @@ services: volumes: - $DATA/api-data:/var/lib/postgresql/data/ networks: - - opex + - default deploy: restart_policy: condition: on-failure @@ -138,7 +138,7 @@ services: volumes: - $DATA/bc-gateway-data:/var/lib/postgresql/data/ networks: - - opex + - default deploy: restart_policy: condition: on-failure @@ -153,7 +153,7 @@ services: - CONSUL_HOST=consul - DB_IP_PORT=postgres-accountant networks: - - opex + - default depends_on: - zookeeper - kafka @@ -171,7 +171,7 @@ services: - CONSUL_HOST=consul - DB_IP_PORT=postgres-eventlog networks: - - opex + - default depends_on: - zookeeper - kafka @@ -187,7 +187,7 @@ services: - KAFKA_IP_PORT=kafka:9092 - REDIS_HOST=redis networks: - - opex + - default depends_on: - zookeeper - kafka @@ -202,7 +202,7 @@ services: - REDIS_HOST=redis - CONSUL_HOST=consul networks: - - opex + - default depends_on: - zookeeper - kafka @@ -226,7 +226,7 @@ services: - consul - postgres-auth networks: - - opex + - default deploy: restart_policy: condition: on-failure @@ -247,7 +247,7 @@ services: - consul - postgres-wallet networks: - - opex + - default deploy: restart_policy: condition: on-failure @@ -268,7 +268,7 @@ services: - consul - postgres-api networks: - - opex + - default deploy: restart_policy: condition: on-failure @@ -287,7 +287,7 @@ services: - consul - postgres-api networks: - - opex + - default deploy: restart_policy: condition: on-failure @@ -308,7 +308,7 @@ services: - consul - postgres-bc-gateway networks: - - opex + - default deploy: restart_policy: condition: on-failure @@ -325,11 +325,11 @@ services: depends_on: - consul networks: - - opex + - default deploy: restart_policy: condition: on-failure networks: - opex: + default: name: ${DEFAULT_NETWORK_NAME:-opex} driver: bridge From a03cde0091632be50f35867c633c8d7c94f77719 Mon Sep 17 00:00:00 2001 From: metalicn20 Date: Sat, 29 Jan 2022 13:24:33 +0330 Subject: [PATCH 07/24] Refactor docker-compose configs --- Jenkinsfile.deploy.dev.groovy | 2 +- docker-compose.dev.yml | 25 +++++++++++++++++++++++++ docker-compose.override.yml | 25 +++++++++++++++++++++++++ docker-compose.yml | 22 ---------------------- 4 files changed, 51 insertions(+), 23 deletions(-) create mode 100644 docker-compose.dev.yml create mode 100644 docker-compose.override.yml diff --git a/Jenkinsfile.deploy.dev.groovy b/Jenkinsfile.deploy.dev.groovy index d3c13f40b..169714242 100644 --- a/Jenkinsfile.deploy.dev.groovy +++ b/Jenkinsfile.deploy.dev.groovy @@ -17,7 +17,7 @@ pipeline { DATA = '/var/opex/runtime-dev' } steps { - sh 'COMPOSE_PROJECT_NAME=dev DEFAULT_NETWORK_NAME=opex-dev docker-compose up -d --build' + sh 'COMPOSE_PROJECT_NAME=dev DEFAULT_NETWORK_NAME=dev-opex docker-compose up -f docker-compose.yml -f docker-compose.dev.yml -d --build' } } } diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml new file mode 100644 index 000000000..ea9176771 --- /dev/null +++ b/docker-compose.dev.yml @@ -0,0 +1,25 @@ +version: '3.8' +services: + consul: + ports: + - "127.0.0.1:8501:8500" + - "127.0.0.1:8301:8300" + - "127.0.0.1:8601:8600" + postgres-accountant: + ports: + - "127.0.0.1:5442:5432" + postgres-eventlog: + ports: + - "127.0.0.1:5443:5432" + postgres-auth: + ports: + - "127.0.0.1:5444:5432" + postgres-wallet: + ports: + - "127.0.0.1:5445:5432" + postgres-api: + ports: + - "127.0.0.1:5446:5432" + postgres-bc-gateway: + ports: + - "127.0.0.1:5447:5432" \ No newline at end of file diff --git a/docker-compose.override.yml b/docker-compose.override.yml new file mode 100644 index 000000000..f6f738f06 --- /dev/null +++ b/docker-compose.override.yml @@ -0,0 +1,25 @@ +version: '3.8' +services: + consul: + ports: + - "127.0.0.1:8500:8500" + - "127.0.0.1:8300:8300" + - "127.0.0.1:8600:8600" + postgres-accountant: + ports: + - "127.0.0.1:5432:5432" + postgres-eventlog: + ports: + - "127.0.0.1:5433:5432" + postgres-auth: + ports: + - "127.0.0.1:5434:5432" + postgres-wallet: + ports: + - "127.0.0.1:5435:5432" + postgres-api: + ports: + - "127.0.0.1:5436:5432" + postgres-bc-gateway: + ports: + - "127.0.0.1:5437:5432" \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 3bfc393cd..3fcd6d12c 100644 --- a/docker-compose.yml +++ b/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-2191: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-9192:9092' volumes: - $DATA/kafka-data:/bitnami environment: @@ -32,10 +28,6 @@ services: condition: on-failure consul: image: 'consul' - ports: - - '127.0.0.1:8500-8510:8500' - - '127.0.0.1:8300-8310:8300' - - '127.0.0.1:8600-8610: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-6389: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:5432-5530:5432" environment: - POSTGRES_USER=opex - POSTGRES_PASSWORD=hiopex @@ -72,8 +60,6 @@ services: - default postgres-eventlog: image: "postgres" - ports: - - "127.0.0.1:5432-5530:5432" environment: - POSTGRES_USER=opex - POSTGRES_PASSWORD=hiopex @@ -84,8 +70,6 @@ services: - default postgres-auth: image: "postgres" - ports: - - "127.0.0.1:5432-5530: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:5432-5530: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:5432-5530: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:5432-5530:5432" environment: - POSTGRES_USER=opex - POSTGRES_PASSWORD=hiopex From e954b48c07be9d3a28a425899f421334c5d3f3f9 Mon Sep 17 00:00:00 2001 From: metalicn20 Date: Sat, 29 Jan 2022 13:31:53 +0330 Subject: [PATCH 08/24] Add remove orphans to docker-compose startup script --- Jenkinsfile.deploy.dev.groovy | 2 +- Jenkinsfile.deploy.groovy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile.deploy.dev.groovy b/Jenkinsfile.deploy.dev.groovy index 169714242..6cfc0fe70 100644 --- a/Jenkinsfile.deploy.dev.groovy +++ b/Jenkinsfile.deploy.dev.groovy @@ -17,7 +17,7 @@ pipeline { DATA = '/var/opex/runtime-dev' } steps { - sh 'COMPOSE_PROJECT_NAME=dev DEFAULT_NETWORK_NAME=dev-opex docker-compose up -f docker-compose.yml -f docker-compose.dev.yml -d --build' + sh 'COMPOSE_PROJECT_NAME=dev DEFAULT_NETWORK_NAME=dev-opex docker-compose up -f docker-compose.yml -f docker-compose.dev.yml -d --build --remove-orphans' } } } diff --git a/Jenkinsfile.deploy.groovy b/Jenkinsfile.deploy.groovy index bb6b2b16f..a5fd142b8 100644 --- a/Jenkinsfile.deploy.groovy +++ b/Jenkinsfile.deploy.groovy @@ -17,7 +17,7 @@ pipeline { DATA = '/var/opex/runtime' } steps { - sh 'COMPOSE_PROJECT_NAME=demo DEFAULT_NETWORK_NAME=demo-opex docker-compose up -d --build' + sh 'COMPOSE_PROJECT_NAME=demo DEFAULT_NETWORK_NAME=demo-opex docker-compose up -d --build --remove-orphans' } } } From 363e94d7895d1c47db21f29d06ba98184c5d3e7a Mon Sep 17 00:00:00 2001 From: metalicn20 Date: Sat, 29 Jan 2022 14:05:51 +0330 Subject: [PATCH 09/24] Refactor jenkins configuration files --- Jenkinsfile.deploy.groovy => Jenkinsfile | 4 +++- Jenkinsfile.deploy.dev.groovy => dev.Jenkinsfile | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) rename Jenkinsfile.deploy.groovy => Jenkinsfile (90%) rename Jenkinsfile.deploy.dev.groovy => dev.Jenkinsfile (88%) diff --git a/Jenkinsfile.deploy.groovy b/Jenkinsfile similarity index 90% rename from Jenkinsfile.deploy.groovy rename to Jenkinsfile index a5fd142b8..f255fd6ed 100644 --- a/Jenkinsfile.deploy.groovy +++ b/Jenkinsfile @@ -15,9 +15,11 @@ pipeline { stage('Deliver') { environment { DATA = '/var/opex/runtime' + COMPOSE_PROJECT_NAME='demo' + DEFAULT_NETWORK_NAME='demo-opex' } steps { - sh 'COMPOSE_PROJECT_NAME=demo DEFAULT_NETWORK_NAME=demo-opex docker-compose up -d --build --remove-orphans' + sh 'docker-compose up -d --build --remove-orphans' } } } diff --git a/Jenkinsfile.deploy.dev.groovy b/dev.Jenkinsfile similarity index 88% rename from Jenkinsfile.deploy.dev.groovy rename to dev.Jenkinsfile index 6cfc0fe70..5a89a0d3b 100644 --- a/Jenkinsfile.deploy.dev.groovy +++ b/dev.Jenkinsfile @@ -15,9 +15,11 @@ pipeline { stage('Deliver') { environment { DATA = '/var/opex/runtime-dev' + COMPOSE_PROJECT_NAME='dev' + DEFAULT_NETWORK_NAME='dev-opex' } steps { - sh 'COMPOSE_PROJECT_NAME=dev DEFAULT_NETWORK_NAME=dev-opex docker-compose up -f docker-compose.yml -f docker-compose.dev.yml -d --build --remove-orphans' + sh 'docker-compose up -f docker-compose.yml -f docker-compose.dev.yml -d --build --remove-orphans' } } } From 426b74d1cdabcb47b26be638ffaa966cef9874c8 Mon Sep 17 00:00:00 2001 From: metalicn20 Date: Sat, 29 Jan 2022 15:28:28 +0330 Subject: [PATCH 10/24] Resolve docker-compose config issues --- docker-compose.yml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 9eae05268..3b6234e23 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,6 +9,8 @@ services: environment: - ALLOW_ANONYMOUS_LOGIN=yes - ZOOKEEPER_CLIENT_PORT=2181 + networks: + - default deploy: restart_policy: condition: on-failure @@ -28,6 +30,8 @@ services: - KAFKA_UNCLEAN_LEADER_ELECTION_ENABLE=false depends_on: - zookeeper + networks: + - default deploy: restart_policy: condition: on-failure @@ -47,6 +51,8 @@ services: - KAFKA_UNCLEAN_LEADER_ELECTION_ENABLE=false depends_on: - zookeeper + networks: + - default deploy: restart_policy: condition: on-failure @@ -101,6 +107,8 @@ services: - POSTGRES_DB=opex_accountant volumes: - $DATA/accountant-data:/var/lib/postgresql/data/ + networks: + - default akhq: container_name: akhq image: tchiotludo/akhq @@ -111,6 +119,8 @@ services: docker-kafka-server: properties: bootstrap.servers: "kafka-1:29092,kafka-2:29092,kafka-3:29092" + networks: + - default depends_on: - kafka-1 - kafka-2 @@ -192,6 +202,8 @@ services: depends_on: - zookeeper - kafka-1 + - kafka-2 + - kafka-3 - redis - consul - postgres-accountant @@ -346,13 +358,9 @@ services: environment: - JAVA_OPTS=-Xmx256m -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=1044 - SPRING_PROFILES_DEFAULT=docker,demo,scheduled - - KAFKA_IP_PORT=kafka-1:29092,kafka-2:29092,kafka-3:29092 - - REDIS_HOST=redis - CONSUL_HOST=consul - DB_IP_PORT=postgres-bc-gateway depends_on: - - zookeeper - - kafka-1 - redis - consul - postgres-bc-gateway From 40cde5541284ef2e6a898b1eabb05f402a43c2d6 Mon Sep 17 00:00:00 2001 From: metalicn20 Date: Sat, 29 Jan 2022 17:03:41 +0330 Subject: [PATCH 11/24] Update jvm target version in kotlin-maven-plugin --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9151f1713..afb5cd927 100644 --- a/pom.xml +++ b/pom.xml @@ -94,7 +94,7 @@ spring - 1.8 + ${java.version} From fd312312700bec74b5689ffe9c299f14d3536fd1 Mon Sep 17 00:00:00 2001 From: metalicn20 Date: Sat, 29 Jan 2022 17:04:45 +0330 Subject: [PATCH 12/24] Remove anonymous volumes in docker files --- accountant/accountant-app/Dockerfile | 1 - api/api-app/Dockerfile | 1 - bc-gateway/bc-gateway-app/Dockerfile | 1 - eventlog/eventlog-app/Dockerfile | 1 - matching-engine/matching-engine-app/Dockerfile | 1 - matching-gateway/matching-gateway-app/Dockerfile | 1 - storage/storage-app/Dockerfile | 1 - user-management/keycloak-gateway/Dockerfile | 1 - wallet/wallet-app/Dockerfile | 1 - websocket/websocket-app/Dockerfile | 1 - 10 files changed, 10 deletions(-) diff --git a/accountant/accountant-app/Dockerfile b/accountant/accountant-app/Dockerfile index 6916b628a..7c71f9447 100644 --- a/accountant/accountant-app/Dockerfile +++ b/accountant/accountant-app/Dockerfile @@ -1,5 +1,4 @@ FROM openjdk:11 -VOLUME /tmp ARG JAR_FILE=target/*.jar COPY ${JAR_FILE} app.jar ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS} -jar /app.jar"] \ No newline at end of file diff --git a/api/api-app/Dockerfile b/api/api-app/Dockerfile index 6916b628a..7c71f9447 100644 --- a/api/api-app/Dockerfile +++ b/api/api-app/Dockerfile @@ -1,5 +1,4 @@ FROM openjdk:11 -VOLUME /tmp ARG JAR_FILE=target/*.jar COPY ${JAR_FILE} app.jar ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS} -jar /app.jar"] \ No newline at end of file diff --git a/bc-gateway/bc-gateway-app/Dockerfile b/bc-gateway/bc-gateway-app/Dockerfile index 6916b628a..7c71f9447 100644 --- a/bc-gateway/bc-gateway-app/Dockerfile +++ b/bc-gateway/bc-gateway-app/Dockerfile @@ -1,5 +1,4 @@ FROM openjdk:11 -VOLUME /tmp ARG JAR_FILE=target/*.jar COPY ${JAR_FILE} app.jar ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS} -jar /app.jar"] \ No newline at end of file diff --git a/eventlog/eventlog-app/Dockerfile b/eventlog/eventlog-app/Dockerfile index 6916b628a..7c71f9447 100644 --- a/eventlog/eventlog-app/Dockerfile +++ b/eventlog/eventlog-app/Dockerfile @@ -1,5 +1,4 @@ FROM openjdk:11 -VOLUME /tmp ARG JAR_FILE=target/*.jar COPY ${JAR_FILE} app.jar ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS} -jar /app.jar"] \ No newline at end of file diff --git a/matching-engine/matching-engine-app/Dockerfile b/matching-engine/matching-engine-app/Dockerfile index 6916b628a..7c71f9447 100644 --- a/matching-engine/matching-engine-app/Dockerfile +++ b/matching-engine/matching-engine-app/Dockerfile @@ -1,5 +1,4 @@ FROM openjdk:11 -VOLUME /tmp ARG JAR_FILE=target/*.jar COPY ${JAR_FILE} app.jar ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS} -jar /app.jar"] \ No newline at end of file diff --git a/matching-gateway/matching-gateway-app/Dockerfile b/matching-gateway/matching-gateway-app/Dockerfile index 6916b628a..7c71f9447 100644 --- a/matching-gateway/matching-gateway-app/Dockerfile +++ b/matching-gateway/matching-gateway-app/Dockerfile @@ -1,5 +1,4 @@ FROM openjdk:11 -VOLUME /tmp ARG JAR_FILE=target/*.jar COPY ${JAR_FILE} app.jar ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS} -jar /app.jar"] \ No newline at end of file diff --git a/storage/storage-app/Dockerfile b/storage/storage-app/Dockerfile index 6916b628a..7c71f9447 100644 --- a/storage/storage-app/Dockerfile +++ b/storage/storage-app/Dockerfile @@ -1,5 +1,4 @@ FROM openjdk:11 -VOLUME /tmp ARG JAR_FILE=target/*.jar COPY ${JAR_FILE} app.jar ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS} -jar /app.jar"] \ No newline at end of file diff --git a/user-management/keycloak-gateway/Dockerfile b/user-management/keycloak-gateway/Dockerfile index f36cf6e44..155436997 100644 --- a/user-management/keycloak-gateway/Dockerfile +++ b/user-management/keycloak-gateway/Dockerfile @@ -1,5 +1,4 @@ FROM openjdk:11 -VOLUME /tmp ARG JAR_FILE=target/*.jar COPY ${JAR_FILE} app.jar COPY target/classes/opex-master-realm.json opex-master-realm.json diff --git a/wallet/wallet-app/Dockerfile b/wallet/wallet-app/Dockerfile index 6916b628a..7c71f9447 100644 --- a/wallet/wallet-app/Dockerfile +++ b/wallet/wallet-app/Dockerfile @@ -1,5 +1,4 @@ FROM openjdk:11 -VOLUME /tmp ARG JAR_FILE=target/*.jar COPY ${JAR_FILE} app.jar ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS} -jar /app.jar"] \ No newline at end of file diff --git a/websocket/websocket-app/Dockerfile b/websocket/websocket-app/Dockerfile index 6916b628a..7c71f9447 100644 --- a/websocket/websocket-app/Dockerfile +++ b/websocket/websocket-app/Dockerfile @@ -1,5 +1,4 @@ FROM openjdk:11 -VOLUME /tmp ARG JAR_FILE=target/*.jar COPY ${JAR_FILE} app.jar ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS} -jar /app.jar"] \ No newline at end of file From e784f9db630175d60074eae9fa4f638c4d2d41c6 Mon Sep 17 00:00:00 2001 From: metalicn20 Date: Sat, 29 Jan 2022 17:24:36 +0330 Subject: [PATCH 13/24] Update Jenkins file --- Jenkinsfile | 4 ++-- dev.Jenkinsfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f255fd6ed..b0f931959 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -15,8 +15,8 @@ pipeline { stage('Deliver') { environment { DATA = '/var/opex/runtime' - COMPOSE_PROJECT_NAME='demo' - DEFAULT_NETWORK_NAME='demo-opex' + COMPOSE_PROJECT_NAME = 'demo' + DEFAULT_NETWORK_NAME = 'demo-opex' } steps { sh 'docker-compose up -d --build --remove-orphans' diff --git a/dev.Jenkinsfile b/dev.Jenkinsfile index 5a89a0d3b..11d4d5cdc 100644 --- a/dev.Jenkinsfile +++ b/dev.Jenkinsfile @@ -15,8 +15,8 @@ pipeline { stage('Deliver') { environment { DATA = '/var/opex/runtime-dev' - COMPOSE_PROJECT_NAME='dev' - DEFAULT_NETWORK_NAME='dev-opex' + COMPOSE_PROJECT_NAME = 'dev' + DEFAULT_NETWORK_NAME = 'dev-opex' } steps { sh 'docker-compose up -f docker-compose.yml -f docker-compose.dev.yml -d --build --remove-orphans' From c12c70fdf1a3f934f3b27f679c5ed19c841d42dc Mon Sep 17 00:00:00 2001 From: metalicn20 Date: Sat, 29 Jan 2022 17:31:06 +0330 Subject: [PATCH 14/24] Cleanup docker-compose configs --- docker-compose.override.yml | 12 ------------ docker-compose.yml | 1 - 2 files changed, 13 deletions(-) diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 591cd076b..f6f738f06 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -1,17 +1,5 @@ version: '3.8' services: - kafka-1: - environment: - - KAFKA_LISTENERS=CLIENT://kafka-1:29092,EXTERNAL://kafka-1:9092 - - KAFKA_ADVERTISED_LISTENERS=CLIENT://kafka-1:29092,EXTERNAL://kafka-1:9092 - kafka-2: - environment: - - KAFKA_LISTENERS=CLIENT://kafka-2:29092,EXTERNAL://kafka-2:9092 - - KAFKA_ADVERTISED_LISTENERS=CLIENT://kafka-2:29092,EXTERNAL://kafka-2:9092 - kafka-3: - environment: - - KAFKA_LISTENERS=CLIENT://kafka-3:29092,EXTERNAL://kafka-3:9092 - - KAFKA_ADVERTISED_LISTENERS=CLIENT://kafka-3:29092,EXTERNAL://kafka-3:9092 consul: ports: - "127.0.0.1:8500:8500" diff --git a/docker-compose.yml b/docker-compose.yml index 3b6234e23..b373e2e4c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -110,7 +110,6 @@ services: networks: - default akhq: - container_name: akhq image: tchiotludo/akhq environment: AKHQ_CONFIGURATION: | From ac4959ec474d777bb492c67ce0e7cc1fc0b08da8 Mon Sep 17 00:00:00 2001 From: metalicn20 Date: Sun, 30 Jan 2022 13:07:56 +0330 Subject: [PATCH 15/24] Fix typo in server port --- api/api-app/src/main/resources/application.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/api-app/src/main/resources/application.yml b/api/api-app/src/main/resources/application.yml index ab94221f5..674332726 100644 --- a/api/api-app/src/main/resources/application.yml +++ b/api/api-app/src/main/resources/application.yml @@ -1,4 +1,4 @@ -Seserver.port: 8080 +server.port: 8080 logging: level: co.nilin: DEBUG From 5b2783e20de5b918b1c7aaec7e2669e5ae1d1c75 Mon Sep 17 00:00:00 2001 From: metalicn20 Date: Sun, 30 Jan 2022 13:48:28 +0330 Subject: [PATCH 16/24] Change chain scan gateway addresses --- .../bc-gateway-persister-postgres/src/main/resources/data.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bc-gateway/bc-gateway-ports/bc-gateway-persister-postgres/src/main/resources/data.sql b/bc-gateway/bc-gateway-ports/bc-gateway-persister-postgres/src/main/resources/data.sql index 46b75cd54..8e862f711 100644 --- a/bc-gateway/bc-gateway-ports/bc-gateway-persister-postgres/src/main/resources/data.sql +++ b/bc-gateway/bc-gateway-ports/bc-gateway-persister-postgres/src/main/resources/data.sql @@ -40,8 +40,8 @@ ON CONFLICT DO NOTHING; SELECT setval(pg_get_serial_sequence('currency_implementations', 'id'), (SELECT MAX(id) FROM currency_implementations)); INSERT INTO chain_endpoints(id, chain_name, endpoint_url) -VALUES (1, 'bitcoin', 'http://host.docker.internal:9990/bitcoin/transfers'), - (2, 'ethereum', 'http://host.docker.internal:9990/eth/transfers') +VALUES (1, 'bitcoin', 'lb://gateway/bitcoin/transfers'), + (2, 'ethereum', 'lb://gateway/eth/transfers') ON CONFLICT DO NOTHING; INSERT INTO chain_sync_schedules From 6ff29f507d52dedeb54ba6f3732ad1b34c2f2fba Mon Sep 17 00:00:00 2001 From: metalicn20 Date: Sun, 30 Jan 2022 15:26:58 +0330 Subject: [PATCH 17/24] Update java version in git flows --- .github/workflows/pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index f29f64684..5d69ee53d 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - java: [ 13 ] + java: [ 11 ] name: Opex with java ${{ matrix.java }} build steps: - name: Checkout Source Code From 32ce49c4210ac0e2107fb365926f25e0c58b08e9 Mon Sep 17 00:00:00 2001 From: metalicn20 Date: Sun, 6 Feb 2022 11:23:33 +0330 Subject: [PATCH 18/24] Rename compose project name in Jenkinsfile --- Jenkinsfile | 2 +- dev.Jenkinsfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 10fe6d30b..7e9862c3a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -20,7 +20,7 @@ pipeline { SMTP_PASS = credentials("smtp-secret") DB_USER = 'opex' DB_PASS = credentials("db-secret") - COMPOSE_PROJECT_NAME = 'demo' + COMPOSE_PROJECT_NAME = 'demo-core' DEFAULT_NETWORK_NAME = 'demo-opex' } steps { diff --git a/dev.Jenkinsfile b/dev.Jenkinsfile index 9193bc99f..344d1cf4c 100644 --- a/dev.Jenkinsfile +++ b/dev.Jenkinsfile @@ -20,7 +20,7 @@ pipeline { SMTP_PASS = credentials("smtp-secret-dev") DB_USER = 'opex' DB_PASS = credentials("db-secret-dev") - COMPOSE_PROJECT_NAME = 'dev' + COMPOSE_PROJECT_NAME = 'dev-core' DEFAULT_NETWORK_NAME = 'dev-opex' } steps { From 0a782cb37c5b08714a4dfbd5b541ef2133c8b9b9 Mon Sep 17 00:00:00 2001 From: metalicn20 Date: Sun, 6 Feb 2022 11:43:35 +0330 Subject: [PATCH 19/24] Update DATA value in Jenkins --- Jenkinsfile | 2 +- dev.Jenkinsfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7e9862c3a..c5ef0f68b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,7 +14,7 @@ pipeline { } stage('Deliver') { environment { - DATA = '/var/opex/runtime' + DATA = '/var/opex/demo-core' PANEL_PASS = credentials("v-panel-secret") BACKEND_USER = credentials("v-backend-secret") SMTP_PASS = credentials("smtp-secret") diff --git a/dev.Jenkinsfile b/dev.Jenkinsfile index 344d1cf4c..472ffdb5c 100644 --- a/dev.Jenkinsfile +++ b/dev.Jenkinsfile @@ -14,7 +14,7 @@ pipeline { } stage('Deliver') { environment { - DATA = '/var/opex/runtime-dev' + DATA = '/var/opex/dev-core' PANEL_PASS = credentials("v-panel-secret-dev") BACKEND_USER = credentials("v-backend-secret-dev") SMTP_PASS = credentials("smtp-secret-dev") From ae0e072a4df6af8fde449a2d9753f0c7702d7dff Mon Sep 17 00:00:00 2001 From: metalicn20 Date: Sun, 6 Feb 2022 12:01:24 +0330 Subject: [PATCH 20/24] Update maven compiler version in keycloak --- user-management/keycloak-gateway/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user-management/keycloak-gateway/pom.xml b/user-management/keycloak-gateway/pom.xml index f80f1048f..0bc939c87 100644 --- a/user-management/keycloak-gateway/pom.xml +++ b/user-management/keycloak-gateway/pom.xml @@ -15,8 +15,8 @@ Keycloak gateway app Opex - 13 - 13 + 11 + 11 12.0.4 3.13.2.Final 11.0.10.Final From df3905b580d26437a202aba0afc5e2caa3936a02 Mon Sep 17 00:00:00 2001 From: metalicn20 Date: Sun, 6 Feb 2022 17:19:53 +0330 Subject: [PATCH 21/24] Fix maven version --- Jenkinsfile | 2 +- dev.Jenkinsfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c5ef0f68b..91b903f17 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,7 +6,7 @@ pipeline { steps { setBuildStatus("?", "PENDING") withMaven( - maven: 'maven-latest' + maven: 'maven-3.6.3' ) { sh 'mvn -B clean install' } diff --git a/dev.Jenkinsfile b/dev.Jenkinsfile index 472ffdb5c..94d1b4064 100644 --- a/dev.Jenkinsfile +++ b/dev.Jenkinsfile @@ -6,7 +6,7 @@ pipeline { steps { setBuildStatus("?", "PENDING") withMaven( - maven: 'maven-latest' + maven: 'maven-3.6.3' ) { sh 'mvn -B clean install' } From aa31fddcb819952d54f53ed101fae354aaf6c8be Mon Sep 17 00:00:00 2001 From: metalicn20 Date: Sun, 6 Feb 2022 17:22:41 +0330 Subject: [PATCH 22/24] Add clean up codes after deliver --- Jenkinsfile | 2 ++ dev.Jenkinsfile | 2 ++ 2 files changed, 4 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 91b903f17..f0ea066b0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -25,6 +25,8 @@ pipeline { } steps { sh 'docker-compose up -d --build --remove-orphans' + sh 'docker image prune -f' + sh 'docker network prune -f' } } } diff --git a/dev.Jenkinsfile b/dev.Jenkinsfile index 94d1b4064..75012905c 100644 --- a/dev.Jenkinsfile +++ b/dev.Jenkinsfile @@ -25,6 +25,8 @@ pipeline { } steps { sh 'docker-compose up -f docker-compose.yml -f docker-compose.dev.yml -d --build --remove-orphans' + sh 'docker image prune -f' + sh 'docker network prune -f' } } } From a4926ba1d6d713642ccdb6042b4a7f28ddb6039b Mon Sep 17 00:00:00 2001 From: metalicn20 Date: Sun, 6 Feb 2022 17:37:04 +0330 Subject: [PATCH 23/24] Fix local port expose --- docker-compose.dev.yml | 20 ++++++++++---------- docker-compose.override.yml | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index db44c6d6c..80ab2c255 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -2,27 +2,27 @@ version: '3.8' services: vault-ui: ports: - - "127.0.0.1:8001:8000" + - "8001:8000" consul: ports: - - "127.0.0.1:8501:8500" - - "127.0.0.1:8301:8300" - - "127.0.0.1:8601:8600" + - "8501:8500" + - "8301:8300" + - "8601:8600" postgres-accountant: ports: - - "127.0.0.1:5442:5432" + - "5442:5432" postgres-eventlog: ports: - - "127.0.0.1:5443:5432" + - "5443:5432" postgres-auth: ports: - - "127.0.0.1:5444:5432" + - "5444:5432" postgres-wallet: ports: - - "127.0.0.1:5445:5432" + - "5445:5432" postgres-api: ports: - - "127.0.0.1:5446:5432" + - "5446:5432" postgres-bc-gateway: ports: - - "127.0.0.1:5447:5432" \ No newline at end of file + - "5447:5432" \ No newline at end of file diff --git a/docker-compose.override.yml b/docker-compose.override.yml index d1ff1f081..8c374f16f 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -2,27 +2,27 @@ version: '3.8' services: vault-ui: ports: - - "127.0.0.1:8000:8000" + - "8000:8000" consul: ports: - - "127.0.0.1:8500:8500" - - "127.0.0.1:8300:8300" - - "127.0.0.1:8600:8600" + - "8500:8500" + - "8300:8300" + - "8600:8600" postgres-accountant: ports: - - "127.0.0.1:5432:5432" + - "5432:5432" postgres-eventlog: ports: - - "127.0.0.1:5433:5432" + - "5433:5432" postgres-auth: ports: - - "127.0.0.1:5434:5432" + - "5434:5432" postgres-wallet: ports: - - "127.0.0.1:5435:5432" + - "5435:5432" postgres-api: ports: - - "127.0.0.1:5436:5432" + - "5436:5432" postgres-bc-gateway: ports: - - "127.0.0.1:5437:5432" \ No newline at end of file + - "5437:5432" \ No newline at end of file From 7abac7c221c210f235db06e893f136b9fb6a3242 Mon Sep 17 00:00:00 2001 From: metalicn20 Date: Sun, 6 Feb 2022 17:37:49 +0330 Subject: [PATCH 24/24] Update Jenkins stages title --- Jenkinsfile | 2 +- dev.Jenkinsfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f0ea066b0..44001fda2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,7 @@ pipeline { agent any - stages('Deploy - Demo') { + stages('Deploy') { stage('Build') { steps { setBuildStatus("?", "PENDING") diff --git a/dev.Jenkinsfile b/dev.Jenkinsfile index 75012905c..d32fb238d 100644 --- a/dev.Jenkinsfile +++ b/dev.Jenkinsfile @@ -1,7 +1,7 @@ pipeline { agent any - stages('Deploy - Stage') { + stages('Deploy') { stage('Build') { steps { setBuildStatus("?", "PENDING")