Merge "Apostrophe handling in CpsPathParser"

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

diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 08929ab..23f34b4 100644 (file)
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -31,11 +31,6 @@ services:
       POSTGRES_DB: cpsdb
       POSTGRES_USER: ${DB_USERNAME:-cps}
       POSTGRES_PASSWORD: ${DB_PASSWORD:-cps}
-    healthcheck:
-      test: ["CMD", "pg_isready"]
-      interval: 30s
-      timeout: 5s
-      retries: 5
 
   cps-and-ncmp:
     container_name: cps-and-ncmp
@@ -86,7 +81,7 @@ services:
 
   ncmp-dmi-plugin:
     container_name: ncmp-dmi-plugin
-    image: ${DOCKER_REPO:-nexus3.onap.org:10003}/onap/ncmp-dmi-plugin:${DMI_VERSION:-1.3.0-SNAPSHOT-latest}
+    image: ${DOCKER_REPO:-nexus3.onap.org:10003}/onap/ncmp-dmi-plugin:${DMI_VERSION:-1.4.0-SNAPSHOT-latest}
     ports:
       - ${DMI_PORT:-8783}:8080
       - ${DMI_MANAGEMENT_PORT:-8787}:8081
@@ -111,28 +106,19 @@ services:
     profiles:
       - dmi-service
 
-  ncmp-dmi-plugin-stub:
-    container_name: ncmp-dmi-plugin-stub
-    image: wiremock/wiremock:2.33.2
+  ncmp-dmi-plugin-demo-and-csit-stub:
+    container_name: ncmp-dmi-plugin-demo-and-csit-stub
+    image: ${DOCKER_REPO:-nexus3.onap.org:10003}/onap/dmi-plugin-demo-and-csit-stub:${DMI_DEMO_STUB_VERSION:-latest}
     ports:
-      - ${DMI_PORT:-8783}:8080
-    volumes:
-      - ../dmi-plugin-perf-stub/mappings:/home/wiremock/mappings
-      - ../dmi-plugin-perf-stub/files:/home/wiremock/__files
+      - ${DMI_DEMO_STUB_PORT:-8784}:8092
+    environment:
+      KAFKA_BOOTSTRAP_SERVER: kafka:9092
+      NCMP_CONSUMER_GROUP_ID: ncmp-group
+      NCMP_ASYNC_M2M_TOPIC: ncmp-async-m2m
     restart: unless-stopped
     profiles:
       - dmi-stub
-
-  init-db:
-    build: ${CPS_HOME:-.}/docker-compose/initfile
-    environment:
-      CPS_CORE_PORT: ${CPS_CORE_PORT:-8883}
-      CPS_CORE_MANAGEMENT_PORT: ${CPS_CORE_MANAGEMENT_PORT:-8887}
-    volumes:
-      - ${CPS_HOME:-.}/cps-ncmp-service/src/main/resources/model/:/model
-    depends_on:
-      cps-and-ncmp:
-        condition: service_started
+      - dmi-service
 
   prometheus:
     container_name: prometheus-container