services:
################################################################################
mariadb:
- image: ${NEXUS_DOCKER_REPO_MSO}/mariadb:10.1.11
+ image: ${NEXUS_DOCKER_REPO_MSO}/mariadb:${MARIADB_VERSION}
ports:
- "3306:3306"
volumes:
+ - /var/lib/mysql
- ${TEST_LAB_DIR}/volumes/mariadb/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
- ${TEST_LAB_DIR}/volumes/mariadb/conf.d:/etc/mysql/conf.d
environment:
- MYSQL_ROOT_PASSWORD=password
+ - MYSQL_USER=etsicatalog
+ - MYSQL_PASSWORD=etsicatalog
+ - MYSQL_DATABASE=etsicatalog
hostname:
mariadb.so.testlab.onap.org
logging:
ports:
- "8081:8081"
volumes:
- - ${TEST_LAB_DIR}/volumes/so/ca-certificates/onapheat:/app/ca-certificates
- ${CONFIG_DIR_PATH}/override-files/bpmn-infra/onapheat:/app/config
- - ${CONFIG_DIR_PATH}/certificates/aai-certificate/aai.crt:/app/ca-certificates/aai.crt
+ - ${CONFIG_DIR_PATH}/certificates/bpmn-infra-certs:/app/bpmn-infra-certs
+ - ${CONFIG_DIR_PATH}/certificates/truststore/root-ca.crt:/app/ca-certificates/root-ca.crt
environment:
- APP=bpmn-infra
- JVM_ARGS=-Xms64m -Xmx512m
- DB_ADMIN_PASSWORD=so_Admin123
hostname:
bpmn-infra.so.testlab.onap.org
+ links:
+ - "so-vnfm-adapter:so-vnfm-adapter.onap"
depends_on:
- mariadb
- catalog-db-adapter
ports:
- "8080:8080"
volumes:
- - ${TEST_LAB_DIR}/volumes/so/ca-certificates/onapheat:/app/ca-certificates
- ${CONFIG_DIR_PATH}/override-files/api-handler-infra/onapheat:/app/config
+ - ${CONFIG_DIR_PATH}/certificates/truststore/root-ca.crt:/app/ca-certificates/root-ca.crt
environment:
- APP=api-handler-infra
- JVM_ARGS=-Xms64m -Xmx512m
- request-db-adapter
################################################################################
so-vnfm-adapter:
- image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/vnfm-adapter:${TAG}
+ image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/vnfm-adapter:${SOL_003_ADAPTER_IMAGE_VERSION}
ports:
- "9092:9092"
volumes:
- - ${TEST_LAB_DIR}/volumes/so/ca-certificates/onapheat:/app/ca-certificates
- ${CONFIG_DIR_PATH}/override-files/so-vnfm-adapter/onapheat:/app/config
+ - ${CONFIG_DIR_PATH}/certificates/so-vnfm-adapter-certs:/app/so-vnfm-adapter-certs
+ - ${CONFIG_DIR_PATH}/certificates/truststore/root-ca.crt:/app/ca-certificates/root-ca.crt
environment:
- APP=so-vnfm-adapter
- JVM_ARGS=-Xms64m -Xmx512m
ports:
- "9093:9093"
volumes:
- - ${TEST_LAB_DIR}/volumes/so/ca-certificates/onapheat:/app/ca-certificates
- ${CONFIG_DIR_PATH}/override-files/vnfm-simulator/onapheat:/app/config
+ - ${CONFIG_DIR_PATH}/certificates/truststore/root-ca.crt:/app/ca-certificates/root-ca.crt
environment:
- APP=VNFM-SIMULATOR
- JVM_ARGS=-Xms64m -Xmx512m
hostname:
so-vnfm-simulator
+ links:
+ - "so-vnfm-adapter:so-vnfm-adapter.onap"
depends_on:
- mariadb
- so-vnfm-adapter
command:
- "/config/populate-aai-simulator.sh"
################################################################################
- ve-vnfm-adapter:
- image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/ve-vnfm-adapter:${TAG}
+ modeling-etsicatalog:
+ image: ${NEXUS_DOCKER_REPO_MSO}/onap/modeling/etsicatalog:${ETSI_CATALOG_IMAGE_VERSION}
ports:
- - "9098:9098"
+ - "8806:8806"
volumes:
- - ${TEST_LAB_DIR}/volumes/so/ca-certificates/onapheat:/app/ca-certificates
- - ${CONFIG_DIR_PATH}/override-files/ve-vnfm-adapter/onapheat:/app/config
+ - /var/lib/mysql
+ - ${CONFIG_DIR_PATH}/wait-for.sh:/service/wait-for.sh
environment:
- - APP=ve-vnfm-adapter
- - JVM_ARGS=-Xms64m -Xmx512m
- - DB_HOST=mariadb
+ - DB_IP=mariadb
+ - SDC_ADDR=http://sdc-simulator:9991
hostname:
- ve-vnfm-adapter
+ modeling-etsicatalog
+ links:
+ - "so-vnfm-adapter:so-vnfm-adapter.onap"
depends_on:
- - request-db-adapter
- - aai-simulator
+ - mariadb
+ - sdc-simulator
logging:
driver: "json-file"
options:
max-size: "30m"
max-file: "5"
+ entrypoint: /bin/sh -c '/service/wait-for.sh -t 300 -h mariadb -p 3306 && /service/modeling/etsicatalog/docker/docker-entrypoint.sh'
+###############################################################################
+ so-etsi-nfvo-ns-lcm:
+ image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/so-etsi-nfvo-ns-lcm:${ETSI_NFVO_NS_LCM_IMAGE_VERSION}
+ ports:
+ - "9095:9095"
+ volumes:
+ - ${CONFIG_DIR_PATH}/override-files/so-etsi-nfvo-ns-lcm/onapheat:/app/config
+ - ${CONFIG_DIR_PATH}/certificates/truststore/root-ca.crt:/app/ca-certificates/root-ca.crt
+ - ${TEST_LAB_DIR}/volumes/so/ca-certificates/onapheat:/app/ca-certificates
+ environment:
+ - APP=so-etsi-nfvo-ns-lcm
+ - JVM_ARGS=-Xms64m -Xmx512m
+ - DB_HOST=mariadb
+ - DB_PORT=3306
+ - DB_USERNAME=so_user
+ - DB_PASSWORD=so_User123
+ - DB_ADMIN_USERNAME=so_admin
+ - DB_ADMIN_PASSWORD=so_Admin123
+ hostname:
+ etsi.nfvo.ns.lcm
+ depends_on:
+ - mariadb
+ - aai-simulator
+ - sdc-simulator
+ - modeling-etsicatalog
+ - so-vnfm-adapter
user: root
- entrypoint: /bin/sh -c '/app/wait-for.sh -q -t "300" request-db-adapter:8083 -- "/app/start-app.sh"'
-################################################################################
+ entrypoint: /bin/sh -c '/app/wait-for.sh -q -t "300" mariadb:3306 -- "/app/start-app.sh"'