From: Huabing Zhao <zhaohuabing@gmail.com>
Date: Wed, 17 Jul 2019 04:48:09 +0000 (+0800)
Subject: JJB migration
X-Git-Tag: 1.2.6~16
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=msb%2Fapigateway.git;a=commitdiff_plain;h=abf6e1719ac0ddbbe0e86e82de6db47d3d744b2e

JJB migration

Issue-ID: CIMAN-266
Signed-off-by: Huabing Zhao <zhaohuabing@gmail.com>
Change-Id: Ic4cb23a8217400065098dccebe74ee5a73d42ec8
---

diff --git a/distributions/msb-apigateway/pom.xml b/distributions/msb-apigateway/pom.xml
index 2a9f2fe..4204658 100644
--- a/distributions/msb-apigateway/pom.xml
+++ b/distributions/msb-apigateway/pom.xml
@@ -14,7 +14,10 @@
 
   <properties>
     <packageid>msb-apigateway</packageid>
-    <version.output>target/version</version.output>
+    <version.output>${project.basedir}/target/version</version.output>
+    <docker.image.name>onap/msb/msb_apigateway</docker.image.name>
+    <docker.tag>${project.version}-${timestamp}</docker.tag>
+    <docker.latest.tag>${project.version}-latest</docker.latest.tag>
   </properties>
 
   <profiles>
@@ -179,13 +182,80 @@
             </execution>
           </executions>
         </plugin>
-
-
-      </plugins>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>docker</id>
+      <build>
+          <plugins>
+               <plugin>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
+                        <version>0.19.1</version>
+                        <dependencies>
+                            <dependency>
+                                <groupId>com.github.jnr</groupId>
+                                <artifactId>jnr-unixsocket</artifactId>
+                                <version>0.13</version>
+                            </dependency>
+                        </dependencies>
+                        <configuration>
+                            <verbose>true</verbose>
+                            <apiVersion>1.23</apiVersion>
+                            <registry>nexus3.onap.org:10003</registry>
+                            <images>
+                                <image>
+                                    <name>${docker.image.name}</name>
+                                    <alias>docker_msb_apigateway</alias>
+                                    <build>
+                                        <cleanup>true</cleanup>
+                                        <tags>
+                                            <tag>${docker.tag}</tag>
+                                            <tag>${docker.latest.tag}</tag>
+                                        </tags>
+                                        <dockerFileDir>${version.output}</dockerFileDir>
+                                        <!--assembly>
+                                            <descriptorRef>artifact</descriptorRef>
+                                        </assembly-->
+                                    </build>
+                                </image>
+                            </images>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>clean-images</id>
+                                <phase>pre-clean</phase>
+                                <goals>
+                                    <goal>remove</goal>
+                                </goals>
+                                <configuration>
+                                    <removeAll>true</removeAll>
+                                    <image>docker_msb_apigateway</image>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>generate-images</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>build</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>push-images</id>
+                                <phase>deploy</phase>
+                                <goals>
+                                    <goal>push</goal>
+                                </goals>
+                                <configuration>
+                                    <image>${docker.image.name}</image>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>  
+          </plugins>
       </build>
     </profile>
-
   </profiles>
 
-</project>
-
+</project>
\ No newline at end of file
diff --git a/distributions/msb-apigateway/src/main/docker/Dockerfile b/distributions/msb-apigateway/src/main/docker/Dockerfile
index 35de11e..424bdbb 100644
--- a/distributions/msb-apigateway/src/main/docker/Dockerfile
+++ b/distributions/msb-apigateway/src/main/docker/Dockerfile
@@ -1,5 +1,5 @@
 # Dockerfile - msb-apigateway
-FROM nexus3.onap.org:10003/onap/msb/msb_base:latest
+FROM nexus3.onap.org:10001/onap/msb/msb_base:latest
 COPY msb-apigateway*.tar.gz /usr/src
 
 RUN tar -xzf /usr/src/msb-apigateway*.tar.gz -C /usr/local --strip-components=1; \