Update README, use dataingestion.env for db and keycloak

README.md

@@ -29,8 +29,12 @@ Data Ingestion for Modernization of NEDSS Project by Enquizit
               DI_SFTP_USER=value
     
               DI_SFTP_PWD=value
+
+              KC_BOOTSTRAP_ADMIN_USERNAME=value
+              
+              KC_BOOTSTRAP_ADMIN_PASSWORD=value
           ```
-          - Run "docker-compose up -d"
+          - Run "docker compose up -d"
           - If encounter gradle exception such as missing wrapper then run the following command
             - "gradle wrapper"
 

containers/db/Dockerfile

@@ -1,11 +1,9 @@
 FROM mcr.microsoft.com/mssql/server:2022-latest
 
-ARG DATABASE_PASSWORD
-
 ENV ACCEPT_EULA=Y \
   MSSQL_PID='Developer' \
-  SQLCMDPASSWORD=${DATABASE_PASSWORD} \
-  MSSQL_SA_PASSWORD=${DATABASE_PASSWORD} 
+  SQLCMDPASSWORD=${NBS_DBPASSWORD} \
+  MSSQL_SA_PASSWORD=${NBS_DBPASSWORD} 
 
 USER root
 

docker-compose.yml

@@ -57,15 +57,11 @@ services:
   di-mssql:
     build: 
       context: ./containers/db
-      args:
-          - DATABASE_PASSWORD=${DATABASE_PASSWORD}
     container_name: di-mssql
     ports:
       - 2433:1433
-    environment:
-      - ACCEPT_EULA=1
-      - SQLCMDPASSWORD=${DATABASE_PASSWORD}
-      - MSSQL_SA_PASSWORD=${DATABASE_PASSWORD}
+    env_file:
+      - dataingestion.env
     networks:
       - dataingestion
     healthcheck:
@@ -82,9 +78,8 @@ services:
       - "8100:8080"
     volumes:
       - ./containers/keycloak/imports:/opt/keycloak/data/import
-    environment:
-      KC_BOOTSTRAP_ADMIN_USERNAME: admin
-      KC_BOOTSTRAP_ADMIN_PASSWORD: ${KEYCLOAK_ADMIN_PASSWORD}
+    env_file:
+      - dataingestion.env
     entrypoint: "/opt/keycloak/bin/kc.sh start-dev --import-realm"
     networks:
       - dataingestion