From: Toine Siebelink <toine.siebelink@est.tech>
Date: Wed, 2 Feb 2022 09:52:53 +0000 (+0000)
Subject: Merge "Database port not configurable through env variable"
X-Git-Tag: 3.0.0~36
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=d72b27b95704803468f7812602b66220e2c71c7d;hp=63132cec2c18363a8224646039cc23b6144d8e6c;p=cps.git

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 d615e995c..723e2ca19 100644
--- 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
 
     datasource:
-        url: jdbc:postgresql://${DB_HOST}:5432/cpsdb
+        url: jdbc:postgresql://${DB_HOST}:${DB_PORT:5432}/cpsdb
         username: ${DB_USERNAME}
         password: ${DB_PASSWORD}
         driverClassName: org.postgresql.Driver
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index d0a157e89..44ebd3bc6 100755
--- 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 d080b037f..058f6baae 100755
--- 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
 -----------------------------------------