diff options
| author |   MichaelMorris <michael.morris@est.tech> | 2020-03-15 17:01:10 +0000 |
|---|---|---|
| committer | MichaelMorris <michael.morris@est.tech> | 2020-03-15 17:01:15 +0000 |
| commit | b363c92b0ce006305454efd778b4f88ede8929cc (patch) | |
| tree | c81804a6253697f8e7cbab0ed427a0026dae8d1b | |
| parent | e31ae24d927be422526c39a26412978669640c66 (diff) | |
Run pods as non-root user
Change-Id: I238ce1707493846ba692b7f12900430072ec7840
Issue-ID: SDC-2798
Signed-off-by: MichaelMorris <michael.morris@est.tech>
| -rw-r--r-- | Dockerfile | 14 | ||||
| -rw-r--r-- | docker/startup.sh | 2 |
2 files changed, 7 insertions, 9 deletions
@@ -1,15 +1,13 @@ -FROM onap/base_sdc-jetty:1.4.1 +FROM onap/base_sdc-jetty:1.6.0 -COPY docker/chef-solo /root/chef-solo/ +COPY --chown=jetty:jetty docker/chef-solo ${JETTY_BASE}/chef-solo/ -COPY docker/chef-repo/cookbooks /root/chef-solo/cookbooks/ +COPY --chown=jetty:jetty docker/chef-repo/cookbooks ${JETTY_BASE}/chef-solo/cookbooks/ ADD --chown=jetty:jetty target/dcae-dt.war ${JETTY_BASE}/webapps/ -USER root +COPY --chown=jetty:jetty docker/startup.sh ${JETTY_BASE}/ -COPY docker/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/docker/startup.sh b/docker/startup.sh index 00bda01..f99c252 100644 --- a/docker/startup.sh +++ b/docker/startup.sh @@ -4,7 +4,7 @@ JAVA_OPTIONS=" ${JAVA_OPTIONS} -Dconfig.home=${JETTY_BASE}/config -Dlog.home=${JETTY_BASE}/logs -Dlogback.configurationFile=${JETTY_BASE}/dcae-dt/logback-spring.xml" -cd /root/chef-solo +cd /var/lib/jetty/chef-solo chef-solo -c solo.rb -E ${ENVNAME} status=$? |