From: Rob Daugherty <rd472p@att.com>
Date: Mon, 20 Aug 2018 17:00:56 +0000 (-0400)
Subject: Docker naming convention
X-Git-Tag: 1.3.1~266
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=8ad7083991ee9e9a0c026028cebc6ab24ca4d272;p=so.git

Docker naming convention

SO is not following the naming convention.  Docker image names
should have an "onap" prefix.  The image names are changed as
follows:

so/catalog-db-adapter --> onap/so/catalog-db-adapter
so/request-db-adapter --> onap/so/request-db-adapter
so/sdnc-adapter --> onap/so/sdnc-adapter
so/openstack-adapter --> onap/so/openstack-adapter
so/vfc-adapter --> onap/so/vfc-adapter
so/asdc-controller --> onap/so/asdc-controller
so/bpmn-infra --> onap/so/bpmn-infra
so/api-handler-infra --> onap/so/api-handler-infra

A corresponding change is needed in INT's docker-manifest.csv.

Change-Id: I024e42607d5fc57a712ad67709f241ee8720a670
Issue-ID: SO-870
Signed-off-by: Rob Daugherty <rd472p@att.com>
---

diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml
index 9f96b2fcd0..eed81b9ca9 100644
--- a/packages/docker/pom.xml
+++ b/packages/docker/pom.xml
@@ -72,7 +72,7 @@
 
 					<images>
 						<image>
-							<name>so/base-image:1.0</name>
+							<name>onap/so/base-image:1.0</name>
 							<build>
 								<cleanup>try</cleanup>
 								<dockerFileDir>docker-files</dockerFileDir>
@@ -80,7 +80,7 @@
 							</build>
 						</image>
 						<image>
-							<name>so/catalog-db-adapter</name>
+							<name>onap/so/catalog-db-adapter</name>
 							<build>
 								<cleanup>try</cleanup>
 								<dockerFileDir>docker-files</dockerFileDir>
@@ -105,7 +105,7 @@
 							</build>
 						</image>
 						<image>
-							<name>so/request-db-adapter</name>
+							<name>onap/so/request-db-adapter</name>
 							<build>
 								<cleanup>try</cleanup>
 								<dockerFileDir>docker-files</dockerFileDir>
@@ -130,7 +130,7 @@
 							</build>
 						</image>
 						<image>
-							<name>so/sdnc-adapter</name>
+							<name>onap/so/sdnc-adapter</name>
 							<build>
 								<cleanup>try</cleanup>
 								<dockerFileDir>docker-files</dockerFileDir>
@@ -155,7 +155,7 @@
 							</build>
 						</image>
 						<image>
-							<name>so/openstack-adapter</name>
+							<name>onap/so/openstack-adapter</name>
 							<build>
 								<cleanup>try</cleanup>
 								<dockerFileDir>docker-files</dockerFileDir>
@@ -180,7 +180,7 @@
 							</build>
 						</image>
 						<image>
-							<name>so/vfc-adapter</name>
+							<name>onap/so/vfc-adapter</name>
 							<build>
 								<cleanup>try</cleanup>
 								<dockerFileDir>docker-files</dockerFileDir>
@@ -205,7 +205,7 @@
 							</build>
 						</image>
 						<image>
-							<name>so/asdc-controller</name>
+							<name>onap/so/asdc-controller</name>
 							<build>
 								<cleanup>try</cleanup>
 								<dockerFileDir>docker-files</dockerFileDir>
@@ -230,7 +230,7 @@
 							</build>
 						</image>
 						<image>
-							<name>so/bpmn-infra</name>
+							<name>onap/so/bpmn-infra</name>
 							<build>
 								<cleanup>try</cleanup>
 								<dockerFileDir>docker-files</dockerFileDir>
@@ -255,7 +255,7 @@
 							</build>
 						</image>
 						<image>
-							<name>so/api-handler-infra</name>
+							<name>onap/so/api-handler-infra</name>
 							<build>
 								<cleanup>try</cleanup>
 								<dockerFileDir>docker-files</dockerFileDir>
@@ -310,7 +310,7 @@
 							<goal>push</goal>
 						</goals>
 						<configuration>
-							<image>so/catalog-db-adapter,so/request-db-adapter,so/sdnc-adapter,so/openstack-adapter,so/vfc-adapter,so/asdc-controller,so/bpmn-infra,so/api-handler-infra</image>
+							<image>onap/so/catalog-db-adapter,onap/so/request-db-adapter,onap/so/sdnc-adapter,onap/so/openstack-adapter,onap/so/vfc-adapter,onap/so/asdc-controller,onap/so/bpmn-infra,onap/so/api-handler-infra</image>
 						</configuration>
 					</execution>
 				</executions>
diff --git a/packages/docker/src/main/docker/docker-files/Dockerfile.so-app b/packages/docker/src/main/docker/docker-files/Dockerfile.so-app
index 69b88d8905..88031db0cd 100644
--- a/packages/docker/src/main/docker/docker-files/Dockerfile.so-app
+++ b/packages/docker/src/main/docker/docker-files/Dockerfile.so-app
@@ -1,4 +1,4 @@
-FROM so/base-image:1.0
+FROM onap/so/base-image:1.0
 
 ARG http_proxy
 ENV HTTP_PROXY=$http_proxy