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:37 +0000 |
commit | 69ba31d1ea0b20c19df0e462a5bbb4b67097146a (patch) | |
tree | 99e5512aef2fb147fc3a7accbb72b7288e3255be /asdctool | |
parent | 9272b75cc0d70645de21885b98200c1b9684dac9 (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
(cherry picked from commit a2abf6ea18d512d367277bacaf7476754dc0eff5)
Diffstat (limited to 'asdctool')
-rw-r--r-- | asdctool/sdc-cassandra-init/Dockerfile | 12 | ||||
-rw-r--r-- | asdctool/sdc-cassandra-init/startup.sh | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/asdctool/sdc-cassandra-init/Dockerfile b/asdctool/sdc-cassandra-init/Dockerfile index 64dbe05e5d..b1ff2ae95e 100644 --- a/asdctool/sdc-cassandra-init/Dockerfile +++ b/asdctool/sdc-cassandra-init/Dockerfile @@ -1,12 +1,12 @@ -FROM onap/base_sdc-cqlsh:1.5.0-SNAPSHOT-latest +FROM onap/base_sdc-cqlsh:1.6.0-SNAPSHOT-latest -COPY chef-solo /root/chef-solo/ +COPY --chown=sdc:sdc chef-solo /home/sdc/chef-solo/ -COPY chef-repo/cookbooks /root/chef-solo/cookbooks/ +COPY --chown=sdc:sdc chef-repo/cookbooks /home/sdc/chef-solo/cookbooks/ -COPY startup.sh /root/ +COPY --chown=sdc:sdc startup.sh /home/sdc/ -RUN chmod 770 /root/startup.sh +RUN chmod 770 /home/sdc/startup.sh -ENTRYPOINT [ "/root/startup.sh" ] +ENTRYPOINT [ "/home/sdc/startup.sh" ] diff --git a/asdctool/sdc-cassandra-init/startup.sh b/asdctool/sdc-cassandra-init/startup.sh index 13c882ab09..3e474f3c89 100644 --- a/asdctool/sdc-cassandra-init/startup.sh +++ b/asdctool/sdc-cassandra-init/startup.sh @@ -1,6 +1,6 @@ #!/bin/bash -cd /root/chef-solo +cd /home/sdc/chef-solo chef-solo -c solo.rb -E ${ENVNAME} rc=$? -if [[ $rc != 0 ]]; then exit $rc; fi
\ No newline at end of file +if [[ $rc != 0 ]]; then exit $rc; fi |