diff options
19 files changed, 18 insertions, 25 deletions
diff --git a/asdctool/sdc-cassandra-init/Dockerfile b/asdctool/sdc-cassandra-init/Dockerfile index 8b48081d6b..df9ef7673a 100644 --- a/asdctool/sdc-cassandra-init/Dockerfile +++ b/asdctool/sdc-cassandra-init/Dockerfile @@ -1,4 +1,4 @@ -FROM onap/base_sdc-cqlsh:1.4.0 +FROM onap/base_sdc-cqlsh:1.4.1 COPY chef-solo /root/chef-solo/ 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 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 diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile index 4a1921a804..f49b2847d4 100644 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile +++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile @@ -1,4 +1,4 @@ -FROM onap/base_sdc-jetty:1.4.0-SNAPSHOT-latest +FROM onap/base_sdc-jetty:1.4.1 COPY chef-solo /root/chef-solo/ diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_4_setup_jetty_modules.rb b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_4_setup_jetty_modules.rb index 82a066589b..64a02e9559 100644 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_4_setup_jetty_modules.rb +++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_4_setup_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 diff --git a/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile b/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile index 83ab4869c3..526ab95024 100644 --- a/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile +++ b/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile @@ -1,4 +1,4 @@ -FROM onap/base_sdc-cqlsh:1.4.0-SNAPSHOT-latest +FROM onap/base_sdc-cqlsh:1.4.1 COPY init_keyspaces.cql /root/ diff --git a/sdc-os-chef/environments/Template.json b/sdc-os-chef/environments/Template.json index 5c7e83575d..d212d1e98b 100644 --- a/sdc-os-chef/environments/Template.json +++ b/sdc-os-chef/environments/Template.json @@ -1,9 +1,6 @@ { "name": "xxx", "description": "OpenSource-xxx", - "cookbook_versions": { - "Deploy-SDandC": "= 1.0.0" - }, "json_class": "Chef::Environment", "chef_type": "environment", diff --git a/sdc-os-chef/sdc-cassandra/Dockerfile b/sdc-os-chef/sdc-cassandra/Dockerfile index a43b90b80d..dade1d343a 100644 --- a/sdc-os-chef/sdc-cassandra/Dockerfile +++ b/sdc-os-chef/sdc-cassandra/Dockerfile @@ -1,4 +1,4 @@ -FROM onap/base_sdc-cassandra:1.4.0 +FROM onap/base_sdc-cassandra:1.4.1 COPY chef-solo /root/chef-solo/ diff --git a/sdc-os-chef/sdc-elasticsearch/Dockerfile b/sdc-os-chef/sdc-elasticsearch/Dockerfile index 1da886e91a..e6929838ac 100644 --- a/sdc-os-chef/sdc-elasticsearch/Dockerfile +++ b/sdc-os-chef/sdc-elasticsearch/Dockerfile @@ -1,4 +1,4 @@ -FROM onap/base_sdc-elasticsearch:1.4.0 +FROM onap/base_sdc-elasticsearch:1.4.1 COPY chef-solo /root/chef-solo/ diff --git a/sdc-os-chef/sdc-init-elasticsearch/Dockerfile b/sdc-os-chef/sdc-init-elasticsearch/Dockerfile index c57690dc49..270089d341 100644 --- a/sdc-os-chef/sdc-init-elasticsearch/Dockerfile +++ b/sdc-os-chef/sdc-init-elasticsearch/Dockerfile @@ -1,4 +1,4 @@ -FROM onap/base_sdc-sanity:1.4.0 +FROM onap/base_sdc-sanity:1.4.1 COPY chef-solo /root/chef-solo/ diff --git a/sdc-os-chef/sdc-kibana/Dockerfile b/sdc-os-chef/sdc-kibana/Dockerfile index 01352708df..3eca2db31b 100644 --- a/sdc-os-chef/sdc-kibana/Dockerfile +++ b/sdc-os-chef/sdc-kibana/Dockerfile @@ -1,4 +1,4 @@ -FROM onap/base_sdc-kibana:1.4.0-SNAPSHOT-latest +FROM onap/base_sdc-kibana:1.4.1 COPY chef-solo /root/chef-solo/ diff --git a/test-apis-ci/sdc-api-tests/Dockerfile b/test-apis-ci/sdc-api-tests/Dockerfile index 30840877bc..396e6ebcd4 100644 --- a/test-apis-ci/sdc-api-tests/Dockerfile +++ b/test-apis-ci/sdc-api-tests/Dockerfile @@ -1,4 +1,4 @@ -FROM onap/base_sdc-sanity:1.4.0 +FROM onap/base_sdc-sanity:1.4.1 COPY chef-solo /root/chef-solo/ diff --git a/ui-ci/sdc-ui-tests/Dockerfile b/ui-ci/sdc-ui-tests/Dockerfile index 5486468e14..3b1129322f 100644 --- a/ui-ci/sdc-ui-tests/Dockerfile +++ b/ui-ci/sdc-ui-tests/Dockerfile @@ -1,4 +1,4 @@ -FROM onap/base_sdc-vnc:1.4.0 +FROM onap/base_sdc-vnc:1.4.1 COPY chef-solo /root/chef-solo/ diff --git a/utils/webseal-simulator/sdc-simulator/Dockerfile b/utils/webseal-simulator/sdc-simulator/Dockerfile index 47c9dca108..70539086a9 100644 --- a/utils/webseal-simulator/sdc-simulator/Dockerfile +++ b/utils/webseal-simulator/sdc-simulator/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 WSSimulator*.war ${JETTY_BASE}/webapps/ USER root diff --git a/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_5_create_jetty_modules.rb b/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_5_create_jetty_modules.rb index ddfb2a50d2..8a0f6a79c2 100644 --- a/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_5_create_jetty_modules.rb +++ b/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_5_create_jetty_modules.rb @@ -6,7 +6,7 @@ cwd "#{jetty_base}" code <<-EOH cd "#{jetty_base}" java -jar "/#{jetty_home}"/start.jar --add-to-start=deploy - java -jar "/#{jetty_home}"/start.jar --add-to-startd=http,https,logging,setuid + java -jar "/#{jetty_home}"/start.jar --create-startd --add-to-start=http,https,console-capture,setuid EOH end diff --git a/utils/webseal-simulator/sdc-simulator/startup.sh b/utils/webseal-simulator/sdc-simulator/startup.sh index 89582082eb..075c2cefab 100644 --- a/utils/webseal-simulator/sdc-simulator/startup.sh +++ b/utils/webseal-simulator/sdc-simulator/startup.sh @@ -15,7 +15,7 @@ JAVA_OPTIONS=" ${JAVA_OPTIONS} \ -Dconfig.home=${JETTY_BASE}/config/sdc-simulator \ -Dlog.home=${JETTY_BASE}/logs \ -Dlogback.configurationFile=${JETTY_BASE}/config/sdc-simulator/logback.xml \ - -Djetty.logging.dir=${JETTY_BASE}/logs" + -Djetty.console-capture.dir=${JETTY_BASE}/logs" cd /var/lib/jetty |