From 8bf33437774bd7120bb68a22d0106adcc3a1718d Mon Sep 17 00:00:00 2001
From: "Determe, Sebastien (sd378r)" <sd378r@intl.att.com>
Date: Tue, 8 Aug 2017 02:49:33 -0700
Subject: 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>
---
 src/main/docker/Dockerfile                 | 49 +++++++++++++++---------------
 src/main/resources/clds-version.properties | 23 ++++++++++++++
 2 files changed, 47 insertions(+), 25 deletions(-)
 create mode 100644 src/main/resources/clds-version.properties

(limited to 'src/main')

diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
index 6b3e272d..115949bb 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 
diff --git a/src/main/resources/clds-version.properties b/src/main/resources/clds-version.properties
new file mode 100644
index 00000000..8576692b
--- /dev/null
+++ b/src/main/resources/clds-version.properties
@@ -0,0 +1,23 @@
+###
+# ============LICENSE_START=======================================================
+# ONAP CLAMP
+# ================================================================================
+# Copyright (C) 2017 AT&T Intellectual Property. All rights
+#                             reserved.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License"); 
+# you may not use this file except in compliance with the License. 
+# You may obtain a copy of the License at
+# 
+# http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software 
+# distributed under the License is distributed on an "AS IS" BASIS, 
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+# See the License for the specific language governing permissions and 
+# limitations under the License.
+# ============LICENSE_END============================================
+# ===================================================================
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
+###
+clds.version=${project.version}
\ No newline at end of file
-- 
cgit 1.2.3-korg