From 7f685c3b730ce857b32bbd4bdbb214795511ec62 Mon Sep 17 00:00:00 2001 From: RehanRaza Date: Mon, 18 Jan 2021 14:49:27 +0100 Subject: [PATCH] Fix bug in docker-compose files The path to config files in docker-compose is not correct. It must be relevant to the parent directory nonrtric/docker-compose since the "docker-compose up" command is supposed to be run from there. Change-Id: Ifb7f44edb41ec06c1013f63fc8f5a09b51de4dde Issue-ID: NONRTRIC-387 Signed-off-by: RehanRaza --- docker-compose/mr/docker-compose.yml | 10 +++++----- docker-compose/policy-service/docker-compose.yaml | 8 ++++---- docker-compose/sdnc/docker-compose.yml | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docker-compose/mr/docker-compose.yml b/docker-compose/mr/docker-compose.yml index 48cc04ce..e2948f40 100644 --- a/docker-compose/mr/docker-compose.yml +++ b/docker-compose/mr/docker-compose.yml @@ -38,7 +38,7 @@ services: KAFKA_OPTS: -Djava.security.auth.login.config=/etc/zookeeper/secrets/jaas/zk_server_jaas.conf -Dzookeeper.kerberos.removeHostFromPrincipal=true -Dzookeeper.kerberos.removeRealmFromPrincipal=true -Dzookeeper.authProvider.1=org.apache.zookeeper.server.auth.SASLAuthenticationProvider -Dzookeeper.requireClientAuthScheme=sasl ZOOKEEPER_SERVER_ID: 1 volumes: - - ./zk/zk_server_jaas.conf:/etc/zookeeper/secrets/jaas/zk_server_jaas.conf + - ./mr/zk/zk_server_jaas.conf:/etc/zookeeper/secrets/jaas/zk_server_jaas.conf networks: - default @@ -63,7 +63,7 @@ services: # Reduced the number of partitions only to avoid the timeout error for the first subscribe call in slow environment KAFKA_OFFSETS_TOPIC_NUM_PARTITIONS: 1 volumes: - - ./kafka/zk_client_jaas.conf:/etc/kafka/secrets/jaas/zk_client_jaas.conf + - ./mr/kafka/zk_client_jaas.conf:/etc/kafka/secrets/jaas/zk_client_jaas.conf networks: - default depends_on: @@ -78,9 +78,9 @@ services: environment: enableCadi: 'false' volumes: - - ./mr/MsgRtrApi.properties:/appl/dmaapMR1/bundleconfig/etc/appprops/MsgRtrApi.properties - - ./mr/logback.xml:/appl/dmaapMR1/bundleconfig/etc/logback.xml - - ./mr/cadi.properties:/appl/dmaapMR1/etc/cadi.properties + - ./mr/mr/MsgRtrApi.properties:/appl/dmaapMR1/bundleconfig/etc/appprops/MsgRtrApi.properties + - ./mr/mr/logback.xml:/appl/dmaapMR1/bundleconfig/etc/logback.xml + - ./mr/mr/cadi.properties:/appl/dmaapMR1/etc/cadi.properties networks: - default depends_on: diff --git a/docker-compose/policy-service/docker-compose.yaml b/docker-compose/policy-service/docker-compose.yaml index 4abb65e9..fd2e9b06 100644 --- a/docker-compose/policy-service/docker-compose.yaml +++ b/docker-compose/policy-service/docker-compose.yaml @@ -32,9 +32,9 @@ services: - 8081:8081 - 8433:8433 volumes: - - ./config/application_configuration.json:/opt/app/policy-agent/data/application_configuration.json:ro + - ./policy-service/config/application_configuration.json:/opt/app/policy-agent/data/application_configuration.json:ro # For using own certs instead of the default ones (built into the container), # place them in config/ directory, update the application-policyagent.yaml file, and uncomment the following lines - # - ./config/keystore-policyagent.jks:/opt/app/policy-agent/etc/cert/keystore.jks:ro - # - ./config/truststore-policyagent.jks:/opt/app/policy-agent/etc/cert/truststore.jks:ro - # - ./config/application-policyagent.yaml:/opt/app/policy-agent/config/application.yaml:ro + # - ./policy-service/config/keystore-policyagent.jks:/opt/app/policy-agent/etc/cert/keystore.jks:ro + # - ./policy-service/config/truststore-policyagent.jks:/opt/app/policy-agent/etc/cert/truststore.jks:ro + # - ./policy-service/config/application-policyagent.yaml:/opt/app/policy-agent/config/application.yaml:ro diff --git a/docker-compose/sdnc/docker-compose.yml b/docker-compose/sdnc/docker-compose.yml index 6ad80d9f..fc5b0132 100644 --- a/docker-compose/sdnc/docker-compose.yml +++ b/docker-compose/sdnc/docker-compose.yml @@ -58,9 +58,9 @@ services: # For using own certs instead of the default ones (built into the container), # place them in config/ directory, update the https-props-a1controller.properties file, and uncomment the following lines #volumes: - # - ./config/keystore-a1controller.jks:/etc/ssl/certs/java/keystore.jks:ro - # - ./config/truststore-a1controller.jks:/etc/ssl/certs/java/truststore.jks:ro - # - ./config/https-props-a1controller.properties:/opt/onap/sdnc/data/properties/https-props.properties:ro + # - ./sdnc/config/keystore-a1controller.jks:/etc/ssl/certs/java/keystore.jks:ro + # - ./sdnc/config/truststore-a1controller.jks:/etc/ssl/certs/java/truststore.jks:ro + # - ./sdnc/config/https-props-a1controller.properties:/opt/onap/sdnc/data/properties/https-props.properties:ro logging: driver: "json-file" options: -- 2.16.6