From ae3a86d73ed732c0d3a3c46e98445c40a79582c0 Mon Sep 17 00:00:00 2001 From: Tal Gitelman Date: Tue, 30 Oct 2018 19:45:19 +0200 Subject: upgrading jetty Change-Id: Ie6307656f88cab59346bb17bcfc75ca494b572d7 Issue-ID: SDC-1767 Signed-off-by: Tal Gitelman --- catalog-fe/sdc-frontend/Dockerfile | 4 +--- .../cookbooks/sdc-catalog-fe/recipes/FE_7_create_jetty_modules.rb | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'catalog-fe/sdc-frontend') diff --git a/catalog-fe/sdc-frontend/Dockerfile b/catalog-fe/sdc-frontend/Dockerfile index 64e6622561..63618fc878 100644 --- a/catalog-fe/sdc-frontend/Dockerfile +++ b/catalog-fe/sdc-frontend/Dockerfile @@ -1,11 +1,9 @@ -FROM onap/base_sdc-jetty:1.4.0 +FROM onap/base_sdc-jetty:1.4.1 COPY chef-solo /root/chef-solo/ COPY chef-repo/cookbooks /root/chef-solo/cookbooks/ -RUN cp ${JETTY_HOME}/resources/log4j.properties ${JETTY_BASE}/resources/log4j.properties - ADD onboarding*.war ${JETTY_BASE}/webapps/ ADD catalog-fe-*.war ${JETTY_BASE}/webapps/ diff --git a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_7_create_jetty_modules.rb b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_7_create_jetty_modules.rb index 6c782428b0..b1c32b9506 100644 --- a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_7_create_jetty_modules.rb +++ b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_7_create_jetty_modules.rb @@ -12,7 +12,7 @@ cwd "#{ENV['JETTY_BASE']}" code <<-EOH cd "#{ENV['JETTY_BASE']}" java -jar "#{ENV['JETTY_HOME']}"/start.jar --add-to-start=deploy - java -jar "#{ENV['JETTY_HOME']}"/start.jar --add-to-startd=http,https,logging,setuid + java -jar "#{ENV['JETTY_HOME']}"/start.jar --create-startd --add-to-start=http,https,console-capture,setuid EOH end -- cgit 1.2.3-korg