3 files changed, 10 insertions, 10 deletions
diff --git a/catalog-fe/sdc-frontend/Dockerfile b/catalog-fe/sdc-frontend/Dockerfile
index 5733dd25f5..66aea7b2cf 100644
--- a/catalog-fe/sdc-frontend/Dockerfile
+++ b/catalog-fe/sdc-frontend/Dockerfile
@@ -1,17 +1,17 @@
 FROM onap/base_sdc-jetty:1.6.0
 
-COPY chef-solo /root/chef-solo/
+RUN mkdir -p ${JETTY_BASE}/config/catalog-fe
 
-COPY chef-repo/cookbooks /root/chef-solo/cookbooks/
+COPY --chown=jetty:jetty chef-solo ${JETTY_BASE}/chef-solo/
+
+COPY --chown=jetty:jetty chef-repo/cookbooks ${JETTY_BASE}/chef-solo/cookbooks/
 
 ADD --chown=jetty:jetty onboarding*.war         ${JETTY_BASE}/webapps/
 
 ADD --chown=jetty:jetty catalog-fe-*.war        ${JETTY_BASE}/webapps/
 
-USER root
-
-COPY startup.sh /root/
+COPY --chown=jetty:jetty startup.sh ${JETTY_BASE}
 
-RUN chmod 770 /root/startup.sh
+RUN chmod 770 ${JETTY_BASE}/startup.sh
 
-ENTRYPOINT [ "/root/startup.sh" ]
+ENTRYPOINT ${JETTY_BASE}/startup.sh
diff --git a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_8_prepareProbeFile.rb b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_8_prepareProbeFile.rb
index 85ae99b847..2ce61b9c09 100644
--- a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_8_prepareProbeFile.rb
+++ b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_8_prepareProbeFile.rb
@@ -6,7 +6,7 @@ else
   port = "#{node['FE'][:http_port]}"
 end
 
-template "/var/lib/ready-probe.sh" do
+template "/var/lib/jetty/ready-probe.sh" do
   source "ready-probe.sh.erb"
   sensitive true
   mode 0755
@@ -14,4 +14,4 @@ template "/var/lib/ready-probe.sh" do
     :protocol => protocol,
     :port => port
   })
-end
-\ No newline at end of file
+end
diff --git a/catalog-fe/sdc-frontend/startup.sh b/catalog-fe/sdc-frontend/startup.sh
index 6080856f65..dda1e02dbf 100644
--- a/catalog-fe/sdc-frontend/startup.sh
+++ b/catalog-fe/sdc-frontend/startup.sh
@@ -10,7 +10,7 @@ JAVA_OPTIONS=" ${JAVA_OPTIONS} \
                -Djavax.net.ssl.trustStorePassword=].][xgtze]hBhz*wy]}m#lf* \
                -Djetty.console-capture.dir=${JETTY_BASE}/logs "
 
-cd /root/chef-solo
+cd /var/lib/jetty/chef-solo
 chef-solo -c solo.rb -E ${ENVNAME}
 
 cd /var/lib/jetty