Fix docker build

[clamp.git] / src / main / docker / Dockerfile

diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
index 7dbd3da..44e2809 100644 (file)
--- a/src/main/docker/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -1,25 +1,24 @@
-FROM ubuntu:16.04
-
-MAINTAINER "The Onap Team"
-LABEL Description="This image contains an updated ubuntu 16.04 with the openjdk installed" Version="16.04-8"
-
-ARG http_proxy
-ARG https_proxy
-ENV HTTP_PROXY=$http_proxy
-ENV HTTPS_PROXY=$https_proxy
-ENV http_proxy=$HTTP_PROXY
-ENV https_proxy=$HTTPS_PROXY
-
-RUN test -n "$http_proxy" && echo "Acquire::Proxy \"http://$http_proxy\";" > /etc/apt/apt.conf.d/02proxy || true &&  \
-    apt-get update &&  \
-    apt-get -y dist-upgrade &&  \
-    apt-get install -y openjdk-8-jre-headless
-
-ADD clds-0.0.1-SNAPSHOT.jar /opt/clamp/app.jar
-VOLUME /etc
-ADD /etc/ /etc/
-ADD startService.sh /opt/clamp/startService.sh
-RUN chmod 700 /opt/clamp/startService.sh
-
-WORKDIR /opt/clamp/
-ENTRYPOINT ./startService.sh 
+FROM ubuntu:16.04\r
+\r
+MAINTAINER "The Onap Team"\r
+LABEL Description="This immage contains an updated ubuntu 16.04 with the openjdk installed" Version="16.04-8"\r
+\r
+ARG http_proxy\r
+ARG https_proxy\r
+ENV HTTP_PROXY=$http_proxy\r
+ENV HTTPS_PROXY=$https_proxy\r
+ENV http_proxy=$HTTP_PROXY\r
+ENV https_proxy=$HTTPS_PROXY\r
+\r
+RUN test -n "$http_proxy" && echo "Acquire::Proxy \"http://$http_proxy\";" > /etc/apt/apt.conf.d/02proxy || true &&  \\r
+    apt-get update &&  \\r
+    apt-get -y dist-upgrade &&  \\r
+    apt-get install -y openjdk-8-jre-headless\r
+\r
+COPY onap-clamp/clamp.jar /opt/clamp/app.jar\r
+VOLUME /etc\r
+COPY onap-clamp/startService.sh /opt/clamp/startService.sh\r
+RUN chmod 700 /opt/clamp/startService.sh\r
+\r
+WORKDIR /opt/clamp/\r
+ENTRYPOINT ./startService.sh \r