Add docker registry to image name

[clamp.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index ecd9937..801b2ee 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,9 +4,15 @@
        <modelVersion>4.0.0</modelVersion>
        <groupId>org.onap.clamp</groupId>
        <artifactId>clds</artifactId>
-       <version>0.0.1-SNAPSHOT</version>
+       <version>1.0.0-SNAPSHOT</version>
        <name>ONAP CLAMP</name>
 
+    <parent>
+        <groupId>org.onap.oparent</groupId>
+        <artifactId>oparent</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    
        <properties>
                <maven.compiler.source>1.8</maven.compiler.source>
                <maven.compiler.target>1.8</maven.compiler.target>
@@ -35,7 +41,7 @@
                <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
                <sonar.projectVersion>${project.version}</sonar.projectVersion>
 
-               <clamp.registry>localhost:5000</clamp.registry>
+               <docker.push.registry>localhost:5000</docker.push.registry>
                <skip.docker.build>true</skip.docker.build>
                <skip.docker.tag>true</skip.docker.tag>
                <skip.docker.push>true</skip.docker.push>
@@ -640,7 +646,7 @@
                                <artifactId>docker-maven-plugin</artifactId>
                                <version>0.4.11</version>
                                <configuration>
-                                       <imageName>onap/clamp</imageName>
+                                       <imageName>${docker.push.registry}/onap/clamp</imageName>
                                        <dockerDirectory>src/main/docker</dockerDirectory>
                                        <serverId>docker-hub</serverId>
                                        <imageTags>
@@ -684,7 +690,7 @@
                                                </goals>
                                                <configuration>
                                                        <image>onap/clamp</image>
-                                                       <newName>${clamp.registry}/onap/clamp</newName>
+                                                       <newName>${docker.push.registry}/onap/clamp</newName>
                                                        <pushImage>true</pushImage>
                                                        <skipDockerTag>${skip.docker.tag}</skipDockerTag>
                                                </configuration>
@@ -754,7 +760,7 @@
                                                                </volumes>
                                                                <wait>
                                                                        <log>socket: '/var/run/mysqld/mysqld.sock'  port: 3306  mariadb.org binary distribution</log>
-                                                                       <time>60000</time>
+                                                                       <time>300000</time>
                                                                </wait>
                                                                <ports>
                                                                        <port>${docker.mariadb.port.host}:3306</port>