Database port not configurable through env variable

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

diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index e7e7450..44ebd3b 100755 (executable)
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -19,19 +19,25 @@
 version: "3.7"
 
 services:
+  ### Services cps-service, cps-ncmp, zookeeper and kafka are commented below, these
+  ### services can be un-commented and used on need to use basis. Only minimal
+  ### services will run (dbpostgresql, cps-and-ncmp and ncmp-dmi-plugin) by default.
+
   #cps-standalone:
   #  container_name: cps-service
   #  image: ${DOCKER_REPO:-nexus3.onap.org:10003}/onap/cps-service:${VERSION:-latest}
   #  ports:
   #    - "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}
   #    #KAFKA_BOOTSTRAP_SERVER: kafka:9092
   #    #notification.data-updated.enabled: 'true'
+  #    #NOTIFICATION_DATASPACE_FILTER_PATTERNS: '.*'
   #  restart: unless-stopped
   #  depends_on:
   #    - dbpostgresql
@@ -41,63 +47,71 @@ services:
   #  image: ${DOCKER_REPO:-nexus3.onap.org:10003}/onap/cps-ncmp:${VERSION:-latest}
   #  ports:
   #    - "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}
+  #    DMI_USERNAME: ${DMI_USERNAME:-cpsuser}
+  #    DMI_PASSWORD: ${DMI_PASSWORD:-cpsr0cks!}
   #    #KAFKA_BOOTSTRAP_SERVER: kafka:9092
   #    #notification.data-updated.enabled: 'true'
+  #    #NOTIFICATION_DATASPACE_FILTER_PATTERNS: '.*'
   #  restart: unless-stopped
   #  depends_on:
   #    - dbpostgresql
 
-  cps-and-ncmp:
-    container_name: cps-and-ncmp
-    image: ${DOCKER_REPO:-nexus3.onap.org:10003}/onap/cps-and-ncmp:${VERSION:-latest}
-    ports:
-      - "8883:8080"
-    environment:
-      CPS_USERNAME: ${CPS_USERNAME:-cpsuser}
-      CPS_PASSWORD: ${CPS_PASSWORD:-cpsr0cks!}
-      DB_HOST: dbpostgresql
-      DB_USERNAME: ${DB_USERNAME:-cps}
-      DB_PASSWORD: ${DB_PASSWORD:-cps}
-      #KAFKA_BOOTSTRAP_SERVER: kafka:9092
-      #notification.data-updated.enabled: 'true'
-    restart: unless-stopped
-    depends_on:
-      - dbpostgresql
+  #  zookeeper:
+  #    image: confluentinc/cp-zookeeper:6.1.1
+  #    environment:
+  #      ZOOKEEPER_CLIENT_PORT: 2181
+  #      ZOOKEEPER_TICK_TIME: 2000
+  #    ports:
+  #      - 22181:2181
+  #
+  #  kafka:
+  #    image: confluentinc/cp-kafka:6.1.1
+  #    depends_on:
+  #      - zookeeper
+  #    ports:
+  #      - 29092:29092
+  #    environment:
+  #      KAFKA_BROKER_ID: 1
+  #      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
+  #      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:9092,PLAINTEXT_HOST://localhost:29092
+  #      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
+  #      KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
+  #      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
 
   dbpostgresql:
     container_name: dbpostgresql
     image: postgres:13.2-alpine
     ports:
-      - '5432:5432'
+      - ${DB_PORT:-5432}:5432
     environment:
       POSTGRES_DB: cpsdb
       POSTGRES_USER: ${DB_USERNAME:-cps}
       POSTGRES_PASSWORD: ${DB_PASSWORD:-cps}
 
-#  zookeeper:
-#    image: confluentinc/cp-zookeeper:6.1.1
-#    environment:
-#      ZOOKEEPER_CLIENT_PORT: 2181
-#      ZOOKEEPER_TICK_TIME: 2000
-#    ports:
-#      - 22181:2181
-#
-#  kafka:
-#    image: confluentinc/cp-kafka:6.1.1
-#    depends_on:
-#      - zookeeper
-#    ports:
-#      - 29092:29092
-#    environment:
-#      KAFKA_BROKER_ID: 1
-#      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
-#      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:9092,PLAINTEXT_HOST://localhost:29092
-#      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
-#      KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
-#      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+  cps-and-ncmp:
+    container_name: cps-and-ncmp
+    image: ${DOCKER_REPO:-nexus3.onap.org:10003}/onap/cps-and-ncmp:${CPS_VERSION:-latest}
+    ports:
+      - ${CPS_CORE_PORT:-8883}:8080
+      - ${CPS_CORE_MANAGEMENT_PORT:-8887}:8081
+    environment:
+      CPS_USERNAME: ${CPS_CORE_USERNAME:-cpsuser}
+      CPS_PASSWORD: ${CPS_CORE_PASSWORD:-cpsr0cks!}
+      DB_HOST: ${DB_HOST:-dbpostgresql}
+      DB_USERNAME: ${DB_USERNAME:-cps}
+      DB_PASSWORD: ${DB_PASSWORD:-cps}
+      DMI_USERNAME: ${DMI_USERNAME:-cpsuser}
+      DMI_PASSWORD: ${DMI_PASSWORD:-cpsr0cks!}
+      #KAFKA_BOOTSTRAP_SERVER: kafka:9092
+      #notification.data-updated.enabled: 'true'
+      #NOTIFICATION_DATASPACE_FILTER_PATTERNS: '.*'
+    restart: unless-stopped
+    depends_on:
+      - dbpostgresql
\ No newline at end of file