Merge pull request #15 from AbhilashKD/main

Added custom nginx image, chnaged the makefile, added conatiner name
Unified-Learner-Passbook · Sep 26, 2023 · a7e009c · a7e009c
2 parents 6edaf11 + 7da0cab
commit a7e009c
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 14 deletions.
diff --git a/Makefile b/Makefile
@@ -8,3 +8,6 @@ start:
 	docker-compose -f monitoring.yml up -d elasticsearch
 	docker-compose -f monitoring.yml up -d graylog
 	docker-compose up -d
+	wget https://github.com/AbhilashKD/test/blob/master/Downloads/metabase/clickhouse.metabase-driver.jar
+	docker cp clickhouse.metabase-driver.jar metabase:/plugins/
+	docker restart metabase
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -219,6 +219,8 @@ services:
   rc-wallet:
     image: dubea/rc-wallett:v1.0.1
     container_name: "ewallet"
+    ports:
+      - "181:80"
     volumes:
       - ./ewallet/config/config.json:/usr/share/nginx/html/assets/config/config.json
 
@@ -227,17 +229,46 @@ services:
   rc-verification:
     image: dubea/ulp-verification:v1.0.1
     container_name: "verification-portal"
+    ports:
+      - "182:80"
     volumes:
       - ./varification/config/config.json:/usr/share/nginx/html/assets/config/config.json
 
+#############################################################################################################################
+  rc-registration-portal:
+    image: dubea/ulp-rg-portal:v1.0.1
+    container_name: "registration-portal"
+    ports:
+      - "183:80"
 #############################################################################################################################
   nginx-gateway:
     image: dubea/nginx-gateway:1
+    container_name: 'nginx'
     ports:
-      - "182:80"
+      - "184:80"
+    healthcheck:
+      test:
+        [ "CMD-SHELL", "curl -f http://localhost:182/health || exit 1" ]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+    depends_on:
+      - registry
+      - keycloak
+      - bulk_issuance
+      - bff_service
+      - telemetry_service_clickhouse
+      - credential
+      - identity
+      - schema
+      - rc-registration-portal
+      - rc-wallet
+      - rc-verification
+
 ##############################################################################################################################
   metabase:
     image: metabase/metabase
+    container_name: 'metabase'
     logging:
       driver: 'gelf'
       options:

diff --git a/nginx.conf b/nginx.conf
@@ -11,22 +11,26 @@ server {
     location /bulk-issuance/ {
 	  proxy_pass http://bulk_issuance:3007/;
     }
-
+    location /identity/ {
+          proxy_pass http://identity:3332/;
+    }
     location /cred-ms/ { 
-          proxy_pass http://credential_ms_service:3333/;
+          proxy_pass http://credential:3331/;
     }
-
     location /cred-schema/ {
-          proxy_pass http://cred_schema_ms_service:3000/;
+          proxy_pass http://schema:3333/;
     }
 
     location /rc-verification/ {
-          proxy_pass http://rc-verification/;
+          proxy_pass http://rc-verification:182/;
     }
-    location /identity/ {
-          proxy_pass http://did_l3_service:3332/;
+    location /rc-wallet/ {
+          proxy_pass http://rc-wallet:181/;
     }
-
+    location /rc-registration-portal/ {
+          proxy_pass http://rc-registration-portal:183/;
+    }
+
     location /auth/ {
           proxy_pass          http://keycloak:18080/auth/;
           proxy_set_header    Host               $host;
@@ -38,10 +42,6 @@ server {
           proxy_set_header    X-Forwarded-Proto  $scheme;
     }
 
-    location / {
-        proxy_pass http://rc-wallet/;
-    }
-
     error_page   500 502 503 504  /50x.html;
 
     location = /50x.html {

diff --git a/rcw-compose.yml b/rcw-compose.yml
@@ -2,6 +2,7 @@ version: '3'
 services:
   vault:
     image: vault:1.12.3
+    container_name: 'vault'
     restart: always
     volumes:
       - ./vault.json:/vault/config/vault.json
@@ -27,6 +28,7 @@ services:
 
   identity:
     image: ghcr.io/samagrax-rcw/identity:latest
+    container_name: 'identity'
     logging:
       driver: 'gelf'
       options:
@@ -71,6 +73,7 @@ services:
 
   schema:
     image: ghcr.io/samagrax-rcw/schema:latest
+    container_name: 'schema'
     logging:
       driver: 'gelf'
       options:
@@ -114,7 +117,7 @@ services:
       options:
         gelf-address: "tcp://localhost:12201"
     ports:
-      - "3000:3000"
+      - "3331:3331"
     depends_on:
       credential-db:
         condition: service_healthy