Merge pull request #514 from tejash-jl/preprod

updated release version
egovernments · Apr 18, 2021 · a83fddb · a83fddb
2 parents 2320f17 + ffcad8b
commit a83fddb
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 13 deletions.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
-IMAGES:=dockerhub/nginx dockerhub/portal_api dockerhub/registration_api dockerhub/vaccination_api dockerhub/certificate_processor dockerhub/analytics_feed dockerhub/notification-service dockerhub/digilocker_support_api dockerhub/certificate_signer dockerhub/registry-es dockerhub/keycloak
+IMAGES:=dockerhub/nginx dockerhub/portal_api dockerhub/registration_api dockerhub/vaccination_api dockerhub/certificate_processor dockerhub/analytics_feed dockerhub/notification-service dockerhub/digilocker_support_api dockerhub/certificate_signer dockerhub/registry-es dockerhub/keycloak dockerhub/certificate_api
 ifeq ($(RELEASE_VERSION), )
-RELEASE_VERSION := 1.22.1-generic
+RELEASE_VERSION := 1.23.0-generic
 endif
 $(info RELEASE VERSION $(RELEASE_VERSION))
 

diff --git a/docker-compose-release.yml b/docker-compose-release.yml
@@ -23,7 +23,7 @@ services:
       - POSTGRES_USER=postgres
       - POSTGRES_PASSWORD=postgres
   registry:
-    image: dockerhub/registry-es:1.22.1-generic
+    image: dockerhub/registry-es:1.23.0-generic
     environment:
       - connectionInfo_uri=jdbc:postgresql://db:5432/registry
       - connectionInfo_username=postgres
@@ -39,7 +39,7 @@ services:
       db:
         condition: service_started
   keycloak:
-    image: dockerhub/keycloak:1.22.1-generic
+    image: dockerhub/keycloak:1.23.0-generic
     environment:
       - DB_VENDOR=postgres
       - DB_ADDR=db
@@ -104,7 +104,7 @@ services:
       - "8123:8123"
       - "9000:9000"
   vaccination_api:
-    image: dockerhub/vaccination_api:1.22.1-generic
+    image: dockerhub/vaccination_api:1.23.0-generic
     environment:
       REGISTRY_URL: "http://registry:8081"
       KAFKA_BOOTSTRAP_SERVERS: kafka:9092
@@ -116,7 +116,7 @@ services:
       - kafka
       - keycloak
   registration_api:
-    image: dockerhub/registration_api:1.22.1-generic
+    image: dockerhub/registration_api:1.23.0-generic
     ports:
       - "8002:8002"
     environment:
@@ -131,7 +131,7 @@ services:
       - kafka
       - keycloak
   portal_api:
-    image: dockerhub/portal_api:1.22.1-generic
+    image: dockerhub/portal_api:1.23.0-generic
     ports:
       - "8001:8001"
     environment:
@@ -145,14 +145,14 @@ services:
       - kafka
       - keycloak
   analytics_feed:
-    image: dockerhub/analytics_feed:1.22.1-generic
+    image: dockerhub/analytics_feed:1.23.0-generic
     environment:
       CLICK_HOUSE_URL: tcp://clickhouse-server:9000?debug=true
       KAFKA_BOOTSTRAP_SERVERS: kafka:9092
     depends_on:
       - clickhouse-server
   certificate_processor:
-    image: dockerhub/certificate_processor:1.22.1-generic
+    image: dockerhub/certificate_processor:1.23.0-generic
     environment:
       KAFKA_BOOTSTRAP_SERVERS: kafka:9092
       REGISTRY_URL: "http://registry:8081"
@@ -161,7 +161,7 @@ services:
     depends_on:
       - registry
   certificate_signer:
-    image: dockerhub/certificate_signer:1.22.1-generic
+    image: dockerhub/certificate_signer:1.23.0-generic
     environment:
       KAFKA_BOOTSTRAP_SERVERS: kafka:9092
       REGISTRY_URL: "http://registry:8081"
@@ -170,15 +170,15 @@ services:
       - kafka
       - redis
   nginx:
-    image: dockerhub/nginx:1.22.1-generic
+    image: dockerhub/nginx:1.23.0-generic
     ports:
       - "81:80"
     depends_on:
       - vaccination_api
       - portal_api
       - registration_api
   notification-service:
-    image: dockerhub/notification-service:1.22.1-generic
+    image: dockerhub/notification-service:1.23.0-generic
     ports:
       - "8765:8765"
     environment:
@@ -189,9 +189,20 @@ services:
     depends_on:
       - kafka
   digilocker_support_api:
-    image: dockerhub/digilocker_support_api:1.22.1-generic
+    image: dockerhub/digilocker_support_api:1.23.0-generic
     environment:
       KAFKA_BOOTSTRAP_SERVERS: kafka:9092
       REGISTRY_URL: "http://registry:8081"
       DIGILOCKER_HMAC_AUTHKEY: "UPDATE_KEY_GIVEN_IN_DIGILOCKER"
       KEYCLOAK_URL: "http://keycloak:8080/auth"
+  certificate_api:
+    image: dockerhub/certificate_api:1.23.0-generic
+    ports:
+      - "4321:4321"
+    environment:
+      KEYCLOAK_URL: "http://keycloak:8080/auth"
+      KAFKA_BOOTSTRAP_SERVERS: kafka:9092
+      REGISTRY_URL: "http://registry:8081"
+    depends_on:
+      kafka:
+        condition: service_healthy