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 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 2e169549b..000000000 --- a/Deployment/docker-compose.dev.yml +++ /dev/null @@ -1,148 +0,0 @@ -services: - zookeeper: - ports: - - '127.0.0.1:2182:2181' - networks: - - opex-dev - kafka-1: - networks: - - opex-dev - environment: - - KAFKA_LISTENERS=CLIENT://kafka-1:29092,EXTERNAL://kafka-1:9092 - - KAFKA_ADVERTISED_LISTENERS=CLIENT://kafka-1:29092,EXTERNAL://kafka-1:9092 - kafka-2: - networks: - - opex-dev - environment: - - KAFKA_LISTENERS=CLIENT://kafka-2:29092,EXTERNAL://kafka-2:9092 - - KAFKA_ADVERTISED_LISTENERS=CLIENT://kafka-2:29092,EXTERNAL://kafka-2:9092 - kafka-3: - networks: - - opex-dev - environment: - - KAFKA_LISTENERS=CLIENT://kafka-3:29092,EXTERNAL://kafka-3:9092 - - KAFKA_ADVERTISED_LISTENERS=CLIENT://kafka-3:29092,EXTERNAL://kafka-3:9092 - vault: - ports: - - "127.0.0.1:8201:8200" - networks: - - opex-dev - vault-ui: - ports: - - "127.0.0.1:8001:8000" - 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 - akhq: - ports: - - "127.0.0.1:20100:8080" - 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 9cb75b17a..000000000 --- a/Deployment/docker-compose.override.yml +++ /dev/null @@ -1,161 +0,0 @@ -services: - zookeeper: - ports: - - '2181:2181' - networks: - - opex - kafka-1: - networks: - - opex - kafka-2: - networks: - - opex - kafka-3: - networks: - - opex - vault: - ports: - - "127.0.0.1:8200:8200" - networks: - - opex - vault-ui: - ports: - - "127.0.0.1:8000:8000" - 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 - akhq: - ports: - - "127.0.0.1:10100:8080" - 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/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; - } - } -} diff --git a/Jenkins/Jenkinsfile.deploy.groovy b/Jenkinsfile similarity index 75% rename from Jenkins/Jenkinsfile.deploy.groovy rename to Jenkinsfile index 4bd2c3d57..44001fda2 100644 --- a/Jenkins/Jenkinsfile.deploy.groovy +++ b/Jenkinsfile @@ -1,12 +1,12 @@ pipeline { agent any - stages('Deploy - Demo') { + stages('Deploy') { stage('Build') { steps { setBuildStatus("?", "PENDING") withMaven( - maven: 'maven-latest' + maven: 'maven-3.6.3' ) { sh 'mvn -B clean install' } @@ -14,17 +14,19 @@ 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") - DB_USER='opex' - DB_PASS=credentials("db-secret") + SMTP_PASS = credentials("smtp-secret") + DB_USER = 'opex' + DB_PASS = credentials("db-secret") + COMPOSE_PROJECT_NAME = 'demo-core' + DEFAULT_NETWORK_NAME = 'demo-opex' } steps { - dir("Deployment") { - sh 'COMPOSE_PROJECT_NAME=demo docker-compose up -d --build' - } + sh 'docker-compose up -d --build --remove-orphans' + sh 'docker image prune -f' + sh 'docker network prune -f' } } } 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/accountant/accountant-app/src/main/resources/application.yml b/accountant/accountant-app/src/main/resources/application.yml index dcfce0a97..23a106584 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/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/api/api-app/src/main/resources/application.yml b/api/api-app/src/main/resources/application.yml index 1477c7326..bdb3556a4 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 +server.port: 8080 logging: level: co.nilin: DEBUG 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/bc-gateway/bc-gateway-app/src/main/resources/application.yml b/bc-gateway/bc-gateway-app/src/main/resources/application.yml index ca8b0c2b1..bc2899b2d 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/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 diff --git a/Jenkins/Jenkinsfile.deploy.dev.groovy b/dev.Jenkinsfile similarity index 73% rename from Jenkins/Jenkinsfile.deploy.dev.groovy rename to dev.Jenkinsfile index 9bf2e971e..d32fb238d 100644 --- a/Jenkins/Jenkinsfile.deploy.dev.groovy +++ b/dev.Jenkinsfile @@ -1,12 +1,12 @@ pipeline { agent any - stages('Deploy - Stage') { + stages('Deploy') { stage('Build') { steps { setBuildStatus("?", "PENDING") withMaven( - maven: 'maven-latest' + maven: 'maven-3.6.3' ) { sh 'mvn -B clean install' } @@ -14,17 +14,19 @@ 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") - DB_USER='opex' - DB_PASS=credentials("db-secret-dev") + SMTP_PASS = credentials("smtp-secret-dev") + DB_USER = 'opex' + DB_PASS = credentials("db-secret-dev") + COMPOSE_PROJECT_NAME = 'dev-core' + DEFAULT_NETWORK_NAME = 'dev-opex' } steps { - dir("Deployment") { - sh 'COMPOSE_PROJECT_NAME=dev docker-compose -f docker-compose.yml -f docker-compose.dev.yml up -d --build' - } + 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' } } } diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml new file mode 100644 index 000000000..80ab2c255 --- /dev/null +++ b/docker-compose.dev.yml @@ -0,0 +1,28 @@ +version: '3.8' +services: + vault-ui: + ports: + - "8001:8000" + consul: + ports: + - "8501:8500" + - "8301:8300" + - "8601:8600" + postgres-accountant: + ports: + - "5442:5432" + postgres-eventlog: + ports: + - "5443:5432" + postgres-auth: + ports: + - "5444:5432" + postgres-wallet: + ports: + - "5445:5432" + postgres-api: + ports: + - "5446:5432" + postgres-bc-gateway: + ports: + - "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..8c374f16f --- /dev/null +++ b/docker-compose.override.yml @@ -0,0 +1,28 @@ +version: '3.8' +services: + vault-ui: + ports: + - "8000:8000" + consul: + ports: + - "8500:8500" + - "8300:8300" + - "8600:8600" + postgres-accountant: + ports: + - "5432:5432" + postgres-eventlog: + ports: + - "5433:5432" + postgres-auth: + ports: + - "5434:5432" + postgres-wallet: + ports: + - "5435:5432" + postgres-api: + ports: + - "5436:5432" + postgres-bc-gateway: + ports: + - "5437:5432" \ No newline at end of file diff --git a/Deployment/docker-compose.yml b/docker-compose.yml similarity index 89% rename from Deployment/docker-compose.yml rename to docker-compose.yml index 1765ffe69..499a70932 100644 --- a/Deployment/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 @@ -66,6 +72,8 @@ services: - KAFKA_UNCLEAN_LEADER_ELECTION_ENABLE=false depends_on: - zookeeper + networks: + - default deploy: restart_policy: condition: on-failure @@ -95,6 +103,8 @@ services: image: 'consul' environment: - CONSUL_BIND_INTERFACE=eth0 + networks: + - default deploy: restart_policy: condition: on-failure @@ -106,6 +116,8 @@ services: - $DATA/redis.conf:/usr/local/etc/redis/redis.conf environment: - REDIS_REPLICATION_MODE=master + networks: + - default deploy: restart_policy: condition: on-failure @@ -117,8 +129,9 @@ services: - POSTGRES_DB=opex_accountant volumes: - $DATA/accountant-data:/var/lib/postgresql/data/ + networks: + - default akhq: - container_name: akhq image: tchiotludo/akhq environment: AKHQ_CONFIGURATION: | @@ -127,6 +140,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 @@ -139,6 +154,8 @@ services: - POSTGRES_DB=opex_eventlog volumes: - $DATA/eventlog-data:/var/lib/postgresql/data/ + networks: + - default postgres-auth: image: "postgres" environment: @@ -147,6 +164,8 @@ services: - POSTGRES_DB=opex_auth volumes: - $DATA/auth-data:/var/lib/postgresql/data/ + networks: + - default deploy: restart_policy: condition: on-failure @@ -158,6 +177,8 @@ services: - POSTGRES_DB=opex_wallet volumes: - $DATA/wallet-data:/var/lib/postgresql/data/ + networks: + - default deploy: restart_policy: condition: on-failure @@ -169,6 +190,8 @@ services: - POSTGRES_DB=opex_api volumes: - $DATA/api-data:/var/lib/postgresql/data/ + networks: + - default deploy: restart_policy: condition: on-failure @@ -180,13 +203,14 @@ services: - POSTGRES_DB=opex_bc_gateway volumes: - $DATA/bc-gateway-data:/var/lib/postgresql/data/ + networks: + - default 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 @@ -196,17 +220,20 @@ services: - DB_IP_PORT=postgres-accountant - BACKEND_USER=${BACKEND_USER} - VAULT_HOST=vault + networks: + - default depends_on: - zookeeper - kafka-1 + - kafka-2 + - kafka-3 - redis - consul - vault - postgres-accountant eventlog: build: - context: ../eventlog/eventlog-app - dockerfile: Dockerfile + context: eventlog/eventlog-app environment: - JAVA_OPTS=-Xmx256m - SPRING_PROFILES_ACTIVE=docker,demo @@ -216,6 +243,8 @@ services: - DB_IP_PORT=postgres-eventlog - BACKEND_USER=${BACKEND_USER} - VAULT_HOST=vault + networks: + - default depends_on: - zookeeper - kafka-1 @@ -227,13 +256,14 @@ 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-1:29092,kafka-2:29092,kafka-3:29092 - REDIS_HOST=redis + networks: + - default depends_on: - zookeeper - kafka-1 @@ -242,14 +272,15 @@ services: - 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-1:29092,kafka-2:29092,kafka-3:29092 - REDIS_HOST=redis - CONSUL_HOST=consul + networks: + - default depends_on: - zookeeper - kafka-1 @@ -258,8 +289,7 @@ services: - 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 @@ -281,13 +311,14 @@ services: - consul - vault - postgres-auth + networks: + - default 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 @@ -306,13 +337,14 @@ services: - consul - vault - postgres-wallet + networks: + - default 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 @@ -331,13 +363,14 @@ services: - consul - vault - postgres-api + networks: + - default 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 @@ -354,36 +387,34 @@ services: - consul - vault - postgres-api + networks: + - default 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 - - KAFKA_IP_PORT=kafka-1:29092,kafka-2:29092,kafka-3:29092 - - REDIS_HOST=redis - CONSUL_HOST=consul - DB_IP_PORT=postgres-bc-gateway - BACKEND_USER=${BACKEND_USER} - VAULT_URL=http://vault:8200 depends_on: - - zookeeper - - kafka-1 - redis - consul - vault - postgres-bc-gateway + networks: + - default 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 @@ -393,16 +424,12 @@ services: - $DATA/storage-data:/storage depends_on: - consul + networks: + - default 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 \ No newline at end of file +networks: + default: + name: ${DEFAULT_NETWORK_NAME:-opex} + driver: bridge 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/eventlog/eventlog-app/src/main/resources/application.yml b/eventlog/eventlog-app/src/main/resources/application.yml index e7eef4ba9..128cec6b4 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: application: name: opex-eventlog 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-engine/matching-engine-app/src/main/resources/application.yml b/matching-engine/matching-engine-app/src/main/resources/application.yml index 5135d42eb..42cf87971 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/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/matching-gateway/matching-gateway-app/src/main/resources/application.yml b/matching-gateway/matching-gateway-app/src/main/resources/application.yml index d968828ad..76a925218 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/pom.xml b/pom.xml index 9151f1713..afb5cd927 100644 --- a/pom.xml +++ b/pom.xml @@ -94,7 +94,7 @@ spring - 1.8 + ${java.version} 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/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/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/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 diff --git a/user-management/keycloak-gateway/src/main/resources/application.yml b/user-management/keycloak-gateway/src/main/resources/application.yml index 948f806b7..64520ae4b 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/Deployment/vault/config/backend-policy.hcl b/vault/config/backend-policy.hcl similarity index 100% rename from Deployment/vault/config/backend-policy.hcl rename to vault/config/backend-policy.hcl diff --git a/Deployment/vault/config/panel-policy.hcl b/vault/config/panel-policy.hcl similarity index 100% rename from Deployment/vault/config/panel-policy.hcl rename to vault/config/panel-policy.hcl diff --git a/Deployment/vault/config/vault.json b/vault/config/vault.json similarity index 100% rename from Deployment/vault/config/vault.json rename to vault/config/vault.json diff --git a/Deployment/vault/config/workflow-vault.sh b/vault/config/workflow-vault.sh similarity index 100% rename from Deployment/vault/config/workflow-vault.sh rename to vault/config/workflow-vault.sh 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/wallet/wallet-app/src/main/resources/application.yml b/wallet/wallet-app/src/main/resources/application.yml index 6c62e4237..f5a79d0ea 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/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 diff --git a/websocket/websocket-app/src/main/resources/application.yml b/websocket/websocket-app/src/main/resources/application.yml index 0ee7d3714..2b72847a4 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