Docker image updates

Change-Id: I6fef0a255ca7411d2053ecca145156e6abad9775
Issue-ID: LOG-598
Signed-off-by: Prudence Au <prudence.au@amdocs.com>

1 files changed, 382 insertions, 296 deletions

diff --git a/pom.xml b/pom.xml
index dfbaef0..c62baf0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,321 +1,407 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <project xmlns="http://maven.apache.org/POM/4.0.0"

-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

-	<modelVersion>4.0.0</modelVersion>

+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

+  <modelVersion>4.0.0</modelVersion>

 

-	<groupId>org.onap.logging-analytics.pomba</groupId>

-	<artifactId>pomba-sdc-context-builder</artifactId>

-	<version>1.3.0-SNAPSHOT</version>

+  <groupId>org.onap.logging-analytics.pomba</groupId>

+  <artifactId>pomba-sdc-context-builder</artifactId>

+  <version>1.3.0-SNAPSHOT</version>

 

-	<parent>

-		<groupId>org.onap.oparent</groupId>

-		<artifactId>oparent</artifactId>

-		<version>1.1.1</version>

-		<relativePath />

-	</parent>

+  <parent>

+    <groupId>org.onap.oparent</groupId>

+    <artifactId>oparent</artifactId>

+    <version>1.1.1</version>

+    <relativePath />

+  </parent>

 

-	<properties>

-		<aai.rest.client.version>1.2.1</aai.rest.client.version>

-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

-		<logback.version>1.2.3</logback.version>

-		<swagger.directory>${project.build.directory}/generated-resources/swagger</swagger.directory>

-	</properties>

+  <properties>

+    <aai.rest.client.version>1.2.1</aai.rest.client.version>

+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

+    <logback.version>1.2.3</logback.version>

+    <swagger.directory>${project.build.directory}/generated-resources/swagger</swagger.directory>

+    <!--docker -->

+    <docker.tag>${project.version}-${timestamp}</docker.tag>

+    <docker.latest.tag>${project.version}-latest</docker.latest.tag>

+  </properties>

 

-	<dependencyManagement>

-		<dependencies>

-			<dependency>

-				<!-- Import dependency management from Spring Boot -->

-				<groupId>org.springframework.boot</groupId>

-				<artifactId>spring-boot-dependencies</artifactId>

-				<version>1.5.12.RELEASE</version>

-				<type>pom</type>

-				<scope>import</scope>

-			</dependency>

-		</dependencies>

+  <dependencyManagement>

+    <dependencies>

+      <dependency>

+        <!-- Import dependency management from Spring Boot -->

+        <groupId>org.springframework.boot</groupId>

+        <artifactId>spring-boot-dependencies</artifactId>

+        <version>1.5.12.RELEASE</version>

+        <type>pom</type>

+        <scope>import</scope>

+      </dependency>

+    </dependencies>

 

-	</dependencyManagement>

+  </dependencyManagement>

 

-	<dependencies>

-		<!-- Springframework dependencies -->

-		<dependency>

-			<groupId>org.springframework.boot</groupId>

-			<artifactId>spring-boot-starter-web</artifactId>

-		</dependency>

-		<dependency>

-			<groupId>org.springframework.boot</groupId>

-			<artifactId>spring-boot-starter-jetty</artifactId>

-		</dependency>

-		<dependency>

-			<groupId>org.springframework.boot</groupId>

-			<artifactId>spring-boot-starter</artifactId>

-			<exclusions>

-				<exclusion>

-					<groupId>ch.qos.logback</groupId>

-					<artifactId>logback-classic</artifactId>

-				</exclusion>

-			</exclusions>

-		</dependency>

-		<dependency>

-			<groupId>org.springframework.boot</groupId>

-			<artifactId>spring-boot-starter-jersey</artifactId>

-		</dependency>

-		<dependency>

-			<groupId>org.springframework.boot</groupId>

-			<artifactId>spring-boot-starter-actuator</artifactId>

-		</dependency>

+  <dependencies>

+    <!-- Springframework dependencies -->

+    <dependency>

+      <groupId>org.springframework.boot</groupId>

+      <artifactId>spring-boot-starter-web</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.springframework.boot</groupId>

+      <artifactId>spring-boot-starter-jetty</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.springframework.boot</groupId>

+      <artifactId>spring-boot-starter</artifactId>

+      <exclusions>

+        <exclusion>

+          <groupId>ch.qos.logback</groupId>

+          <artifactId>logback-classic</artifactId>

+        </exclusion>

+      </exclusions>

+    </dependency>

+    <dependency>

+      <groupId>org.springframework.boot</groupId>

+      <artifactId>spring-boot-starter-jersey</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.springframework.boot</groupId>

+      <artifactId>spring-boot-starter-actuator</artifactId>

+    </dependency>

 

-		<dependency>

-			<groupId>org.springframework.boot</groupId>

-			<artifactId>spring-boot-starter-test</artifactId>

-			<scope>test</scope>

-		</dependency>

+    <dependency>

+      <groupId>org.springframework.boot</groupId>

+      <artifactId>spring-boot-starter-test</artifactId>

+      <scope>test</scope>

+    </dependency>

 

-		<!-- logging dependencies -->

-		<dependency>

-			<groupId>org.slf4j</groupId>

-			<artifactId>slf4j-api</artifactId>

-		</dependency>

-		<dependency>

-			<groupId>org.onap.logging-analytics</groupId>

-			<artifactId>logging-slf4j</artifactId>

-			<version>1.2.2-SNAPSHOT</version>

-			<exclusions>

-				<exclusion>

-					<groupId>com.att.eelf</groupId>

-					<artifactId>eelf-core</artifactId>

-				</exclusion>

-			</exclusions>

-		</dependency>

+    <!-- logging dependencies -->

+    <dependency>

+      <groupId>org.slf4j</groupId>

+      <artifactId>slf4j-api</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.onap.logging-analytics</groupId>

+      <artifactId>logging-slf4j</artifactId>

+      <version>1.2.2-SNAPSHOT</version>

+      <exclusions>

+        <exclusion>

+          <groupId>com.att.eelf</groupId>

+          <artifactId>eelf-core</artifactId>

+        </exclusion>

+      </exclusions>

+    </dependency>

 

-		<dependency>

-			<groupId>ch.qos.logback</groupId>

-			<artifactId>logback-core</artifactId>

-			<version>${logback.version}</version>

-		</dependency>

-		<dependency>

-			<groupId>ch.qos.logback</groupId>

-			<artifactId>logback-classic</artifactId>

-			<version>${logback.version}</version>

-		</dependency>

+    <dependency>

+      <groupId>ch.qos.logback</groupId>

+      <artifactId>logback-core</artifactId>

+      <version>${logback.version}</version>

+    </dependency>

+    <dependency>

+      <groupId>ch.qos.logback</groupId>

+      <artifactId>logback-classic</artifactId>

+      <version>${logback.version}</version>

+    </dependency>

 

-		<dependency>

-			<groupId>org.eclipse.jetty</groupId>

-			<artifactId>jetty-security</artifactId>

-		</dependency>

-		<dependency>

-			<groupId>au.com.dius</groupId>

-			<artifactId>pact-jvm-provider-junit_2.11</artifactId>

-			<version>3.5.11</version>

-		</dependency>

+    <dependency>

+      <groupId>org.eclipse.jetty</groupId>

+      <artifactId>jetty-security</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>au.com.dius</groupId>

+      <artifactId>pact-jvm-provider-junit_2.11</artifactId>

+      <version>3.5.11</version>

+    </dependency>

 

-		<dependency>

-			<groupId>io.swagger</groupId>

-			<artifactId>swagger-core</artifactId>

-			<version>1.5.9</version>

-		</dependency>

-		<dependency>

-			<groupId>io.swagger</groupId>

-			<artifactId>swagger-annotations</artifactId>

-			<version>1.5.9</version>

-		</dependency>

-		<dependency>

-			<groupId>org.glassfish.jersey.core</groupId>

-			<artifactId>jersey-client</artifactId>

-			<version>2.24</version>

-		</dependency>

-		<dependency>

-			<groupId>org.glassfish.jersey.core</groupId>

-			<artifactId>jersey-common</artifactId>

-			<version>2.24</version>

-		</dependency>

+    <dependency>

+      <groupId>io.swagger</groupId>

+      <artifactId>swagger-core</artifactId>

+      <version>1.5.9</version>

+    </dependency>

+    <dependency>

+      <groupId>io.swagger</groupId>

+      <artifactId>swagger-annotations</artifactId>

+      <version>1.5.9</version>

+    </dependency>

+    <dependency>

+      <groupId>org.glassfish.jersey.core</groupId>

+      <artifactId>jersey-client</artifactId>

+      <version>2.24</version>

+    </dependency>

+    <dependency>

+      <groupId>org.glassfish.jersey.core</groupId>

+      <artifactId>jersey-common</artifactId>

+      <version>2.24</version>

+    </dependency>

 

-		<dependency>

-			<groupId>org.onap.aai.logging-service</groupId>

-			<artifactId>common-logging</artifactId>

-			<version>1.2.2</version>

-		</dependency>

+    <dependency>

+      <groupId>org.onap.aai.logging-service</groupId>

+      <artifactId>common-logging</artifactId>

+      <version>1.2.2</version>

+    </dependency>

 

-		<dependency>

-			<groupId>org.onap.aai.logging-service</groupId>

-			<artifactId>logging-api</artifactId>

-			<version>1.2.2</version>

-		</dependency>

+    <dependency>

+      <groupId>org.onap.aai.logging-service</groupId>

+      <artifactId>logging-api</artifactId>

+      <version>1.2.2</version>

+    </dependency>

 

-		<dependency>

-			<groupId>org.onap.aai</groupId>

-			<artifactId>rest-client</artifactId>

-			<version>${aai.rest.client.version}</version>

-			<exclusions>

-				<exclusion>

-					<groupId>org.apache.logging.log4j</groupId>

-					<artifactId>log4j-slf4j-impl</artifactId>

-				</exclusion>

-			</exclusions>

-		</dependency>

+    <dependency>

+      <groupId>org.onap.aai</groupId>

+      <artifactId>rest-client</artifactId>

+      <version>${aai.rest.client.version}</version>

+      <exclusions>

+        <exclusion>

+          <groupId>org.apache.logging.log4j</groupId>

+          <artifactId>log4j-slf4j-impl</artifactId>

+        </exclusion>

+      </exclusions>

+    </dependency>

 

-		<dependency>

-			<groupId>org.openecomp.sdc.sdc-distribution-client</groupId>

-			<artifactId>sdc-distribution-client</artifactId>

-			<version>1.2.3</version>

-		</dependency>

-		<dependency>

-			<groupId>org.openecomp.sdc.sdc-tosca</groupId>

-			<artifactId>sdc-tosca</artifactId>

-			<version>1.2.2</version>

-		</dependency>

+    <dependency>

+      <groupId>org.openecomp.sdc.sdc-distribution-client</groupId>

+      <artifactId>sdc-distribution-client</artifactId>

+      <version>1.2.3</version>

+    </dependency>

+    <dependency>

+      <groupId>org.openecomp.sdc.sdc-tosca</groupId>

+      <artifactId>sdc-tosca</artifactId>

+      <version>1.2.2</version>

+    </dependency>

 

-		<dependency>

-			<groupId>org.openecomp.sdc.jtosca</groupId>

-			<artifactId>jtosca</artifactId>

-			<version>1.2.1</version>

-		</dependency>

-		<dependency>

-			<groupId>net.sf.flexjson</groupId>

-			<artifactId>flexjson</artifactId>

-			<version>3.3</version>

-		</dependency>

+    <dependency>

+      <groupId>org.openecomp.sdc.jtosca</groupId>

+      <artifactId>jtosca</artifactId>

+      <version>1.2.1</version>

+    </dependency>

+    <dependency>

+      <groupId>net.sf.flexjson</groupId>

+      <artifactId>flexjson</artifactId>

+      <version>3.3</version>

+    </dependency>

 

-		<dependency>

-			<groupId>org.onap.logging-analytics.pomba</groupId>

-			<artifactId>pomba-audit-common</artifactId>

-			<version>1.3.0-SNAPSHOT</version>

-		</dependency>

+    <dependency>

+      <groupId>org.onap.logging-analytics.pomba</groupId>

+      <artifactId>pomba-audit-common</artifactId>

+      <version>1.3.0-SNAPSHOT</version>

+    </dependency>

 

-		<dependency>

-			<groupId>org.projectlombok</groupId>

-			<artifactId>lombok</artifactId>

-			<version>1.18.0</version>

-		</dependency>

-	</dependencies>

+    <dependency>

+      <groupId>org.projectlombok</groupId>

+      <artifactId>lombok</artifactId>

+      <version>1.18.0</version>

+    </dependency>

+  </dependencies>

 

-	<build>

-		<finalName>${project.artifactId}</finalName>

-		<plugins>

-			<plugin>

-				<artifactId>maven-resources-plugin</artifactId>

-				<version>3.1.0</version>

-				<executions>

-					<execution>

-						<id>copy-resources</id>

-						<!-- here the phase you need -->

-						<phase>prepare-package</phase>

-						<goals>

-							<goal>copy-resources</goal>

-						</goals>

-						<configuration>

-							<outputDirectory>${project.build.outputDirectory}</outputDirectory>

-							<resources>

-								<resource>

-									<directory>

-										${project.build.directory}/generated-resources/swagger

-									</directory>

-									<targetPath>META-INF/resources/swagger</targetPath>

-								</resource>

-							</resources>

-						</configuration>

-					</execution>

-				</executions>

-			</plugin>

+  <build>

+    <finalName>${project.artifactId}</finalName>

+    <plugins>

+      <plugin>

+        <groupId>org.springframework.boot</groupId>

+        <artifactId>spring-boot-maven-plugin</artifactId>

+        <executions>

+          <execution>

+            <goals>

+              <goal>repackage</goal>

+            </goals>

+          </execution>

+        </executions>

+      </plugin>

+    </plugins>

 

-			<plugin>

-				<groupId>com.github.kongchen</groupId>

-				<artifactId>swagger-maven-plugin</artifactId>

-				<version>3.1.3</version>

-				<configuration>

-					<apiSources>

-						<apiSource>

-							<locations>org.onap.pomba.contextbuilder.sdc.service.rs</locations>

-							<basePath>/sdccontextbuilder</basePath>

-							<info>

-								<title>${project.artifactId} Service</title>

-								<version>${project.version}</version>

-							</info>

-							<swaggerDirectory>${swagger.directory}</swaggerDirectory>

-						</apiSource>

-					</apiSources>

-				</configuration>

-				<executions>

-					<execution>

-						<!-- <phase>compile</phase> -->

-						<phase>package</phase>

-						<goals>

-							<goal>generate</goal>

-						</goals>

-					</execution>

-				</executions>

-			</plugin>

+    <resources>

+      <resource>

+        <directory>src/main/resources</directory>

+        <filtering>true</filtering>

+        <includes>

+          <include>**/*</include>

+        </includes>

+      </resource>

+    </resources>

+  </build>

 

-			<plugin>

-				<groupId>org.springframework.boot</groupId>

-				<artifactId>spring-boot-maven-plugin</artifactId>

-				<executions>

-					<execution>

-						<goals>

-							<goal>repackage</goal>

-						</goals>

-					</execution>

-				</executions>

-			</plugin>

+  <profiles>

+    <profile>

+      <id>docker</id>

+      <build>

+        <plugins>

+          <plugin>

+            <groupId>io.fabric8</groupId>

+            <artifactId>docker-maven-plugin</artifactId>

+            <version>0.19.1</version>

+            <configuration>

+              <verbose>true</verbose>

+              <apiVersion>1.23</apiVersion>

+              <images>

+                <image>

+                  <name>onap/${project.artifactId}</name>

+                  <alias>${project.artifactId}</alias>

+                  <build>

+                    <cleanup>try</cleanup>

+                    <dockerFileDir>${project.basedir}/target/docker-stage</dockerFileDir>

+                    <tags>

+                      <tag>${docker.snapshot.tag}</tag>

+                      <tag>${docker.latest.tag}</tag>

+                    </tags>

+                  </build>

+                </image>

+              </images>

+            </configuration>

+            <executions>

+              <execution>

+                <id>generate-images</id>

+                <phase>generate-sources</phase>

+                <goals>

+                  <goal>build</goal>

+                </goals>

+              </execution>

+              <execution>

+                <id>push-images</id>

+                <phase>deploy</phase>

+                <goals>

+                  <goal>build</goal>

+                  <goal>push</goal>

+                </goals>

+              </execution>

+            </executions>

+          </plugin>

+          <plugin>

+            <artifactId>maven-resources-plugin</artifactId>

+            <version>3.1.0</version>

+            <executions>

+              <execution>

+                <id>copy-resources</id>

+                <!-- here the phase you need -->

+                <phase>prepare-package</phase>

+                <goals>

+                  <goal>copy-resources</goal>

+                </goals>

+                <configuration>

+                  <outputDirectory>${project.build.outputDirectory}</outputDirectory>

+                  <resources>

+                    <resource>

+                      <directory>

+                        ${project.build.directory}/generated-resources/swagger

+                      </directory>

+                      <targetPath>META-INF/resources/swagger</targetPath>

+                    </resource>

+                  </resources>

+                </configuration>

+              </execution>

+            </executions>

+          </plugin>

 

-			<plugin>

-				<groupId>org.apache.maven.plugins</groupId>

-				<artifactId>maven-resources-plugin</artifactId>

-				<executions>

-					<execution>

-						<id>copy-docker-file</id>

-						<phase>package</phase>

-						<goals>

-							<goal>copy-resources</goal>

-						</goals>

-						<configuration>

-							<outputDirectory>target</outputDirectory>

-							<overwrite>true</overwrite>

-							<resources>

-								<resource>

-									<directory>${basedir}/src/main/docker</directory>

-									<filtering>true</filtering>

-									<includes>

-										<include>**/*</include>

-									</includes>

-								</resource>

-							</resources>

-						</configuration>

-					</execution>

-				</executions>

-			</plugin>

-			<plugin>

-				<groupId>com.spotify</groupId>

-				<artifactId>docker-maven-plugin</artifactId>

-				<version>0.4.11</version>

-				<dependencies>

-					<dependency>

-						<groupId>com.github.jnr</groupId>

-						<artifactId>jnr-unixsocket</artifactId>

-						<version>0.13</version>

-					</dependency>

-				</dependencies>

-				<configuration>

-					<verbose>true</verbose>

-					<serverId>docker-hub</serverId>

-					<imageName>${docker.push.registry}/onap/${project.artifactId}</imageName>

-					<dockerDirectory>${docker.location}</dockerDirectory>

-					<imageTags>

-						<imageTag>latest</imageTag>

-					</imageTags>

-					<forceTags>true</forceTags>

-				</configuration>

-			</plugin>

-		</plugins>

-

-		<resources>

-			<resource>

-				<directory>src/main/resources</directory>

-				<filtering>true</filtering>

-				<includes>

-					<include>**/*</include>

-				</includes>

-			</resource>

-		</resources>

-	</build>

+          <plugin>

+            <groupId>com.github.kongchen</groupId>

+            <artifactId>swagger-maven-plugin</artifactId>

+            <version>3.1.3</version>

+            <configuration>

+              <apiSources>

+                <apiSource>

+                  <locations>org.onap.pomba.contextbuilder.sdc.service.rs</locations>

+                  <basePath>/sdccontextbuilder</basePath>

+                  <info>

+                    <title>${project.artifactId} Service</title>

+                    <version>${project.version}</version>

+                  </info>

+                  <swaggerDirectory>${swagger.directory}</swaggerDirectory>

+                </apiSource>

+              </apiSources>

+            </configuration>

+            <executions>

+              <execution>

+                <!-- <phase>compile</phase> -->

+                <phase>package</phase>

+                <goals>

+                  <goal>generate</goal>

+                </goals>

+              </execution>

+            </executions>

+          </plugin>

+          <plugin>

+            <artifactId>maven-resources-plugin</artifactId>

+            <version>2.6</version>

+            <executions>

+              <execution>

+                <id>copy-dockerfile</id>

+                <goals>

+                  <goal>copy-resources</goal>

+                </goals><!-- here the phase you need -->

+                <phase>package</phase>

+                <configuration>

+                  <outputDirectory>${project.basedir}/target/docker-stage</outputDirectory>

+                  <resources>

+                    <resource>

+                      <directory>src/main/docker</directory>

+                      <includes>

+                        <include>Dockerfile</include>

+                      </includes>

+                      <filtering>true</filtering>

+                    </resource>

+                  </resources>

+                </configuration>

+              </execution>

+              <execution>

+                <id>copy-properties</id>

+                <goals>

+                  <goal>copy-resources</goal>

+                </goals>

+                <phase>validate</phase>

+                <configuration>

+                  <outputDirectory>${project.basedir}/target/docker-stage/config</outputDirectory>

+                  <resources>

+                    <resource>

+                      <directory>config</directory>

+                      <includes>

+                        <include>*.properties</include>

+                        <include>*.xml</include>

+                      </includes>

+                      <filtering>false</filtering>

+                    </resource>

+                  </resources>

+                </configuration>

+              </execution>

+              <execution>

+                <id>copy-script</id>

+                <goals>

+                  <goal>copy-resources</goal>

+                </goals>

+                <phase>package</phase>

+                <configuration>

+                  <outputDirectory>${project.basedir}/target/docker-stage/</outputDirectory>

+                  <resources>

+                    <resource>

+                      <directory>src/main/docker</directory>

+                      <includes>

+                        <include>*.sh</include>

+                      </includes>

+                      <filtering>false</filtering>

+                    </resource>

+                  </resources>

+                </configuration>

+              </execution>

+              <execution>

+                <id>copy-jar</id>

+                <goals>

+                  <goal>copy-resources</goal>

+                </goals>

+                <phase>package</phase>

+                <configuration>

+                  <outputDirectory>${project.basedir}/target/docker-stage/</outputDirectory>

+                  <resources>

+                    <resource>

+                      <directory>target</directory>

+                      <includes>

+                        <include>*.jar</include>

+                      </includes>

+                      <filtering>false</filtering>

+                    </resource>

+                  </resources>

+                </configuration>

+              </execution>

+            </executions>

+          </plugin>

+        </plugins>

+      </build>

+    </profile>

+  </profiles>

 </project>