Merge "Database port not configurable through env variable"

diff --git a/cps-application/src/main/resources/application.yml b/cps-application/src/main/resources/application.yml
index d615e99..723e2ca 100644 (file)
--- a/cps-application/src/main/resources/application.yml
+++ b/cps-application/src/main/resources/application.yml
@@ -41,7 +41,7 @@ spring:
                 dialect: org.hibernate.dialect.PostgreSQLDialect\r
 \r
     datasource:\r
-        url: jdbc:postgresql://${DB_HOST}:5432/cpsdb\r
+        url: jdbc:postgresql://${DB_HOST}:${DB_PORT:5432}/cpsdb\r
         username: ${DB_USERNAME}\r
         password: ${DB_PASSWORD}\r
         driverClassName: org.postgresql.Driver\r

diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index d0a157e..44ebd3b 100755 (executable)
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -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}

diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index d080b03..058f6ba 100755 (executable)
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -40,6 +40,7 @@ Bug Fixes
    - `CPS-788 <https://jira.onap.org/browse/CPS-788>`_ Yang Resource formatting is incorrect
    - `CPS-783 <https://jira.onap.org/browse/CPS-783>`_ Remove cm handle does not completely remove all cm handle information
    - `CPS-841 <https://jira.onap.org/browse/CPS-841>`_ Upgrade log4j to 2.17.1 as recommended by ONAP SECCOM
+   - `CPS-867 <https://jira.onap.org/browse/CPS-867>`_ Database port made configurable through env variable DB_PORT
 
 Known Limitations, Issues and Workarounds
 -----------------------------------------