From: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
Date: Tue, 26 Jun 2018 13:05:55 +0000 (+0200)
Subject: Fix the docker build
X-Git-Tag: 3.0.0~64
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=d3428d8fb2084930cdbe3a013ead2890b1d32e9d;p=clamp.git

Fix the docker build

Fix docker build when "docker" profile is enabled

Issue-ID: CLAMP-187
Change-Id: Ib0c5ec159279b260b4ea93015a2174cab39ed5ef
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
---

diff --git a/pom.xml b/pom.xml
index d849473d..93977ac5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,6 +82,7 @@
 				<sonar.projectVersion>${project.version}</sonar.projectVersion>
 
 				<docker.push.registry>localhost:5000</docker.push.registry>
+				<docker.pull.registry>nexus3.onap.org:10001</docker.pull.registry>
 				<docker.skip.build>true</docker.skip.build>
 				<docker.skip.push>true</docker.skip.push>
 				<docker.skip.tag>true</docker.skip.tag>
@@ -90,6 +91,54 @@
 				<tomcat.version>8.5.28</tomcat.version>
 		</properties>
 
+		<profiles>
+				<profile>
+						<id>without-test</id>
+						<activation>
+							<property>
+								<name>maven.test.skip</name>
+								<value>true</value>
+							</property>
+						</activation>
+						<properties>
+							<docker.skip.run>true</docker.skip.run>
+						</properties>
+				</profile>
+				<profile>
+						<id>without-IT-only</id>
+						<activation>
+							<property>
+								<name>skipITs</name>
+								<value>true</value>
+							</property>
+						</activation>
+						<properties>
+							<docker.skip.run>true</docker.skip.run>
+						</properties>
+				</profile>
+				<profile>
+						<id>without-IT-only2</id>
+						<activation>
+							<property>
+								<name>skipTests</name>
+								<value>true</value>
+							</property>
+						</activation>
+						<properties>
+							<docker.skip.run>true</docker.skip.run>
+						</properties>
+				</profile>
+				<profile>
+						<id>docker</id>
+						<properties>
+								<skip.staging.artifacts>true</skip.staging.artifacts>
+								<docker.skip.build>false</docker.skip.build>
+								<docker.skip.tag>false</docker.skip.tag>
+								<docker.skip.push>false</docker.skip.push>
+						</properties>
+				</profile>
+		</profiles>
+
 		<distributionManagement>
 				<repository>
 						<id>ecomp-releases</id>
@@ -811,7 +860,7 @@
 						<plugin>
 								<groupId>org.apache.maven.plugins</groupId>
 								<artifactId>maven-failsafe-plugin</artifactId>
-								<version>2.16</version>
+								<version>2.17</version>
 
 								<executions>
 										<execution>
@@ -839,7 +888,7 @@
 										<apiVersion>1.23</apiVersion>
 										<images>
 												<image>
-														<name>mariadb:10.1.11</name>
+														<name>library/mariadb:10.1.11</name>
 														<alias>mariadb</alias>
 														<run>
 																<env>
@@ -862,7 +911,7 @@
 														</run>
 												</image>
 												<image>
-														<name>python:2-slim</name>
+														<name>library/python:2-slim</name>
 														<alias>python</alias>
 														<run>
 																<hostname>python</hostname>
@@ -900,7 +949,8 @@
 																		<tag>${project.docker.latesttagtimestamp.version}</tag>
 																		<tag>${project.docker.latesttag.version}</tag>
 																</tags>
-																<!-- A relative path is looked up in ${project.basedir}/src/main/docker by default -->
+																<!-- A relative path is looked up in ${project.basedir}/src/main/docker 
+																		by default -->
 																<dockerFile>Dockerfile</dockerFile>
 																<assembly>
 																		<descriptor>assembly/clamp-files.xml</descriptor>
@@ -909,7 +959,6 @@
 														</build>
 												</image>
 										</images>
-										<skip>${skipITs}</skip>
 								</configuration>
 								<executions>
 										<execution>
@@ -932,9 +981,6 @@
 												<goals>
 														<goal>start</goal>
 												</goals>
-												<configuration>
-														<skip>${skipITs}</skip>
-												</configuration>
 										</execution>
 										<execution>
 												<id>docker-stop-for-it</id>
@@ -942,9 +988,6 @@
 												<goals>
 														<goal>stop</goal>
 												</goals>
-												<configuration>
-														<skip>${skipITs}</skip>
-												</configuration>
 										</execution>
 								</executions>
 						</plugin>
@@ -1009,15 +1052,4 @@
 						</plugin>
 				</plugins>
 		</build>
-		<profiles>
-				<profile>
-						<id>docker</id>
-						<properties>
-								<skip.staging.artifacts>true</skip.staging.artifacts>
-								<docker.skip.build>false</docker.skip.build>
-								<docker.skip.tag>false</docker.skip.tag>
-								<docker.skip.push>false</docker.skip.push>
-						</properties>
-				</profile>
-		</profiles>
 </project>