diff options
author | sebdet <sebastien.determe@intl.att.com> | 2020-09-21 22:13:05 +0200 |
---|---|---|
committer | Michael Morris <michael.morris@est.tech> | 2021-05-12 10:27:10 +0000 |
commit | df353be353e1ec25ac2a0e64a9eb617dcbc87703 (patch) | |
tree | e79c636bc4f67bdd8392b24c85f2f6cb26e3c67a /catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_10_setup_cadi.rb | |
parent | 936781153118364e60662529dbd7217416a26148 (diff) |
Use integration-java11 Dockerfile
Use onap/integration-java11:7.1.0 as a source for the images requiring JDK 11 in SDC
Issue-ID: SDC-3298
Change-Id: Ifee3d2942dcb9c078f2ebb686bdabc0ecca857b3
Signed-off-by: xuegao <xue.gao@intl.att.com>
Diffstat (limited to 'catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_10_setup_cadi.rb')
-rw-r--r-- | catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_10_setup_cadi.rb | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_10_setup_cadi.rb b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_10_setup_cadi.rb index 3a79cfc874..e7d11c9f2d 100644 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_10_setup_cadi.rb +++ b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_10_setup_cadi.rb @@ -3,8 +3,8 @@ jetty_base = "#{ENV['JETTY_BASE']}" directory "Jetty_etc_dir_creation" do path "#{jetty_base}/etc" - owner 'jetty' - group 'jetty' + owner "#{ENV['JETTY_USER']}" + owner "#{ENV['JETTY_GROUP']}" mode '0755' action :create not_if { ::File.directory?("#{jetty_base}/etc") } @@ -13,16 +13,16 @@ end cookbook_file "#{jetty_base}/etc/keyfile" do source "keyfile" - owner "jetty" - group "jetty" + owner "#{ENV['JETTY_USER']}" + owner "#{ENV['JETTY_GROUP']}" mode 0755 end cookbook_file "#{jetty_base}/etc/cadi_truststore.jks" do source "cadi_truststore.jks" - owner "jetty" - group "jetty" + owner "#{ENV['JETTY_USER']}" + owner "#{ENV['JETTY_GROUP']}" mode 0755 end @@ -30,8 +30,8 @@ end template "#{jetty_base}/etc/cadi.properties" do path "#{jetty_base}/etc/cadi.properties" source "cadi.properties.erb" - owner "jetty" - group "jetty" + owner "#{ENV['JETTY_USER']}" + owner "#{ENV['JETTY_GROUP']}" mode "0755" end |