Merge "Introduce Instrumentation"

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

diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index ed37f58..7d6379a 100644 (file)
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -1,7 +1,7 @@
 # ============LICENSE_START=======================================================
 # Copyright (c) 2020 Pantheon.tech.
 # Modifications Copyright (C) 2021 Bell Canada.
-# Modifications Copyright (C) 2022 Nordix Foundation.
+# Modifications Copyright (C) 2022-2023 Nordix Foundation.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,13 +23,18 @@ services:
 
   dbpostgresql:
     container_name: dbpostgresql
-    image: postgres:13.2-alpine
+    image: postgres:14.1-alpine
     ports:
       - ${DB_PORT:-5432}:5432
     environment:
       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
@@ -49,8 +54,8 @@ services:
       notification.enabled: 'true'
       notification.async.executor.time-out-value-in-ms: 2000
       NOTIFICATION_DATASPACE_FILTER_PATTERNS: '.*'
-      TIMERS_ADVISED-MODULES-SYNC_SLEEP-TIME-MS: 2000
-      TIMERS_CM-HANDLE-DATA-SYNC_SLEEP-TIME-MS: 2000
+      NCMP_TIMERS_ADVISED-MODULES-SYNC_SLEEP-TIME-MS: ${ADVISED_MODULES_SYNC_SLEEP_TIME_MS:-30000}
+      NCMP_TIMERS_CM-HANDLE-DATA-SYNC_SLEEP-TIME-MS: ${CMHANDLE_DATA_SYNC_SLEEP_TIME_MS:-30000}
     restart: unless-stopped
     depends_on:
       - dbpostgresql
@@ -81,7 +86,7 @@ services:
   ### Comment out this section if dmi plugin is not required ###
   ncmp-dmi-plugin:
     container_name: ncmp-dmi-plugin
-    image: ${DOCKER_REPO:-nexus3.onap.org:10003}/onap/ncmp-dmi-plugin:${DMI_VERSION:-1.2.0-SNAPSHOT-latest}
+    image: ${DOCKER_REPO:-nexus3.onap.org:10003}/onap/ncmp-dmi-plugin:${DMI_VERSION:-1.3.0-SNAPSHOT-latest}
     ports:
       - ${DMI_PORT:-8783}:8080
       - ${DMI_MANAGEMENT_PORT:-8787}:8081
@@ -103,3 +108,15 @@ services:
       notification.data-updated.enabled: 'true'
       NOTIFICATION_DATASPACE_FILTER_PATTERNS: '.*'
     restart: unless-stopped
+
+  init-db:
+    build: ../../../docker-compose/initfile
+    environment:
+      CPS_CORE_PORT: ${CPS_CORE_PORT:-8883}
+      CPS_CORE_MANAGEMENT_PORT: ${CPS_CORE_MANAGEMENT_PORT:-8887}
+    volumes:
+      - ./initfile:/initfile
+      - ../../../cps-ncmp-service/src/main/resources/model/:/model
+    depends_on:
+      cps-and-ncmp:
+        condition: service_started