commit a2abf6ea18d512d367277bacaf7476754dc0eff5
author MichaelMorris <michael.morris@est.tech> Tue Mar 10 12:37:48 2020 +0000
committer Ofir Sonsino <ofir.sonsino@intl.att.com> Mon Mar 16 08:45:20 2020 +0000
tree 595dbda50b67c33936b754b0930416e892ff3ea2
parent 1dcbd56c897602f15f6659e113fd4c8011227fc2

Run pods as non-root user

Summary of changes:
sdc-cassandra-init
	Added user sdc (in base image base_sdc-cqlsh - https://gerrit.onap.org/r/103436)
	Run entrypoint as user sdc
	Moved relevant files from /root/ to /home/sdc/

sdc-backend-init
	Added user sdc (in base image base_sdc-python - https://gerrit.onap.org/r/103436)
	Run entrypoint as user sdc
	Moved relevant files from /root/ to /home/sdc/

sdc-backend
	Run entrypoint as user jetty
	Moved relevant files from /root/ to /var/lib/jetty/
	Moved cadi & cert files from /opt/app/jetty to /var/lib/jetty/
	Moved ready_probe from /var/lib/read-probe.sh to /var/lib/jetty/read-probe.sh

sdc-frontend
	Run entrypoint as user jetty
	Moved relevant files from /root/ to /var/lib/jetty/
	Moved ready_probe from /var/lib/read-probe.sh to /var/lib/jetty/read-probe.sh

sdc-onboard-backend-docker
	Run entrypoint as user jetty
	Moved relevant files from /root/ to /var/lib/jetty/
	Moved ready_probe from /var/lib/read-probe.sh to /var/lib/jetty/read-probe.sh

sdc-onboard-db-init-docker
	Run entrypoint as user sdc
	Added user sdc (in base image base_sdc-cqlsh - https://gerrit.onap.org/r/103436)
	Moved relevant files from /root/ to /home/sdc/

Signed-off-by: MichaelMorris <michael.morris@est.tech>
Issue-ID: SDC-2798
Change-Id: I85be320a4a5e1cc5aeebbb98c4484d5d6fd06dfc

catalog-be/sdc-backend/Dockerfile

diff --git a/catalog-be/sdc-backend/Dockerfile b/catalog-be/sdc-backend/Dockerfile
index 104bbd9..833008d 100644
--- a/catalog-be/sdc-backend/Dockerfile
+++ b/catalog-be/sdc-backend/Dockerfile
@@ -1,16 +1,13 @@
 FROM onap/base_sdc-jetty:1.6.0
-
-COPY chef-solo /root/chef-solo/
-
-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 catalog-be-*.war       ${JETTY_BASE}/webappwar/
 ADD --chown=jetty:jetty context.xml       ${JETTY_BASE}/webapps/
 
-USER root
+COPY --chown=jetty:jetty startup.sh ${JETTY_BASE}/ 
 
-COPY startup.sh /root/
+RUN chmod 770 ${JETTY_BASE}/startup.sh
 
-RUN chmod 770 /root/startup.sh
-
-ENTRYPOINT [ "/root/startup.sh" ]
+ENTRYPOINT ${JETTY_BASE}/startup.sh