From e0d94f6978322805cbffbbb1d2d23a8fd843b8bc Mon Sep 17 00:00:00 2001
From: "Determe, Sebastien (sd378r)" <sd378r@intl.att.com>
Date: Fri, 25 May 2018 15:14:08 +0200
Subject: Fix docker build

Replace spotify plugin by fabric8 docker plugin in order to fix build
issue

Issue-ID: CLAMP-150
Change-Id: Ibd6f3d5f07bc1ccaeae8e167f39352b40b4c108b
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
---
 src/main/docker/Dockerfile                  |  4 +-
 src/main/docker/assembly/clamp-files.xml    | 65 +++++++++++++++++++++++++++++
 src/main/docker/extra-files/startService.sh | 27 ++++++++++++
 src/main/docker/startService.sh             | 27 ------------
 4 files changed, 94 insertions(+), 29 deletions(-)
 create mode 100644 src/main/docker/assembly/clamp-files.xml
 create mode 100644 src/main/docker/extra-files/startService.sh
 delete mode 100644 src/main/docker/startService.sh

(limited to 'src')

diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
index 115949bb7..44e280943 100644
--- a/src/main/docker/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -15,9 +15,9 @@ RUN test -n "$http_proxy" && echo "Acquire::Proxy \"http://$http_proxy\";" > /et
     apt-get -y dist-upgrade &&  \
     apt-get install -y openjdk-8-jre-headless
 
-ADD clamp.jar /opt/clamp/app.jar
+COPY onap-clamp/clamp.jar /opt/clamp/app.jar
 VOLUME /etc
-ADD startService.sh /opt/clamp/startService.sh
+COPY onap-clamp/startService.sh /opt/clamp/startService.sh
 RUN chmod 700 /opt/clamp/startService.sh
 
 WORKDIR /opt/clamp/
diff --git a/src/main/docker/assembly/clamp-files.xml b/src/main/docker/assembly/clamp-files.xml
new file mode 100644
index 000000000..c65a6c50f
--- /dev/null
+++ b/src/main/docker/assembly/clamp-files.xml
@@ -0,0 +1,65 @@
+<!--
+  ============LICENSE_START=======================================================
+  ECOMP MSO
+  ================================================================================
+  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=========================================================
+  -->
+
+<assembly
+	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd">
+	<id>clamp-files</id>
+
+	<formats>
+		<format>tar.gz</format>
+	</formats>
+	<includeBaseDirectory>false</includeBaseDirectory>
+
+
+	<fileSets>
+		<!-- include config files -->
+		<fileSet>
+			<includes>
+				<include>${project.build.finalName}.jar</include>
+			</includes>
+			<directory>${project.build.directory}</directory>
+			<outputDirectory>/</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<includes>
+				<include>>etc/config/**</include>
+			</includes>
+			<directory>${project.build.directory}</directory>
+			<outputDirectory>/</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<includes>
+				<include>etc/keystore/**</include>
+			</includes>
+			<directory>${project.build.directory}</directory>
+			<outputDirectory>/</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<includes>
+				<include>**</include>
+			</includes>
+			<directory>src/main/docker/extra-files</directory>
+			<outputDirectory>/</outputDirectory>
+		</fileSet>
+	</fileSets>
+
+</assembly>
diff --git a/src/main/docker/extra-files/startService.sh b/src/main/docker/extra-files/startService.sh
new file mode 100644
index 000000000..edc0f020f
--- /dev/null
+++ b/src/main/docker/extra-files/startService.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+###
+# ============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============================================
+# ===================================================================
+# 
+###
+
+java -Djava.security.egd=file:/dev/./urandom -Xms1024m -Xmx1024m -jar ./app.jar
+
diff --git a/src/main/docker/startService.sh b/src/main/docker/startService.sh
deleted file mode 100644
index edc0f020f..000000000
--- a/src/main/docker/startService.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-###
-# ============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============================================
-# ===================================================================
-# 
-###
-
-java -Djava.security.egd=file:/dev/./urandom -Xms1024m -Xmx1024m -jar ./app.jar
-
-- 
cgit 1.2.3-korg