X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=sdc-os-chef%2Fscripts%2Fdocker_run.sh;h=d3de8039b4505f6eeb8e513b15fd76e878d91a0b;hb=HEAD;hp=e51f499588b56118e8b3cd35a279a193f2c113bb;hpb=a2abf6ea18d512d367277bacaf7476754dc0eff5;p=sdc.git

diff --git a/sdc-os-chef/scripts/docker_run.sh b/sdc-os-chef/scripts/docker_run.sh
index e51f499588..d3de8039b4 100755
--- a/sdc-os-chef/scripts/docker_run.sh
+++ b/sdc-os-chef/scripts/docker_run.sh
@@ -23,12 +23,14 @@ FE_DEBUG_PORT="--publish 6000:6000"
 ONBOARD_DEBUG_PORT="--publish 4001:4001"
 CS_PORT=${CS_PORT:-9042}
 
+OS_USER="onap"
+
 
 # Java Options:
-BE_JAVA_OPTIONS="-Xdebug -agentlib:jdwp=transport=dt_socket,address=4000,server=y,suspend=n -Xmx1536m -Xms1536m"
-FE_JAVA_OPTIONS="-Xdebug -agentlib:jdwp=transport=dt_socket,address=6000,server=y,suspend=n -Xmx256m -Xms256m"
-ONBOARD_BE_JAVA_OPTIONS="-Xdebug -agentlib:jdwp=transport=dt_socket,address=4001,server=y,suspend=n -Xmx1g -Xms1g"
-SIM_JAVA_OPTIONS=" -Xmx128m -Xms128m -Xss1m -Dlog4j.configuration=file:///${JETTY_BASE}/config/sdc-simulator/log4j.properties"
+BE_JAVA_OPTIONS="-Xdebug -agentlib:jdwp=transport=dt_socket,address=*:4000,server=y,suspend=n -Xmx1536m -Xms1536m"
+FE_JAVA_OPTIONS="-Xdebug -agentlib:jdwp=transport=dt_socket,address=*:6000,server=y,suspend=n -Xmx256m -Xms256m"
+ONBOARD_BE_JAVA_OPTIONS="-Xdebug -agentlib:jdwp=transport=dt_socket,address=*:4001,server=y,suspend=n -Xmx1g -Xms1g"
+SIM_JAVA_OPTIONS=" -Xmx128m -Xms128m -Xss1m -Dlog4j.configuration=file:///${JETTY_BASE}/config/sdc-simulator/log4j2.properties"
 API_TESTS_JAVA_OPTIONS="-Xmx512m -Xms512m"
 UI_TESTS_JAVA_OPTIONS="-Xmx1024m -Xms1024m"
 #Define this as variable, so it can be excluded in run commands on Docker for OSX, as /etc/localtime cant be mounted there.
@@ -151,17 +153,6 @@ function probe_test_docker {
 #
 
 
-function probe_es {
-    health_Check_http_code=$(curl --noproxy "*" -o /dev/null -w '%{http_code}' http://${IP}:9200/_cluster/health?wait_for_status=yellow&timeout=120s)
-    if [[ "$health_Check_http_code" -eq 200 ]] ; then
-        echo DOCKER start finished in $1 seconds
-        return ${SUCCESS}
-    fi
-    return ${FAILURE}
-}
-#
-
-
 function probe_sim {
     if lsof -Pi :8285 -sTCP:LISTEN -t >/dev/null ; then
         echo "Already running"
@@ -236,7 +227,6 @@ function monitor_docker {
 
 # healthCheck script used the secure connection to send request (https is always turn on)
 function healthCheck {
-	curl --noproxy "*" ${IP}:9200/_cluster/health?pretty=true
 
 	echo "BE Health Check:"
 	curl -k --noproxy "*" https://${IP}:8443/sdc2/rest/healthCheck
@@ -323,15 +313,28 @@ function sdc-cs-onboard-init {
 #Back-End
 function sdc-BE {
     DOCKER_NAME="sdc-BE"
-    echo "docker run sdc-backend..."
+    IMAGE_NAME="sdc-backend"
+    IMAGE_FULL_NAME="$PREFIX/$IMAGE_NAME:$RELEASE"
+    echo "Running container '$DOCKER_NAME' based on image '$IMAGE_FULL_NAME'..."
     if [ ${LOCAL} = false ]; then
-        docker pull ${PREFIX}/sdc-backend:${RELEASE}
+      docker pull "$IMAGE_FULL_NAME"
     else
-        ADDITIONAL_ARGUMENTS=${BE_DEBUG_PORT}
+      ADDITIONAL_ARGUMENTS=${BE_DEBUG_PORT}
     fi
-    docker run --detach --name ${DOCKER_NAME} --env HOST_IP=${IP} --env ENVNAME="${DEP_ENV}" --env cassandra_ssl_enabled="false" --env JAVA_OPTIONS="${BE_JAVA_OPTIONS}" --log-driver=json-file --log-opt max-size=100m --log-opt max-file=10 --ulimit memlock=-1:-1 --ulimit nofile=4096:100000 ${LOCAL_TIME_MOUNT_CMD} --volume ${WORKSPACE}/data/logs/BE/:${JETTY_BASE}/logs  --volume ${WORKSPACE}/data/environments:${JETTY_BASE}/chef-solo/environments --publish 8443:8443 --publish 8080:8080 ${ADDITIONAL_ARGUMENTS} ${PREFIX}/sdc-backend:${RELEASE}
+
+    docker run --detach --name ${DOCKER_NAME} --env HOST_IP=${IP} \
+    --env ENVNAME="${DEP_ENV}" --env cassandra_ssl_enabled="false" --env JAVA_OPTIONS="${BE_JAVA_OPTIONS}" \
+    --log-driver=json-file --log-opt max-size=100m --log-opt max-file=10 \
+    --ulimit memlock=-1:-1 --ulimit nofile=4096:100000 ${LOCAL_TIME_MOUNT_CMD} \
+    --volume ${WORKSPACE}/data/logs/BE/:${JETTY_BASE}/logs \
+    --volume ${WORKSPACE}/data/environments:${JETTY_BASE}/chef-solo/environments \
+    --volume "${WORKSPACE}/data/sdc-backend/plugins":${JETTY_BASE}/plugins \
+    --publish 8443:8443 --publish 8080:8080 \
+    ${ADDITIONAL_ARGUMENTS} \
+    "$IMAGE_FULL_NAME"
+
     command_exit_status $? ${DOCKER_NAME}
-    echo "please wait while BE is starting..."
+    echo "please wait while $DOCKER_NAME is starting..."
     monitor_docker ${DOCKER_NAME}
 }
 #
@@ -344,7 +347,7 @@ function sdc-BE-init {
     if [ ${LOCAL} = false ]; then
         docker pull ${PREFIX}/sdc-backend-init:${RELEASE}
     fi
-    docker run --name ${DOCKER_NAME} --env HOST_IP=${IP} --env ENVNAME="${DEP_ENV}" --log-driver=json-file --log-opt max-size=100m --log-opt max-file=10 --ulimit memlock=-1:-1 --ulimit nofile=4096:100000 ${LOCAL_TIME_MOUNT_CMD} --volume ${WORKSPACE}/data/logs/BE/:${JETTY_BASE}/logs  --volume ${WORKSPACE}/data/environments:/home/sdc/chef-solo/environments ${PREFIX}/sdc-backend-init:${RELEASE} > /dev/null 2>&1
+    docker run --name ${DOCKER_NAME} --env HOST_IP=${IP} --env ENVNAME="${DEP_ENV}" --log-driver=json-file --log-opt max-size=100m --log-opt max-file=10 --ulimit memlock=-1:-1 --ulimit nofile=4096:100000 ${LOCAL_TIME_MOUNT_CMD} --volume ${WORKSPACE}/data/logs/BE/:${JETTY_BASE}/logs  --volume ${WORKSPACE}/data/environments:/home/${OS_USER}/chef-solo/environments ${PREFIX}/sdc-backend-init:${RELEASE} > /dev/null 2>&1
     rc=$?
     docker_logs ${DOCKER_NAME}
     if [[ ${rc} != 0 ]]; then exit ${rc}; fi