summaryrefslogtreecommitdiffstats
path: root/catalog-fe/sdc-frontend
diff options
context:
space:
mode:
authorTal Gitelman <tal.gitelman@att.com>2018-10-30 19:45:19 +0200
committerTal Gitelman <tal.gitelman@att.com>2018-11-01 09:02:27 +0000
commitae3a86d73ed732c0d3a3c46e98445c40a79582c0 (patch)
tree9247a9d25483a4dd3c99daa6d4a142ca93f717fb /catalog-fe/sdc-frontend
parentc401f4faae5b11d0ccf8c706380a89be7abf510d (diff)
upgrading jetty
Change-Id: Ie6307656f88cab59346bb17bcfc75ca494b572d7 Issue-ID: SDC-1767 Signed-off-by: Tal Gitelman <tal.gitelman@att.com>
Diffstat (limited to 'catalog-fe/sdc-frontend')
-rw-r--r--catalog-fe/sdc-frontend/Dockerfile4
-rw-r--r--catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_7_create_jetty_modules.rb2
2 files changed, 2 insertions, 4 deletions
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