summaryrefslogtreecommitdiffstats
path: root/docker/scripts
diff options
context:
space:
mode:
authork.kedron <k.kedron@partner.samsung.com>2019-09-05 17:50:23 +0200
committerOfir Sonsino <ofir.sonsino@intl.att.com>2019-09-06 09:11:47 +0000
commit176a760ebe4293c19eeb96cf88269215fce870a9 (patch)
treec559a1f2bafbf6147612b88a46a0299a579af57f /docker/scripts
parent64636c2148414c1fa5da4b46a69570cdab003837 (diff)
Fully HTTPS support in the dcaedt-tools
Fully HTTPS support: -Updated the onap/base_sdc-jetty docker image version -Updated the chef script to properly used of the new docker image -Updated jvm configuration to support call to the SDC components using HTTPS. -Added buildRestClient method to create the DcaeRestClient supporting the SSL connection -Checkstyle in the recipes adn tools.Main method -Update the docker_run.sh: - Change JAVA_OPTIONS -Update docker_run script -Add proper dependency in the pom (waiting for solving the SDC-2554 bug) Issue-ID: SDC-2552 Signed-off-by: Krystian Kedron <k.kedron@partner.samsung.com> Change-Id: Ie8dd1f54619f1101c13de13ae3cbb296bba57210
Diffstat (limited to 'docker/scripts')
-rwxr-xr-xdocker/scripts/docker_run.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/scripts/docker_run.sh b/docker/scripts/docker_run.sh
index af322bd..ceba2e4 100755
--- a/docker/scripts/docker_run.sh
+++ b/docker/scripts/docker_run.sh
@@ -282,7 +282,7 @@ function dcae-tools {
if [ ${LOCAL} == false ]; then
docker pull "${PREFIX}/${DOCKER_NAME}:${RELEASE}"
fi
- docker run ${DOCKER_RUN_MODE_BG} --name ${DOCKER_NAME} --env HOST_IP="${IP}" --env ENVNAME="${DEP_ENV}" ${LOCAL_TIME_MOUNT_CMD} --volume "${WORKSPACE}/data/logs/BE/:/var/lib/jetty/logs" --volume "${WORKSPACE}/data/environments:/var/opt/dcae-tools/chef-solo/environments" "${PREFIX}/${DOCKER_NAME}:${RELEASE}"
+ docker run ${DOCKER_RUN_MODE_BG} --name ${DOCKER_NAME} --env HOST_IP="${IP}" --env ENVNAME="${DEP_ENV}" --env JAVA_OPTIONS="${JAVA_OPTIONS}" ${LOCAL_TIME_MOUNT_CMD} --volume "${WORKSPACE}/data/logs/BE/:/var/lib/jetty/logs" --volume "${WORKSPACE}/data/environments:/root/chef-solo/environments" "${PREFIX}/${DOCKER_NAME}:${RELEASE}"
command_exit_status $? ${DOCKER_NAME}
echo "please wait while ${DOCKER_NAME^^} is starting....."
monitor_docker ${DOCKER_NAME}