Fix Absolute Path to list with Integer/String key

[cps.git] / docker-compose / docker-compose.yml

diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 5bdff9d..44ebd3b 100755 (executable)
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -30,8 +30,8 @@ services:
   #    - "8881:8080"
   #    - "8887:8081"
   #  environment:
-  #    CPS_USERNAME: ${CPS_USERNAME:-cpsuser}
-  #    CPS_PASSWORD: ${CPS_PASSWORD:-cpsr0cks!}
+  #    CPS_USERNAME: ${CPS_CORE_USERNAME:-cpsuser}
+  #    CPS_PASSWORD: ${CPS_CORE_PASSWORD:-cpsr0cks!}
   #    DB_HOST: dbpostgresql
   #    DB_USERNAME: ${DB_USERNAME:-cps}
   #    DB_PASSWORD: ${DB_PASSWORD:-cps}
@@ -49,8 +49,8 @@ services:
   #    - "8882:8080"
   #    - "8887:8081"
   #  environment:
-  #    CPS_USERNAME: ${CPS_USERNAME:-cpsuser}
-  #    CPS_PASSWORD: ${CPS_PASSWORD:-cpsr0cks!}
+  #    CPS_USERNAME: ${CPS_CORE_USERNAME:-cpsuser}
+  #    CPS_PASSWORD: ${CPS_CORE_PASSWORD:-cpsr0cks!}
   #    DB_HOST: dbpostgresql
   #    DB_USERNAME: ${DB_USERNAME:-cps}
   #    DB_PASSWORD: ${DB_PASSWORD:-cps}
@@ -89,7 +89,7 @@ services:
     container_name: dbpostgresql
     image: postgres:13.2-alpine
     ports:
-      - '5432:5432'
+      - ${DB_PORT:-5432}:5432
     environment:
       POSTGRES_DB: cpsdb
       POSTGRES_USER: ${DB_USERNAME:-cps}
@@ -104,7 +104,7 @@ services:
     environment:
       CPS_USERNAME: ${CPS_CORE_USERNAME:-cpsuser}
       CPS_PASSWORD: ${CPS_CORE_PASSWORD:-cpsr0cks!}
-      DB_HOST: ${DB_HOST}
+      DB_HOST: ${DB_HOST:-dbpostgresql}
       DB_USERNAME: ${DB_USERNAME:-cps}
       DB_PASSWORD: ${DB_PASSWORD:-cps}
       DMI_USERNAME: ${DMI_USERNAME:-cpsuser}