From 7ca828648ad08623409785af499d1e61a237b5e4 Mon Sep 17 00:00:00 2001 From: "k.struzhkin" Date: Wed, 1 Sep 2021 18:59:13 +0300 Subject: [PATCH 1/5] Update --- docker-compose.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index fdc7396..9a26cc8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -153,7 +153,7 @@ services: - 8991:8022 fraudbusters: - image: rbkmoney/fraudbusters:9698d6d519f5d2344bd7486dfe7af31d089cd652-epic + image: rbkmoney/fraudbusters:0d07546141ea87874f75cfb9856835d5e7d988ce hostname: fraudbusters container_name: fraudbusters environment: @@ -199,7 +199,7 @@ services: restart: unless-stopped fb-management: - image: dr2.rbkmoney.com/rbkmoney/fraudbusters-management:e83f84b1e9dee2fec1b30f4b287cc8e702eb157a + image: dr2.rbkmoney.com/rbkmoney/fraudbusters-management:7b9dc4702710f47f9c6886f94ea788903383dd4c hostname: fb-management container_name: fb-management environment: @@ -231,7 +231,7 @@ services: - ./log-java:/opt/fraudbusters-management/tmp fraudbusters-ui: - image: dr2.rbkmoney.com/rbkmoney/fraudbusters-ui:052ef663e0c86d1521ef213b04355da58b0e5cc9 + image: dr2.rbkmoney.com/rbkmoney/fraudbusters-ui:4a6f03b331ca9b90dc52bb93b88ae18bd29e155c hostname: fraudbusters-ui container_name: fraudbusters-ui ports: @@ -244,7 +244,7 @@ services: - ./fraudbusters-ui/authConfig.json:/usr/share/nginx/html/assets/authConfig.json keyclock: - image: dr2.rbkmoney.com/rbkmoney/keycloak:8d6a2ad2c2afef8201a8801739d17379bdcc0d69 + image: dr2.rbkmoney.com/rbkmoney/keycloak:325c3260863fa16cf652911fe97df8b3e16c45ff hostname: keyclock container_name: keyclock ports: From f2dd45edfa26438f68727be581247d43d707ccdb Mon Sep 17 00:00:00 2001 From: "k.struzhkin" Date: Mon, 6 Sep 2021 14:21:49 +0300 Subject: [PATCH 2/5] Update versions --- docker-compose.yml | 148 ++++++++++++++++++++++----------------------- 1 file changed, 74 insertions(+), 74 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 9a26cc8..193d81b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -93,64 +93,64 @@ services: volumes: - ./clickhouse/data:/var/lib/clickhouse - ./clickhouse/docker-entrypoint-initdb.d/init-db.sh:/docker-entrypoint-initdb.d/init-db.sh - - grafana: - image: grafana/grafana:5.1.0 - hostname: grafana - container_name: grafana - ports: - - 3000:3000 - environment: - GF_INSTALL_PLUGINS: "grafana-piechart-panel,vertamedia-clickhouse-datasource" - GF_SECURITY_ADMIN_USER: "admin" - GF_SECURITY_ADMIN_PASSWORD: "admin" - volumes: - - ./grafana/dashboards:/etc/grafana/provisioning/dashboards - - ./grafana/datasources:/etc/grafana/provisioning/datasources - - postgres-columbus: - image: rbkmoney/postgres-geodata:0eb52256576ec22f89fadc3e7fe505b692e838a3 - hostname: postgres-columbus - container_name: postgres-columbus - environment: - POSTGRES_USER: postgres - POSTGRES_PASSWORD: postgres - POSTGRES_DB: columbus - entrypoint: - - /docker-entrypoint.sh - - postgres - ports: - - 5432:5432 - - columbus: - image: rbkmoney/columbus:88be0cbccde15c7d4c88403d495f8d564f826160 - hostname: columbus - container_name: columbus - environment: - spring.datasource.url: "jdbc:postgresql://postgres-columbus:5432/columbus" - logging.level.com.rbkmoney.woody: "ERROR" - depends_on: - - postgres-columbus - ports: - - 8990:8022 - - wblist: - image: rbkmoney/wb-list-manager:9676d131d4b6c2d90c0a230c173c07f1de30f298 - hostname: wblist - container_name: wblist - environment: - kafka.bootstrap.servers: "broker:9092" - riak.address: riak - riak.port: 8087 - management.metrics.export.statsd.enabled: "false" - logging.level.com.rbkmoney.woody: "ERROR" - kafka.wblist.topic.command: "wb-list-command" - kafka.wblist.topic.event.sink: "wb-list-event-sink" - depends_on: - - riak - - broker - ports: - - 8991:8022 +# +# grafana: +# image: grafana/grafana:5.1.0 +# hostname: grafana +# container_name: grafana +# ports: +# - 3000:3000 +# environment: +# GF_INSTALL_PLUGINS: "grafana-piechart-panel,vertamedia-clickhouse-datasource" +# GF_SECURITY_ADMIN_USER: "admin" +# GF_SECURITY_ADMIN_PASSWORD: "admin" +# volumes: +# - ./grafana/dashboards:/etc/grafana/provisioning/dashboards +# - ./grafana/datasources:/etc/grafana/provisioning/datasources +# +# postgres-columbus: +# image: rbkmoney/postgres-geodata:0eb52256576ec22f89fadc3e7fe505b692e838a3 +# hostname: postgres-columbus +# container_name: postgres-columbus +# environment: +# POSTGRES_USER: postgres +# POSTGRES_PASSWORD: postgres +# POSTGRES_DB: columbus +# entrypoint: +# - /docker-entrypoint.sh +# - postgres +# ports: +# - 5432:5432 +# +# columbus: +# image: rbkmoney/columbus:88be0cbccde15c7d4c88403d495f8d564f826160 +# hostname: columbus +# container_name: columbus +# environment: +# spring.datasource.url: "jdbc:postgresql://postgres-columbus:5432/columbus" +# logging.level.com.rbkmoney.woody: "ERROR" +# depends_on: +# - postgres-columbus +# ports: +# - 8990:8022 +# +# wblist: +# image: rbkmoney/wb-list-manager:9676d131d4b6c2d90c0a230c173c07f1de30f298 +# hostname: wblist +# container_name: wblist +# environment: +# kafka.bootstrap.servers: "broker:9092" +# riak.address: riak +# riak.port: 8087 +# management.metrics.export.statsd.enabled: "false" +# logging.level.com.rbkmoney.woody: "ERROR" +# kafka.wblist.topic.command: "wb-list-command" +# kafka.wblist.topic.event.sink: "wb-list-event-sink" +# depends_on: +# - riak +# - broker +# ports: +# - 8991:8022 fraudbusters: image: rbkmoney/fraudbusters:0d07546141ea87874f75cfb9856835d5e7d988ce @@ -173,8 +173,8 @@ services: depends_on: - clickhouse - broker - - columbus - - wblist +# - columbus +# - wblist - kafka-setup ports: - 8999:8022 @@ -224,24 +224,24 @@ services: depends_on: - fraudbusters - broker - - wblist +# - wblist - postgres-fb - kafka-setup volumes: - ./log-java:/opt/fraudbusters-management/tmp - - fraudbusters-ui: - image: dr2.rbkmoney.com/rbkmoney/fraudbusters-ui:4a6f03b331ca9b90dc52bb93b88ae18bd29e155c - hostname: fraudbusters-ui - container_name: fraudbusters-ui - ports: - - 8989:8080 - depends_on: - - fb-management - volumes: - - ./fraudbusters-ui/nginx.conf:/etc/nginx/vhosts.d/fraudbusters-ui.conf - - ./fraudbusters-ui/appConfig.json:/usr/share/nginx/html/assets/appConfig.json - - ./fraudbusters-ui/authConfig.json:/usr/share/nginx/html/assets/authConfig.json +# +# fraudbusters-ui: +# image: dr2.rbkmoney.com/rbkmoney/fraudbusters-ui:4a6f03b331ca9b90dc52bb93b88ae18bd29e155c +# hostname: fraudbusters-ui +# container_name: fraudbusters-ui +# ports: +# - 8989:8080 +# depends_on: +# - fb-management +# volumes: +# - ./fraudbusters-ui/nginx.conf:/etc/nginx/vhosts.d/fraudbusters-ui.conf +# - ./fraudbusters-ui/appConfig.json:/usr/share/nginx/html/assets/appConfig.json +# - ./fraudbusters-ui/authConfig.json:/usr/share/nginx/html/assets/authConfig.json keyclock: image: dr2.rbkmoney.com/rbkmoney/keycloak:325c3260863fa16cf652911fe97df8b3e16c45ff From 099c47bce8d26c0c388a5a9064f1ec8b35fe81a4 Mon Sep 17 00:00:00 2001 From: "k.struzhkin" Date: Wed, 8 Sep 2021 10:48:12 +0300 Subject: [PATCH 3/5] Uncommit --- docker-compose.yml | 148 ++++++++++++++++++++++----------------------- 1 file changed, 74 insertions(+), 74 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 193d81b..9a26cc8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -93,64 +93,64 @@ services: volumes: - ./clickhouse/data:/var/lib/clickhouse - ./clickhouse/docker-entrypoint-initdb.d/init-db.sh:/docker-entrypoint-initdb.d/init-db.sh -# -# grafana: -# image: grafana/grafana:5.1.0 -# hostname: grafana -# container_name: grafana -# ports: -# - 3000:3000 -# environment: -# GF_INSTALL_PLUGINS: "grafana-piechart-panel,vertamedia-clickhouse-datasource" -# GF_SECURITY_ADMIN_USER: "admin" -# GF_SECURITY_ADMIN_PASSWORD: "admin" -# volumes: -# - ./grafana/dashboards:/etc/grafana/provisioning/dashboards -# - ./grafana/datasources:/etc/grafana/provisioning/datasources -# -# postgres-columbus: -# image: rbkmoney/postgres-geodata:0eb52256576ec22f89fadc3e7fe505b692e838a3 -# hostname: postgres-columbus -# container_name: postgres-columbus -# environment: -# POSTGRES_USER: postgres -# POSTGRES_PASSWORD: postgres -# POSTGRES_DB: columbus -# entrypoint: -# - /docker-entrypoint.sh -# - postgres -# ports: -# - 5432:5432 -# -# columbus: -# image: rbkmoney/columbus:88be0cbccde15c7d4c88403d495f8d564f826160 -# hostname: columbus -# container_name: columbus -# environment: -# spring.datasource.url: "jdbc:postgresql://postgres-columbus:5432/columbus" -# logging.level.com.rbkmoney.woody: "ERROR" -# depends_on: -# - postgres-columbus -# ports: -# - 8990:8022 -# -# wblist: -# image: rbkmoney/wb-list-manager:9676d131d4b6c2d90c0a230c173c07f1de30f298 -# hostname: wblist -# container_name: wblist -# environment: -# kafka.bootstrap.servers: "broker:9092" -# riak.address: riak -# riak.port: 8087 -# management.metrics.export.statsd.enabled: "false" -# logging.level.com.rbkmoney.woody: "ERROR" -# kafka.wblist.topic.command: "wb-list-command" -# kafka.wblist.topic.event.sink: "wb-list-event-sink" -# depends_on: -# - riak -# - broker -# ports: -# - 8991:8022 + + grafana: + image: grafana/grafana:5.1.0 + hostname: grafana + container_name: grafana + ports: + - 3000:3000 + environment: + GF_INSTALL_PLUGINS: "grafana-piechart-panel,vertamedia-clickhouse-datasource" + GF_SECURITY_ADMIN_USER: "admin" + GF_SECURITY_ADMIN_PASSWORD: "admin" + volumes: + - ./grafana/dashboards:/etc/grafana/provisioning/dashboards + - ./grafana/datasources:/etc/grafana/provisioning/datasources + + postgres-columbus: + image: rbkmoney/postgres-geodata:0eb52256576ec22f89fadc3e7fe505b692e838a3 + hostname: postgres-columbus + container_name: postgres-columbus + environment: + POSTGRES_USER: postgres + POSTGRES_PASSWORD: postgres + POSTGRES_DB: columbus + entrypoint: + - /docker-entrypoint.sh + - postgres + ports: + - 5432:5432 + + columbus: + image: rbkmoney/columbus:88be0cbccde15c7d4c88403d495f8d564f826160 + hostname: columbus + container_name: columbus + environment: + spring.datasource.url: "jdbc:postgresql://postgres-columbus:5432/columbus" + logging.level.com.rbkmoney.woody: "ERROR" + depends_on: + - postgres-columbus + ports: + - 8990:8022 + + wblist: + image: rbkmoney/wb-list-manager:9676d131d4b6c2d90c0a230c173c07f1de30f298 + hostname: wblist + container_name: wblist + environment: + kafka.bootstrap.servers: "broker:9092" + riak.address: riak + riak.port: 8087 + management.metrics.export.statsd.enabled: "false" + logging.level.com.rbkmoney.woody: "ERROR" + kafka.wblist.topic.command: "wb-list-command" + kafka.wblist.topic.event.sink: "wb-list-event-sink" + depends_on: + - riak + - broker + ports: + - 8991:8022 fraudbusters: image: rbkmoney/fraudbusters:0d07546141ea87874f75cfb9856835d5e7d988ce @@ -173,8 +173,8 @@ services: depends_on: - clickhouse - broker -# - columbus -# - wblist + - columbus + - wblist - kafka-setup ports: - 8999:8022 @@ -224,24 +224,24 @@ services: depends_on: - fraudbusters - broker -# - wblist + - wblist - postgres-fb - kafka-setup volumes: - ./log-java:/opt/fraudbusters-management/tmp -# -# fraudbusters-ui: -# image: dr2.rbkmoney.com/rbkmoney/fraudbusters-ui:4a6f03b331ca9b90dc52bb93b88ae18bd29e155c -# hostname: fraudbusters-ui -# container_name: fraudbusters-ui -# ports: -# - 8989:8080 -# depends_on: -# - fb-management -# volumes: -# - ./fraudbusters-ui/nginx.conf:/etc/nginx/vhosts.d/fraudbusters-ui.conf -# - ./fraudbusters-ui/appConfig.json:/usr/share/nginx/html/assets/appConfig.json -# - ./fraudbusters-ui/authConfig.json:/usr/share/nginx/html/assets/authConfig.json + + fraudbusters-ui: + image: dr2.rbkmoney.com/rbkmoney/fraudbusters-ui:4a6f03b331ca9b90dc52bb93b88ae18bd29e155c + hostname: fraudbusters-ui + container_name: fraudbusters-ui + ports: + - 8989:8080 + depends_on: + - fb-management + volumes: + - ./fraudbusters-ui/nginx.conf:/etc/nginx/vhosts.d/fraudbusters-ui.conf + - ./fraudbusters-ui/appConfig.json:/usr/share/nginx/html/assets/appConfig.json + - ./fraudbusters-ui/authConfig.json:/usr/share/nginx/html/assets/authConfig.json keyclock: image: dr2.rbkmoney.com/rbkmoney/keycloak:325c3260863fa16cf652911fe97df8b3e16c45ff From bc8b213d17a9968301ca0130dd223bd9d8d9a195 Mon Sep 17 00:00:00 2001 From: "k.struzhkin" Date: Fri, 8 Oct 2021 10:58:48 +0300 Subject: [PATCH 4/5] Update for notifications --- docker-compose.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index d7f6b5c..2e26fa4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -153,7 +153,7 @@ services: - 8991:8022 fraudbusters: - image: rbkmoney/fraudbusters:0d07546141ea87874f75cfb9856835d5e7d988ce + image: rbkmoney/fraudbusters:5a6874671b4dfe235eba71952c121b1400f3b625 hostname: fraudbusters container_name: fraudbusters environment: @@ -199,7 +199,7 @@ services: restart: unless-stopped fb-management: - image: dr2.rbkmoney.com/rbkmoney/fraudbusters-management:7b9dc4702710f47f9c6886f94ea788903383dd4c + image: dr2.rbkmoney.com/rbkmoney/fraudbusters-management:1613785de7c551de4ab89ad74c18e116c4957a2c hostname: fb-management container_name: fb-management environment: @@ -213,7 +213,10 @@ services: management.metrics.binders.jvm.enabled: 'false' service.payment.url: 'http://fraudbusters:8022/fraud_payment/v1/' service.historical.url: 'http://fraudbusters:8022/historical_data/v1/' - service.fb-notificator.url: 'http://fb-notificator:8080/' + service.notification.url: 'http://fb-notificator:8022/notification/v1' + service.notification-channel.url: 'http://fb-notificator:8022/notification-channel/v1' + service.notification-template.url: 'http://fb-notificator:8022/notification-template/v1' + service.fb-notificator.url: 'http://fb-notificator:8022/' spring.profiles.active: 'debug' keycloak.enabled: "true" keycloak.realm: "fraudbusters-realm" @@ -233,7 +236,7 @@ services: - ./log-java:/opt/fraudbusters-management/tmp fb-notificator: - image: dr2.rbkmoney.com/rbkmoney/fraudbusters-notificator:01dac03e4b6da5f47cc7a0e981971969eeb40270 + image: dr2.rbkmoney.com/rbkmoney/fraudbusters-notificator:baf2332c3ca6d0860e30dacc10f7c9c60a726700 hostname: fb-notificator container_name: fb-notificator environment: @@ -243,7 +246,7 @@ services: warehouse.url: 'http://fb-warehouse:8022/query/v1/' spring.profiles.active: 'debug' ports: - - 8086:8080 + - 8086:8022 depends_on: - postgres-notificator - fb-warehouse @@ -266,7 +269,7 @@ services: restart: unless-stopped fb-warehouse: - image: dr2.rbkmoney.com/rbkmoney/fraudbusters-warehouse:f129351e97cc2a8c4e49d9a20f1e3415a68ccee9 + image: dr2.rbkmoney.com/rbkmoney/fraudbusters-warehouse:69ddadd89f84ec2afddc59f1c6074524367faf3e hostname: fb-warehouse container_name: fb-warehouse environment: @@ -284,7 +287,7 @@ services: - ./log-java:/opt/fraudbusters-warehouse/tmp fraudbusters-ui: - image: dr2.rbkmoney.com/rbkmoney/fraudbusters-ui:4a6f03b331ca9b90dc52bb93b88ae18bd29e155c + image: dr2.rbkmoney.com/rbkmoney/fraudbusters-ui:f0d4b45c0726f6b45f8ad42b77fb7f7750bd86b1 hostname: fraudbusters-ui container_name: fraudbusters-ui ports: From d46c18143c7d061b67c7e1ab1a71668488965e37 Mon Sep 17 00:00:00 2001 From: "k.struzhkin" Date: Fri, 8 Oct 2021 11:16:24 +0300 Subject: [PATCH 5/5] Remove unused property --- docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 2e26fa4..e898763 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -216,7 +216,6 @@ services: service.notification.url: 'http://fb-notificator:8022/notification/v1' service.notification-channel.url: 'http://fb-notificator:8022/notification-channel/v1' service.notification-template.url: 'http://fb-notificator:8022/notification-template/v1' - service.fb-notificator.url: 'http://fb-notificator:8022/' spring.profiles.active: 'debug' keycloak.enabled: "true" keycloak.realm: "fraudbusters-realm"