From 5a6a6de6f1a26a1897e4917a0df613e25a24eb70 Mon Sep 17 00:00:00 2001
From: "Benjamin, Max (mb388a)" <mb388a@us.att.com>
Date: Mon, 30 Jul 2018 15:56:09 -0400
Subject: Containerization feature of SO

Change-Id: I95381232eeefcd247a66a5cec370a8ce1c288e18
Issue-ID: SO-670
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
---
 packages/docker/pom.xml                            | 24 +++++-----------------
 .../configuration/standalone-full-ha.xml           |  2 +-
 2 files changed, 6 insertions(+), 20 deletions(-)

(limited to 'packages/docker')

diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml
index 8ea96e912e..c84902ae4d 100644
--- a/packages/docker/pom.xml
+++ b/packages/docker/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.onap.so</groupId>
 		<artifactId>packages</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<packaging>pom</packaging>
@@ -144,23 +144,9 @@
 							</build>
 						</image>
 						<image>
-							<name>openecomp/mso-arquillian:%l</name>
-							<alias>mso-arquillian</alias>
-							<build>
-								<tags>
-								    <tag>${project.docker.latesttag.version}</tag>
-									<tag>${project.version}-STAGING-${maven.build.timestamp}</tag>
-								</tags>
-								<cleanup>try</cleanup>
-								<dockerFileDir>docker-files</dockerFileDir>
-								<dockerFile>Dockerfile.mso-arquillian</dockerFile>
-
-							</build>
-						</image>
-						<image>
-							<name>onap/so:%l</name>
+							<name>openecomp/mso:%l</name>
+							<alias>onap/so:%1</alias>
 							<alias>openecomp/mso:%l</alias>
-							<alias>mso</alias>
 							<alias>so</alias>
 							<build>
 								<tags>
@@ -191,7 +177,7 @@
 						</goals>
 						<configuration>
 							<removeAll>true</removeAll>
-							<image>openecomp/mso-arquillian:%l,openecomp/mso:%l</image>
+							<image>openecomp/mso:%l</image>
 						</configuration>
 					</execution>
 
@@ -211,7 +197,7 @@
 							<goal>push</goal>
 						</goals>
 						<configuration>
-							<image>openecomp/mso-arquillian:%l,openecomp/mso:%l,openecomp/jacoco:1.0</image>
+							<image>openecomp/mso:%l,openecomp/jacoco:1.0</image>
 						</configuration>
 					</execution>
 				</executions>
diff --git a/packages/docker/src/main/docker/docker-files/jboss-configs/configuration/standalone-full-ha.xml b/packages/docker/src/main/docker/docker-files/jboss-configs/configuration/standalone-full-ha.xml
index cface7f46d..5a1b52200f 100644
--- a/packages/docker/src/main/docker/docker-files/jboss-configs/configuration/standalone-full-ha.xml
+++ b/packages/docker/src/main/docker/docker-files/jboss-configs/configuration/standalone-full-ha.xml
@@ -598,7 +598,7 @@
         <socket-binding name="jgroups-tcp-fd" interface="private" port="57600"/>
         <socket-binding name="jgroups-udp" interface="private" port="55200" multicast-address="${jboss.default.multicast.address:230.0.0.4}" multicast-port="45688"/>
         <socket-binding name="jgroups-udp-fd" interface="private" port="54200"/>
-        <socket-binding name="modcluster" port="0" multicast-address="224.0.1.105" multicast-port="23364"/>
+        <socket-binding name="modcluster" port="0" multicast-address="192.168.1.105" multicast-port="23364"/>
         <socket-binding name="txn-recovery-environment" port="4712"/>
         <socket-binding name="txn-status-manager" port="4713"/>
         <outbound-socket-binding name="mail-smtp">
-- 
cgit 1.2.3-korg