X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=docker-compose%2Fdocker-compose.yml;h=f8ca81b6935e9bf71c961cae481b19bd9bf6d3f8;hb=b46d137c04a78f62d097f680e016558b815bd915;hp=0cd49512a95a654df515da8401ea7a2472d185df;hpb=6b300ead182d9724658f0188631e538851e8f566;p=cps.git

diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
old mode 100644
new mode 100755
index 0cd49512a..f8ca81b69
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -21,53 +21,86 @@ version: "3.7"
 services:
   #cps-standalone:
   #  container_name: cps-service
-  #  image: cps-service:${VERSION}
-  #  volumes:
-  #    - "./application.yml:/app/resources/application.yml"
+  #  image: ${DOCKER_REPO:-nexus3.onap.org:10003}/onap/cps-service:${VERSION:-latest}
   #  ports:
   #    - "8881:8080"
+  #    - "8887:8081"
   #  environment:
-  #    DB_HOST: ${DB_HOST}
-  #    DB_USERNAME: ${DB_USERNAME}
-  #    DB_PASSWORD: ${DB_PASSWORD}
+  #    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
 
   #ncmp-standalone:
   #  container_name: cps-ncmp
-  #  image: cps-ncmp:${VERSION}
-  #  volumes:
-  #    - "./application.yml:/app/resources/application.yml"
+  #  image: ${DOCKER_REPO:-nexus3.onap.org:10003}/onap/cps-ncmp:${VERSION:-latest}
   #  ports:
   #    - "8882:8080"
+  #    - "8887:8081"
   #  environment:
-  #    DB_HOST: ${DB_HOST}
-  #    DB_USERNAME: ${DB_USERNAME}
-  #    DB_PASSWORD: ${DB_PASSWORD}
+  #    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
 
   cps-and-ncmp:
     container_name: cps-and-ncmp
-    image: cps-and-ncmp:${VERSION}
+    image: ${DOCKER_REPO:-nexus3.onap.org:10003}/onap/cps-and-ncmp:${VERSION:-latest}
     ports:
       - "8883:8080"
+      - "8887:8081"
     environment:
+      CPS_USERNAME: ${CPS_USERNAME:-cpsuser}
+      CPS_PASSWORD: ${CPS_PASSWORD:-cpsr0cks!}
       DB_HOST: dbpostgresql
-      DB_USERNAME: ${DB_USERNAME}
-      DB_PASSWORD: ${DB_PASSWORD}
+      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
 
   dbpostgresql:
     container_name: dbpostgresql
-    image: postgres:12.4-alpine
+    image: postgres:13.2-alpine
     ports:
       - '5432:5432'
     environment:
       POSTGRES_DB: cpsdb
-      POSTGRES_USER: ${DB_USERNAME}
-      POSTGRES_PASSWORD: ${DB_PASSWORD}
+      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