diff options
| -rw-r--r-- | docker/Dockerfile | 14 | ||||
| -rw-r--r-- | docker/startup.sh | 2 |
2 files changed, 7 insertions, 9 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index ed54b2b..74d0ad3 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,15 +1,13 @@ -FROM onap/base_sdc-jetty:1.4.1 +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 target/dcae_*.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/docker/startup.sh b/docker/startup.sh index 8b7d914..1a3d39c 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-fe/logback-spring.xml" -cd /root/chef-solo +cd /var/lib/jetty/chef-solo chef-solo -c solo.rb -E ${ENVNAME} status=$? |