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 /openecomp-be/dist | |
| 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 'openecomp-be/dist')
5 files changed, 16 insertions, 19 deletions
diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile index e6a0dc1ec2..acc84ab393 100644 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile +++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile @@ -1,17 +1,15 @@ FROM onap/base_sdc-jetty:1.6.0 -COPY chef-solo /root/chef-solo/ +COPY --chown=jetty:jetty chef-solo ${JETTY_BASE}/chef-solo/ -COPY chef-repo/cookbooks /root/chef-solo/cookbooks/ +COPY --chown=jetty:jetty chef-repo/cookbooks ${JETTY_BASE}/chef-solo/cookbooks/ ADD --chown=jetty:jetty onboarding-be-*.war ${JETTY_BASE}/webapps/ ADD --chown=jetty:jetty api-docs.war ${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 diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_6_prepareProbeFile.rb b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_6_prepareProbeFile.rb index c8102e43ee..8d77d61481 100644 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_6_prepareProbeFile.rb +++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_6_prepareProbeFile.rb @@ -6,7 +6,7 @@ else port = "#{node['ONBOARDING_BE'][: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 diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/startup.sh b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/startup.sh index 413fdb317e..df8cefbd85 100644 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/startup.sh +++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/startup.sh @@ -1,7 +1,7 @@ #!/bin/sh -cd /root/chef-solo +cd /var/lib/jetty/chef-solo chef-solo -c solo.rb -E ${ENVNAME} rc=$? if [[ $rc != 0 ]]; then @@ -21,4 +21,4 @@ cd /var/lib/jetty /docker-entrypoint.sh & -while true; do sleep 2; done
\ No newline at end of file +while true; do sleep 2; done 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 29189dbb4c..8dfc8a86f5 100644 --- a/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile +++ b/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile @@ -1,14 +1,13 @@ -FROM onap/base_sdc-cqlsh:1.5.0-SNAPSHOT-latest +FROM onap/base_sdc-cqlsh:1.6.0-SNAPSHOT-latest -COPY init_keyspaces.cql /root/ +COPY --chown=sdc:sdc init_keyspaces.cql /home/sdc/ -COPY init_schemas.cql /root/ +COPY --chown=sdc:sdc init_schemas.cql /home/sdc/ -COPY alter_tables.cql /root/ +COPY --chown=sdc:sdc alter_tables.cql /home/sdc/ -COPY startup.sh /root/ +COPY --chown=sdc:sdc startup.sh /home/sdc/ -RUN chmod 770 /root/startup.sh - -ENTRYPOINT [ "/root/startup.sh" ] +RUN chmod 770 /home/sdc/startup.sh +ENTRYPOINT [ "/home/sdc/startup.sh" ] diff --git a/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/startup.sh b/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/startup.sh index 02354dbd6e..2f398b2f91 100644 --- a/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/startup.sh +++ b/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/startup.sh @@ -1,6 +1,6 @@ #!/bin/bash -cd /root +cd /home/sdc CS_PORT="" CS_HOST=127.0.0.1 |