From a1ceb60843508b0ef23f3f8ec29d8808722fada3 Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Tue, 20 Feb 2018 16:14:11 +0200 Subject: add https support to simulato Change-Id: I16f68532a7e7a09fbf96c09dff19d857c03fedd8 Issue-ID: SDC-832 Signed-off-by: Michael Lando --- .../scripts/simulator_docker_run.sh | 4 +++- utils/webseal-simulator/scripts/ws-compose.yaml | 21 +++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 utils/webseal-simulator/scripts/ws-compose.yaml (limited to 'utils/webseal-simulator/scripts') diff --git a/utils/webseal-simulator/scripts/simulator_docker_run.sh b/utils/webseal-simulator/scripts/simulator_docker_run.sh index c7ded8d116..079dc1e578 100644 --- a/utils/webseal-simulator/scripts/simulator_docker_run.sh +++ b/utils/webseal-simulator/scripts/simulator_docker_run.sh @@ -70,8 +70,10 @@ echo "${PREFIX}" dir_perms +JAVA_OPTIONS=" -Xmx128m -Xms128m -Xss1m" + # SDC-Simulator -docker run --detach --name sdc-sim --env HOST_IP=${IP} --env ENVNAME="${DEP_ENV}" --env http_proxy=${http_proxy} --env https_proxy=${https_proxy} --env no_proxy=${no_proxy} --log-driver=json-file --log-opt max-size=100m --log-opt max-file=10 --ulimit memlock=-1:-1 --memory 256m --memory-swap=256m --ulimit nofile=4096:100000 --volume /etc/localtime:/etc/localtime:ro --volume /data/logs/WS/:/var/lib/jetty/logs --volume /data/environments:/root/chef-solo/environments --publish 8285:8080 ${PREFIX}/sdc-simulator:${RELEASE} +docker run --detach --name sdc-sim --env JAVA_OPTIONS="${JAVA_OPTIONS}" --env ENVNAME="${DEP_ENV}" --env http_proxy=${http_proxy} --env https_proxy=${https_proxy} --env no_proxy=${no_proxy} --volume /etc/localtime:/etc/localtime:ro --volume /data/logs/WS/:/var/lib/jetty/logs --volume /data/environments:/root/chef-solo/environments --publish 8285:8080 --publish 8286:8443 ${PREFIX}/sdc-simulator:${RELEASE} if [ $? -ne 0 ]; then diff --git a/utils/webseal-simulator/scripts/ws-compose.yaml b/utils/webseal-simulator/scripts/ws-compose.yaml new file mode 100644 index 0000000000..7c07f62c79 --- /dev/null +++ b/utils/webseal-simulator/scripts/ws-compose.yaml @@ -0,0 +1,21 @@ +version: '3' + +services: + WS: + container_name: sdc-sim + image: onap/sdc-simulator:latest + volumes: + - "/etc/localtime:/etc/localtime:ro" + - "/data/logs/WS/:/var/lib/jetty/logs" + - "/data/environments:/root/chef-solo/environments" + ports: + - "8286:8443" + - "8285:8080" + restart: always + environment: + HOST_IP: "10.0.2.15" + ENVNAME: "AUTO" + http_proxy: http://one.proxy.att.com:8080 + https_proxy: http://one.proxy.att.com:8080 + no_proxy: "localhost,127.0.0.1" + JAVA_OPTIONS: "-Xmx128m -Xms128m -Xss1m" -- cgit 1.2.3-korg