diff options
| author |   MichaelMorris <michael.morris@est.tech> | 2020-03-10 12:37:48 +0000 |
|---|---|---|
| committer |   Ofir Sonsino <ofir.sonsino@intl.att.com> | 2020-03-16 08:45:20 +0000 |
| commit | a2abf6ea18d512d367277bacaf7476754dc0eff5 (patch) | |
| tree | 595dbda50b67c33936b754b0930416e892ff3ea2 /catalog-fe | |
| parent | 1dcbd56c897602f15f6659e113fd4c8011227fc2 (diff) | |
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
Diffstat (limited to 'catalog-fe')
| -rw-r--r-- | catalog-fe/sdc-frontend/Dockerfile | 14 | ||||
| -rw-r--r-- | catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_8_prepareProbeFile.rb | 4 | ||||
| -rw-r--r-- | catalog-fe/sdc-frontend/startup.sh | 2 |
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 |