summaryrefslogtreecommitdiffstats
path: root/catalog-be
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-be
parentc401f4faae5b11d0ccf8c706380a89be7abf510d (diff)
upgrading jetty
Change-Id: Ie6307656f88cab59346bb17bcfc75ca494b572d7 Issue-ID: SDC-1767 Signed-off-by: Tal Gitelman <tal.gitelman@att.com>
Diffstat (limited to 'catalog-be')
-rw-r--r--catalog-be/sdc-backend-init/Dockerfile2
-rw-r--r--catalog-be/sdc-backend/Dockerfile2
-rw-r--r--catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_4_jetty_Modules.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/catalog-be/sdc-backend-init/Dockerfile b/catalog-be/sdc-backend-init/Dockerfile
index 17798f0b7e..8b1a2e60ea 100644
--- a/catalog-be/sdc-backend-init/Dockerfile
+++ b/catalog-be/sdc-backend-init/Dockerfile
@@ -1,4 +1,4 @@
-FROM onap/base_sdc-python:1.4.0
+FROM onap/base_sdc-python:1.4.1
COPY chef-solo /root/chef-solo/
diff --git a/catalog-be/sdc-backend/Dockerfile b/catalog-be/sdc-backend/Dockerfile
index 74dabdce34..7fd978947f 100644
--- a/catalog-be/sdc-backend/Dockerfile
+++ b/catalog-be/sdc-backend/Dockerfile
@@ -1,4 +1,4 @@
-FROM onap/base_sdc-jetty:1.4.0
+FROM onap/base_sdc-jetty:1.4.1
COPY chef-solo /root/chef-solo/
diff --git a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_4_jetty_Modules.rb b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_4_jetty_Modules.rb
index afd26b3348..34934a44af 100644
--- a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_4_jetty_Modules.rb
+++ b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_4_jetty_Modules.rb
@@ -11,7 +11,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