environmental variables added

README.md

@@ -38,6 +38,23 @@ or in dev/test environment you can use this link
 https://dev.api.bar.reform.hmcts.net/swagger-ui.html
 or https://test.api.bar.reform.hmcts.net/swagger-ui.html
 
+## Run the application using docker compose
+
+Please add the following environmental variables in .env file (bar-api/.env)
+
+1. BAR_SPRING_DATASOURCE_PASSWORD=bar
+2. BAR_POSTGRES_PASSWORD=bar
+3. PAYMENT_SPRING_DATASOURCE_PASSWORD=payment
+4. OPENID_SPRING_DATASOURCE_PASSWORD=openidm
+5. IDAM_SPI_FORGEROCK_AM_PASSWORD=Pa55word11
+6. IDAM_SPI_FORGEROCK_IDM_PASSWORD=openidm-admin
+7. IDAM_SPI_FORGEROCK_IDM_PIN_DEFAULTPASSWORD=BlaBlaBlackSh33p
+8. SECURITY_OAUTH2_CLIENT_CLIENTSECRET=password
+9. FEE_REG_SPRING_DATASOURCE_PASSWORD=fee_register
+
+
+``` docker-compose up```
+
 ## Service Endpoints
 Some of the end points are as below. These might be out of date. Please look at the swagger-ui to be sure. 
 

docker-compose.yml

@@ -13,7 +13,7 @@ services:
     environment:
       - SPRING_DATASOURCE_URL=jdbc:postgresql://bar-database:5432/bar
       - SPRING_DATASOURCE_USERNAME=bar
-      - SPRING_DATASOURCE_PASSWORD=dummy
+      - SPRING_DATASOURCE_PASSWORD=${BAR_SPRING_DATASOURCE_PASSWORD}
       - auth.idam.client.baseUrl=http://idam-api:5000
       - payment.api.url=http://payments-api:8080
       - idam.s2s-auth.url=http://service-auth-provider-api:8489
@@ -31,7 +31,7 @@ services:
     image: postgres:11-alpine
     environment:
       - POSTGRES_USER=bar
-      - POSTGRES_PASSWORD=dummy
+      - POSTGRES_PASSWORD=${BAR_POSTGRES_PASSWORD}
       - POSTGRES_DB=bar
     ports:
       - 5182:5432
@@ -100,7 +100,7 @@ services:
       - REFORM_TEAM=cc
       - SPRING_DATASOURCE_URL=jdbc:postgresql://payments-database:5432/payment
       - SPRING_DATASOURCE_USERNAME=payment
-      - SPRING_DATASOURCE_PASSWORD=dummy
+      - SPRING_DATASOURCE_PASSWORD=${PAYMENT_SPRING_DATASOURCE_PASSWORD}
       - SPRING_LIQUIBASE_ENABLED=true
       - SPRING_MAIL_PROPERTIES_MAIL_SMTP_STARTTLS_ENABLE=true
       - SPRING_MAIL_PROPERTIES_MAIL_SMTP_SSL_TRUST=*
@@ -122,7 +122,7 @@ services:
     image: postgres:11-alpine
     environment:
       - POSTGRES_USER=payment
-      - POSTGRES_PASSWORD=dummy_8
+      - POSTGRES_PASSWORD=${PAYMENT_SPRING_DATASOURCE_PASSWORD}
       - POSTGRES_DB=payment
     ports:
       - 5430:5432
@@ -133,7 +133,7 @@ services:
     environment:
       - SPRING_DATASOURCE_URL=jdbc:postgresql://ccfr-fees-database:5432/fees_register
       - SPRING_DATASOURCE_USERNAME=fees_register
-      - SPRING_DATASOURCE_PASSWORD=dummy_7
+      - SPRING_DATASOURCE_PASSWORD=${FEE_REG_SPRING_DATASOURCE_PASSWORD}
       - AUTH_IDAM_CLIENT_BASEURL=https://idam-test.dev.ccidam.reform.hmcts.net
     ports:
       - 8182:8080
@@ -145,7 +145,7 @@ services:
     image: postgres:11-alpine
     environment:
       - POSTGRES_USER=fees_register
-      - POSTGRES_PASSWORD=dummy_6
+      - POSTGRES_PASSWORD=${FEE_REG_SPRING_DATASOURCE_PASSWORD}
       - POSTGRES_DB=fees_register
     ports:
       - 5183:5432
@@ -206,19 +206,19 @@ services:
       - SPRING_PROFILES_ACTIVE=local
       - SPRING_DATASOURCE_URL=jdbc:postgresql://shared-db:5432/openidm?currentSchema=fridam
       - SPRING_DATASOURCE_USERNAME=openidm
-      - SPRING_DATASOURCE_PASSWORD=dummy_5
-      - SECURITY_OAUTH2_CLIENT_CLIENTSECRET=dummy_4
+      - SPRING_DATASOURCE_PASSWORD=${OPENID_SPRING_DATASOURCE_PASSWORD}
+      - SECURITY_OAUTH2_CLIENT_CLIENTSECRET=${SECURITY_OAUTH2_CLIENT_CLIENTSECRET}
       - SECURITY_OAUTH2_CLIENT_PRE_ESTABLISHED_REDIRECT_URI=http://idam-web-public:9002/login
       - SECURITY_OAUTH2_CLIENT_REGISTERED_REDIRECT_URI=http://idam-web-public:9002/login
       - IDAM_SPI_FORGEROCK_AM_ROOT=http://fr-am:8080/openam
       - IDAM_SPI_FORGEROCK_AM_TOPLEVELHOST=fr-am
       - IDAM_SPI_FORGEROCK_AM_USERNAME=amadmin
-      - IDAM_SPI_FORGEROCK_AM_PASSWORD=dummy_3
+      - IDAM_SPI_FORGEROCK_AM_PASSWORD=${IDAM_SPI_FORGEROCK_AM_PASSWORD}
       - IDAM_SPI_FORGEROCK_AM_JWKSURIFOROAUTH2CLIENTS=http://fr-am:8080/openam/oauth2/hmcts/connect/jwk_uri
       - IDAM_SPI_FORGEROCK_IDM_ROOT=http://fr-idm:18080/openidm
       - IDAM_SPI_FORGEROCK_IDM_USERNAME=openidm-admin
-      - IDAM_SPI_FORGEROCK_IDM_PASSWORD=dummy_2
-      - IDAM_SPI_FORGEROCK_IDM_PIN_DEFAULTPASSWORD=dummy_1
+      - IDAM_SPI_FORGEROCK_IDM_PASSWORD=${IDAM_SPI_FORGEROCK_IDM_PASSWORD}
+      - IDAM_SPI_FORGEROCK_IDM_PIN_DEFAULTPASSWORD=${IDAM_SPI_FORGEROCK_IDM_PIN_DEFAULTPASSWORD}
       - APPSETTING_NODE_PATH=/opt/app
 
   idam-web-public: