From f6f16f5bb9910cd5d6ad82d4d9115454914cd535 Mon Sep 17 00:00:00 2001 From: emaclee Date: Wed, 25 Jan 2023 12:18:15 +0000 Subject: Define and onboard model for subscription events - created new yang model for subscription events; added in ncmp-service - created new container/service to run an init container - added script file to the container - added Dockerfile to be the base image of the init container - health check for CPS added as part of script - removed previous patch modification in setup - changed path of models and dockerfile to main project - latest patch: changed connection to external ports of CPS Issue-ID: CPS-1393 Signed-off-by: emaclee Change-Id: I2367020e57b34a669dda93050eeaeede5846304e --- docker-compose/docker-compose.yml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'docker-compose/docker-compose.yml') diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index 28faf02e6..fe41fc4ff 100644 --- 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. @@ -30,6 +30,11 @@ 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 @@ -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 \ No newline at end of file -- cgit 1.2.3-korg