summaryrefslogtreecommitdiffstats
path: root/docker/Dockerfile
diff options
context:
space:
mode:
Diffstat (limited to 'docker/Dockerfile')
-rw-r--r--docker/Dockerfile25
1 files changed, 7 insertions, 18 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index e6b9a36..ed54b2b 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,26 +1,15 @@
-FROM onap/base_sdc-jetty:1.2.0-SNAPSHOT-latest
+FROM onap/base_sdc-jetty:1.4.1
-COPY chef-solo /var/opt/dcae-fe/chef-solo/
+COPY chef-solo /root/chef-solo/
-COPY startup.sh /var/opt/dcae-fe/
+COPY chef-repo/cookbooks /root/chef-solo/cookbooks/
-ADD target/dcae_*.war ${JETTY_BASE}/webapps/
+ADD --chown=jetty:jetty target/dcae_*.war ${JETTY_BASE}/webapps/
USER root
-RUN mkdir -p /opt/logs/fe
+COPY startup.sh /root/
-COPY set_user.sh /tmp/set_user.sh
-
-RUN sh -x /tmp/set_user.sh && rm -f /tmp/set_user.sh
-
-RUN chown -R jetty:jetty ${JETTY_BASE}/webapps /var/opt/dcae-fe /opt/logs /var/lib/jetty
-
-RUN chmod 770 /var/opt/dcae-fe/startup.sh
-
-EXPOSE 8082 8444
-
-USER jetty
-
-ENTRYPOINT [ "/var/opt/dcae-fe/startup.sh" ]
+RUN chmod 770 /root/startup.sh
+ENTRYPOINT [ "/root/startup.sh" ]