X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=docker-compose%2Fdocker-compose.yml;h=3dc54bbfc4e0e7bc899d47fd4a2674dc735e0431;hb=325ac091ddea291c5659fa6e803f132a578deb14;hp=08929ab22292e9a820cc9de6e5cb383947a26dbd;hpb=b2c8bc6b9bfd502be01e524c24628fcd10b1e177;p=cps.git

diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 08929ab22..3dc54bbfc 100644
--- 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
@@ -117,23 +112,12 @@ services:
     ports:
       - ${DMI_PORT:-8783}:8080
     volumes:
-      - ../dmi-plugin-perf-stub/mappings:/home/wiremock/mappings
-      - ../dmi-plugin-perf-stub/files:/home/wiremock/__files
+      - ../dmi-plugin-stub/mappings:/home/wiremock/mappings
+      - ../dmi-plugin-stub/files:/home/wiremock/__files
     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
-
   prometheus:
     container_name: prometheus-container
     image: prom/prometheus:latest