diff options
| author |   Determe, Sebastien (sd378r) <sd378r@intl.att.com> | 2017-08-08 02:49:33 -0700 |
|---|---|---|
| committer | Sébastien Determe <sd378r@intl.att.com> | 2017-08-08 12:37:11 +0000 |
| commit | 8bf33437774bd7120bb68a22d0106adcc3a1718d (patch) | |
| tree | bd05fd6cfbcae7bc05a1cffb7c21ddf48bb79774 /src/main/docker/Dockerfile | |
| parent | bb03393b823bc2b1ec43be654e13b83a5a74a566 (diff) | |
Rework Pom and Dockerfile
Rework the pom & swagger config
+ Remove license plugin in pom and license files
+ Rework the dockerfile (support all clamp versions now)
+ Introduce the version.properties
Change-Id: Ia823e00309d651ca40ef12beeae02fb01d8a80a9
Issue-Id: CLAMP-1
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
Diffstat (limited to 'src/main/docker/Dockerfile')
| -rw-r--r-- | src/main/docker/Dockerfile | 49 |
1 files changed, 24 insertions, 25 deletions
diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile index 6b3e272d3..115949bb7 100644 --- 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-1.0.0-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
+
+MAINTAINER "The Onap Team"
+LABEL Description="This immage 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 clamp.jar /opt/clamp/app.jar
+VOLUME /etc
+ADD startService.sh /opt/clamp/startService.sh
+RUN chmod 700 /opt/clamp/startService.sh
+
+WORKDIR /opt/clamp/
+ENTRYPOINT ./startService.sh
|