From dc0dbfd0e4ba7805eecbafaee554188d5946d23b Mon Sep 17 00:00:00 2001 From: Chinthaka Dinadasa Date: Wed, 15 May 2024 12:54:34 +0530 Subject: [PATCH 01/10] docker compose --- docker-compose/docker-compose.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index ea0867e..a8f5478 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -36,6 +36,16 @@ services: volumes: - mysqldata:/var/lib/mysql + internet-banking-config-server: + image: javatodev/internet-banking-config-server + ports: + - 8090:8090 + + internet-banking-service-registry: + image: javatodev/internet-banking-service-registry + ports: + - 8081:8081 + volumes: postgres_data: mysqldata: \ No newline at end of file From c9f52f7ff2aead6e0c8c7f81144e615a5195ee3b Mon Sep 17 00:00:00 2001 From: Chinthaka Dinadasa Date: Wed, 15 May 2024 13:00:10 +0530 Subject: [PATCH 02/10] ib api gateway added to the compose --- docker-compose/docker-compose.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index a8f5478..a529e31 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -46,6 +46,11 @@ services: ports: - 8081:8081 + internet-banking-api-gateway: + image: javatodevinternet-banking-api-gateway + ports: + - 8082:8082 + volumes: postgres_data: mysqldata: \ No newline at end of file From dad82595f22e3df4fb4bb3c1d9b1ea5e7780b7e3 Mon Sep 17 00:00:00 2001 From: Chinthaka Dinadasa Date: Wed, 15 May 2024 13:00:32 +0530 Subject: [PATCH 03/10] ib api gateway added to the compose --- docker-compose/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index a529e31..db86d25 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -47,7 +47,7 @@ services: - 8081:8081 internet-banking-api-gateway: - image: javatodevinternet-banking-api-gateway + image: javatodev/internet-banking-api-gateway ports: - 8082:8082 From bb71dc56b9b01102d59278bc6e5c41287ca0e9a1 Mon Sep 17 00:00:00 2001 From: Chinthaka Dinadasa Date: Wed, 15 May 2024 13:12:24 +0530 Subject: [PATCH 04/10] wait for sh --- docker-compose/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index db86d25..0985652 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -50,6 +50,7 @@ services: image: javatodev/internet-banking-api-gateway ports: - 8082:8082 + entrypoint: ["./wait-for-it.sh", "internet-banking-service-registry:8081", "--timeout=50", "--", "./wait-for-it.sh", "internet-banking-config-server:8090", "--timeout=50", "--", "java", "-jar", "-Dspring.profiles.active=docker", "/app.jar"] volumes: postgres_data: From 03fe77a3489fb6dc7815c1ce14bd77952a0a859f Mon Sep 17 00:00:00 2001 From: Chinthaka Dinadasa Date: Wed, 15 May 2024 13:18:18 +0530 Subject: [PATCH 05/10] docker bootstrp yml introduced --- .../src/main/resources/bootstrap-docker.yml | 4 ++++ .../src/main/resources/bootstrap-docker.yml | 4 ++++ .../src/main/resources/bootstrap-docker.yml | 4 ++++ .../src/main/resources/bootstrap-docker.yml | 4 ++++ 4 files changed, 16 insertions(+) create mode 100644 internet-banking-api-gateway/src/main/resources/bootstrap-docker.yml create mode 100644 internet-banking-fund-transfer-service/src/main/resources/bootstrap-docker.yml create mode 100644 internet-banking-user-service/src/main/resources/bootstrap-docker.yml create mode 100644 internet-banking-utility-payment-service/src/main/resources/bootstrap-docker.yml diff --git a/internet-banking-api-gateway/src/main/resources/bootstrap-docker.yml b/internet-banking-api-gateway/src/main/resources/bootstrap-docker.yml new file mode 100644 index 0000000..8940b0c --- /dev/null +++ b/internet-banking-api-gateway/src/main/resources/bootstrap-docker.yml @@ -0,0 +1,4 @@ +spring: + cloud: + config: + uri: internet-banking-config-server diff --git a/internet-banking-fund-transfer-service/src/main/resources/bootstrap-docker.yml b/internet-banking-fund-transfer-service/src/main/resources/bootstrap-docker.yml new file mode 100644 index 0000000..8940b0c --- /dev/null +++ b/internet-banking-fund-transfer-service/src/main/resources/bootstrap-docker.yml @@ -0,0 +1,4 @@ +spring: + cloud: + config: + uri: internet-banking-config-server diff --git a/internet-banking-user-service/src/main/resources/bootstrap-docker.yml b/internet-banking-user-service/src/main/resources/bootstrap-docker.yml new file mode 100644 index 0000000..8940b0c --- /dev/null +++ b/internet-banking-user-service/src/main/resources/bootstrap-docker.yml @@ -0,0 +1,4 @@ +spring: + cloud: + config: + uri: internet-banking-config-server diff --git a/internet-banking-utility-payment-service/src/main/resources/bootstrap-docker.yml b/internet-banking-utility-payment-service/src/main/resources/bootstrap-docker.yml new file mode 100644 index 0000000..8940b0c --- /dev/null +++ b/internet-banking-utility-payment-service/src/main/resources/bootstrap-docker.yml @@ -0,0 +1,4 @@ +spring: + cloud: + config: + uri: internet-banking-config-server From 7c080cfd555b2c0ca6edce4cbd76edb0dcda2591 Mon Sep 17 00:00:00 2001 From: Chinthaka Dinadasa Date: Wed, 15 May 2024 13:23:27 +0530 Subject: [PATCH 06/10] valid url for configuration service --- .../src/main/resources/bootstrap-docker.yml | 2 +- .../src/main/resources/bootstrap-docker.yml | 2 +- .../src/main/resources/bootstrap-docker.yml | 2 +- .../src/main/resources/bootstrap-docker.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internet-banking-api-gateway/src/main/resources/bootstrap-docker.yml b/internet-banking-api-gateway/src/main/resources/bootstrap-docker.yml index 8940b0c..3fdd4c4 100644 --- a/internet-banking-api-gateway/src/main/resources/bootstrap-docker.yml +++ b/internet-banking-api-gateway/src/main/resources/bootstrap-docker.yml @@ -1,4 +1,4 @@ spring: cloud: config: - uri: internet-banking-config-server + uri: http://internet-banking-config-server diff --git a/internet-banking-fund-transfer-service/src/main/resources/bootstrap-docker.yml b/internet-banking-fund-transfer-service/src/main/resources/bootstrap-docker.yml index 8940b0c..3fdd4c4 100644 --- a/internet-banking-fund-transfer-service/src/main/resources/bootstrap-docker.yml +++ b/internet-banking-fund-transfer-service/src/main/resources/bootstrap-docker.yml @@ -1,4 +1,4 @@ spring: cloud: config: - uri: internet-banking-config-server + uri: http://internet-banking-config-server diff --git a/internet-banking-user-service/src/main/resources/bootstrap-docker.yml b/internet-banking-user-service/src/main/resources/bootstrap-docker.yml index 8940b0c..3fdd4c4 100644 --- a/internet-banking-user-service/src/main/resources/bootstrap-docker.yml +++ b/internet-banking-user-service/src/main/resources/bootstrap-docker.yml @@ -1,4 +1,4 @@ spring: cloud: config: - uri: internet-banking-config-server + uri: http://internet-banking-config-server diff --git a/internet-banking-utility-payment-service/src/main/resources/bootstrap-docker.yml b/internet-banking-utility-payment-service/src/main/resources/bootstrap-docker.yml index 8940b0c..3fdd4c4 100644 --- a/internet-banking-utility-payment-service/src/main/resources/bootstrap-docker.yml +++ b/internet-banking-utility-payment-service/src/main/resources/bootstrap-docker.yml @@ -1,4 +1,4 @@ spring: cloud: config: - uri: internet-banking-config-server + uri: http://internet-banking-config-server From a8dbe0ab3186b87e14f759860dfcd91f9f03f620 Mon Sep 17 00:00:00 2001 From: Chinthaka Dinadasa Date: Wed, 15 May 2024 13:29:15 +0530 Subject: [PATCH 07/10] config server port --- .../src/main/resources/bootstrap-docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internet-banking-api-gateway/src/main/resources/bootstrap-docker.yml b/internet-banking-api-gateway/src/main/resources/bootstrap-docker.yml index 3fdd4c4..2b4a177 100644 --- a/internet-banking-api-gateway/src/main/resources/bootstrap-docker.yml +++ b/internet-banking-api-gateway/src/main/resources/bootstrap-docker.yml @@ -1,4 +1,4 @@ spring: cloud: config: - uri: http://internet-banking-config-server + uri: http://internet-banking-config-server:8090 From fe1f4d760e41164f8422b2cd1a802f2705001012 Mon Sep 17 00:00:00 2001 From: Chinthaka Dinadasa Date: Wed, 15 May 2024 13:42:16 +0530 Subject: [PATCH 08/10] docker configurations --- core-banking-service/src/main/resources/bootstrap-docker.yml | 4 ++++ .../src/main/resources/bootstrap-docker.yml | 2 +- .../src/main/resources/bootstrap-docker.yml | 2 +- .../src/main/resources/bootstrap-docker.yml | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 core-banking-service/src/main/resources/bootstrap-docker.yml diff --git a/core-banking-service/src/main/resources/bootstrap-docker.yml b/core-banking-service/src/main/resources/bootstrap-docker.yml new file mode 100644 index 0000000..2b4a177 --- /dev/null +++ b/core-banking-service/src/main/resources/bootstrap-docker.yml @@ -0,0 +1,4 @@ +spring: + cloud: + config: + uri: http://internet-banking-config-server:8090 diff --git a/internet-banking-fund-transfer-service/src/main/resources/bootstrap-docker.yml b/internet-banking-fund-transfer-service/src/main/resources/bootstrap-docker.yml index 3fdd4c4..2b4a177 100644 --- a/internet-banking-fund-transfer-service/src/main/resources/bootstrap-docker.yml +++ b/internet-banking-fund-transfer-service/src/main/resources/bootstrap-docker.yml @@ -1,4 +1,4 @@ spring: cloud: config: - uri: http://internet-banking-config-server + uri: http://internet-banking-config-server:8090 diff --git a/internet-banking-user-service/src/main/resources/bootstrap-docker.yml b/internet-banking-user-service/src/main/resources/bootstrap-docker.yml index 3fdd4c4..2b4a177 100644 --- a/internet-banking-user-service/src/main/resources/bootstrap-docker.yml +++ b/internet-banking-user-service/src/main/resources/bootstrap-docker.yml @@ -1,4 +1,4 @@ spring: cloud: config: - uri: http://internet-banking-config-server + uri: http://internet-banking-config-server:8090 diff --git a/internet-banking-utility-payment-service/src/main/resources/bootstrap-docker.yml b/internet-banking-utility-payment-service/src/main/resources/bootstrap-docker.yml index 3fdd4c4..2b4a177 100644 --- a/internet-banking-utility-payment-service/src/main/resources/bootstrap-docker.yml +++ b/internet-banking-utility-payment-service/src/main/resources/bootstrap-docker.yml @@ -1,4 +1,4 @@ spring: cloud: config: - uri: http://internet-banking-config-server + uri: http://internet-banking-config-server:8090 From cd477601a79ba1909c354784f0827dc0410d0c15 Mon Sep 17 00:00:00 2001 From: Chinthaka Dinadasa Date: Wed, 15 May 2024 13:45:00 +0530 Subject: [PATCH 09/10] docker compose changes --- docker-compose/docker-compose.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index 0985652..04e745d 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -52,6 +52,13 @@ services: - 8082:8082 entrypoint: ["./wait-for-it.sh", "internet-banking-service-registry:8081", "--timeout=50", "--", "./wait-for-it.sh", "internet-banking-config-server:8090", "--timeout=50", "--", "java", "-jar", "-Dspring.profiles.active=docker", "/app.jar"] + core-banking-service: + image: javatodev/core-banking-service + ports: + - 8092:8092 + entrypoint: ["./wait-for-it.sh", "internet-banking-service-registry:8081", "--timeout=50", "--", "./wait-for-it.sh", "internet-banking-config-server:8090", "--timeout=50", "--", "./wait-for-it.sh", "mysql_core_db:3306", "--timeout=50", "--","java", "-jar", "-Dspring.profiles.active=docker", "/app.jar"] + + volumes: postgres_data: mysqldata: \ No newline at end of file From 150f6bb0c924ab767ddd528a442fd9ac015c03fb Mon Sep 17 00:00:00 2001 From: Chinthaka Dinadasa Date: Wed, 15 May 2024 13:52:19 +0530 Subject: [PATCH 10/10] docker-compose for other services --- docker-compose/docker-compose.yml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index 04e745d..530be98 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -52,13 +52,30 @@ services: - 8082:8082 entrypoint: ["./wait-for-it.sh", "internet-banking-service-registry:8081", "--timeout=50", "--", "./wait-for-it.sh", "internet-banking-config-server:8090", "--timeout=50", "--", "java", "-jar", "-Dspring.profiles.active=docker", "/app.jar"] + internet-banking-user-service: + image: javatodev/internet-banking-user-service + ports: + - 8083:8083 + entrypoint: ["./wait-for-it.sh", "internet-banking-service-registry:8081", "--timeout=50", "--", "./wait-for-it.sh", "internet-banking-config-server:8090", "--timeout=50", "--", "./wait-for-it.sh", "mysql_core_db:3306", "--timeout=50", "--","java", "-jar", "-Dspring.profiles.active=docker", "/app.jar"] + + internet-banking-fund-transfer-service: + image: javatodev/internet-banking-fund-transfer-service + ports: + - 8084:8084 + entrypoint: ["./wait-for-it.sh", "internet-banking-service-registry:8081", "--timeout=50", "--", "./wait-for-it.sh", "internet-banking-config-server:8090", "--timeout=50", "--", "./wait-for-it.sh", "mysql_core_db:3306", "--timeout=50", "--","java", "-jar", "-Dspring.profiles.active=docker", "/app.jar"] + + internet-banking-utility-payment-service: + image: javatodev/internet-banking-utility-payment-service + ports: + - 8085:8085 + entrypoint: ["./wait-for-it.sh", "internet-banking-service-registry:8081", "--timeout=50", "--", "./wait-for-it.sh", "internet-banking-config-server:8090", "--timeout=50", "--", "./wait-for-it.sh", "mysql_core_db:3306", "--timeout=50", "--","java", "-jar", "-Dspring.profiles.active=docker", "/app.jar"] + core-banking-service: image: javatodev/core-banking-service ports: - 8092:8092 entrypoint: ["./wait-for-it.sh", "internet-banking-service-registry:8081", "--timeout=50", "--", "./wait-for-it.sh", "internet-banking-config-server:8090", "--timeout=50", "--", "./wait-for-it.sh", "mysql_core_db:3306", "--timeout=50", "--","java", "-jar", "-Dspring.profiles.active=docker", "/app.jar"] - volumes: postgres_data: mysqldata: \ No newline at end of file