diff options
| author |   Tal Gitelman <tg851x@intl.att.com> | 2017-08-17 12:11:12 +0300 |
|---|---|---|
| committer | Tal Gitelman <tg851x@intl.att.com> | 2017-08-17 12:11:12 +0300 |
| commit | e8dc876ea02cd9fcaaea028aaa56ea27ea0d8f13 (patch) | |
| tree | dd721efca9c7ee7fd00006f0d85d65f0ffa0df1c /utils/webseal-simulator | |
| parent | ba9ef462ad61930afee6123c17427942e8b5d28f (diff) | |
[SDC-154] - sdc-simulator docker task
Change-Id: I2bce75940f27e0b1c31886cb78a44644df45745c
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>
Diffstat (limited to 'utils/webseal-simulator')
3 files changed, 9 insertions, 7 deletions
diff --git a/utils/webseal-simulator/sdc-simulator/Dockerfile.template b/utils/webseal-simulator/sdc-simulator/Dockerfile.template index 66ce1467b0..673b56fd07 100644 --- a/utils/webseal-simulator/sdc-simulator/Dockerfile.template +++ b/utils/webseal-simulator/sdc-simulator/Dockerfile.template @@ -15,8 +15,7 @@ RUN curl -L https://www.opscode.com/chef/install.sh | bash RUN cp /usr/local/jetty/resources/log4j.properties /var/lib/jetty/resources/log4j.properties -ADD onboarding-fe-__SDC-RELEASE__.war /var/lib/jetty/webapps/ -ADD catalog-fe-__SDC-RELEASE__.war /var/lib/jetty/webapps/ +ADD sdc-simulator-__SDC-RELEASE__.war /var/lib/jetty/webapps/ RUN chown -R jetty:jetty /var/lib/jetty/webapps COPY startup.sh /root/ diff --git a/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_2_setup_configuration.rb b/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_2_setup_configuration.rb index 9a284deb8a..05c787fa0f 100644 --- a/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_2_setup_configuration.rb +++ b/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_2_setup_configuration.rb @@ -1,5 +1,7 @@ +jetty_base="/var/lib/jetty" + cookbook_file "webseal.conf" do - path "/#{jetty_base}/config/sdc-simulator/" + path "#{jetty_base}/config/sdc-simulator/webseal.conf" source "webseal.conf" owner "jetty" group "jetty" @@ -8,7 +10,7 @@ end cookbook_file "logback.xml" do - path "/#{jetty_base}/config/sdc-simulator/" + path "#{jetty_base}/config/sdc-simulator/logback.xml" source "logback.xml" owner "jetty" group "jetty" diff --git a/utils/webseal-simulator/sdc-simulator/startup.sh b/utils/webseal-simulator/sdc-simulator/startup.sh index 1b0931363d..46a3173337 100644 --- a/utils/webseal-simulator/sdc-simulator/startup.sh +++ b/utils/webseal-simulator/sdc-simulator/startup.sh @@ -1,11 +1,12 @@ #!/bin/sh -export CHEFNAME=${ENVNAME} +#export CHEFNAME=${ENVNAME} cd /root/chef-solo echo "normal['HOST_IP'] = \"${HOST_IP}\"" > /root/chef-solo/cookbooks/sdc-simulator/attributes/default.rb -chef-solo -c solo.rb -E ${CHEFNAME} +chef-solo -c solo.rb +#chef-solo -c solo.rb -E ${CHEFNAME} -sed -i '/^set -e/aJAVA_OPTIONS=\"-Xdebug -Xmx128m -Xms128m -Xss1m -Dconfig.home=${JETTY_BASE}/config -Dlog.home=${JETTY_BASE}/logs -Dlogback.configurationFile=${JETTY_BASE}/config/sdc-simulator/logback.xml \"' /docker-entrypoint.sh +sed -i '/^set -e/aJAVA_OPTIONS=\"-Xdebug -Xmx128m -Xms128m -Xss1m -Dconfig.home=${JETTY_BASE}/config -Dlog.home=${JETTY_BASE}/logs -Dlogback.configurationFile=${JETTY_BASE}/config/sdc-simulator/logback.xml -Djetty.logging.dir=${JETTY_BASE}/logs\"' /docker-entrypoint.sh sed -i '/^set -e/aTMPDIR=${JETTY_BASE}\/temp' /docker-entrypoint.sh cd /var/lib/jetty |