From b139137d5833d1c00c7f5c00300cabc75213aa88 Mon Sep 17 00:00:00 2001
From: Roman Gorshunov <roman.gorshunov@att.com>
Date: Thu, 26 Sep 2019 15:04:31 +0000
Subject: [PATCH] Rename mysqlclient-utility container

Rename mysqlclient-utility container to porthole-mysqlclient-utility.

Change-Id: I899b4bdd5edfb7454c73b92fc9a7bb76e08ebd36
---
 Makefile                        | 7 +++++--
 zuul.d/mysqlclient-utility.yaml | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 2052064b..8badd491 100644
--- a/Makefile
+++ b/Makefile
@@ -42,9 +42,12 @@ ifdef VERSION
 endif
 
 ifeq "$(DISTRO_SUFFIX)" ""
-	DOCKERFILE = "Dockerfiles/$(IMAGE_NAME)/Dockerfile"
+	# We expect that container is named 'porthole-xxxxx', and
+	# subdirectory is named 'xxxxx'; so we cut 'porthole-' from
+	# directory names here below and in next statement
+	DOCKERFILE = "Dockerfiles/$(subst porthole-,,$(IMAGE_NAME))/Dockerfile"
 else
-	DOCKERFILE = "Dockerfiles/$(IMAGE_NAME)/Dockerfile.$(DISTRO_SUFFIX)"
+	DOCKERFILE = "Dockerfiles/$(subst porthole-,,$(IMAGE_NAME))/Dockerfile.$(DISTRO_SUFFIX)"
 endif
 
 info:
diff --git a/zuul.d/mysqlclient-utility.yaml b/zuul.d/mysqlclient-utility.yaml
index 18ccd1a4..c7e6f90e 100644
--- a/zuul.d/mysqlclient-utility.yaml
+++ b/zuul.d/mysqlclient-utility.yaml
@@ -16,7 +16,7 @@
     name: airship-porthole-images-build-gate-mysqlclient-utility
     parent: &parent airship-porthole-images
     vars:
-      image_name: &image_name mysqlclient-utility
+      image_name: &image_name porthole-mysqlclient-utility
       distro_suffix: &distro_suffix ubuntu_xenial
     files:
       - ^Dockerfiles/mysqlclient-utility/.*$