From e7f630651fd542fa2b85006b01ea6950b8acba13 Mon Sep 17 00:00:00 2001
From: Stacey Fletcher <staceylynnfletcher@gmail.com>
Date: Wed, 21 Feb 2018 21:28:24 -0600
Subject: [PATCH] Update Makefile

This ps updates the build commands to allow the same
format to be used in att-comdev projects

Change-Id: Ibc5be98636b2d0f29654a66261df27367ded49a6
---
 Makefile                         | 10 ++++++----
 tests/postgres/start_postgres.sh |  6 +++---
 tools/drydock_image_run.sh       |  6 +++---
 tox.ini                          |  4 ++--
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index e3af01d4..dd8aebd8 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-DRYDOCK_IMAGE_NAME         ?= drydock
+DOCKER_REGISTRY            ?= quay.io
+IMAGE_NAME                 ?= drydock
 IMAGE_PREFIX               ?= attcomdev
 IMAGE_TAG                  ?= latest
 HELM                       ?= helm
@@ -20,6 +21,7 @@ PROXY                      ?= http://one.proxy.att.com:8080
 USE_PROXY                  ?= false
 PUSH_IMAGE                 ?= false
 LABEL                      ?= commit-id
+IMAGE                      ?= ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG}
 export
 
 # Build all docker images for this project
@@ -65,12 +67,12 @@ dry-run: clean
 .PHONY: build_drydock
 build_drydock:
 ifeq ($(USE_PROXY), true)
-	docker build -t $(IMAGE_PREFIX)/$(DRYDOCK_IMAGE_NAME):$(IMAGE_TAG) --label $(LABEL) -f images/drydock/Dockerfile . --build-arg http_proxy=$(PROXY) --build-arg https_proxy=$(PROXY)
+	docker build -t $(IMAGE) --label $(LABEL) -f images/drydock/Dockerfile . --build-arg http_proxy=$(PROXY) --build-arg https_proxy=$(PROXY)
 else
-	docker build -t $(IMAGE_PREFIX)/$(DRYDOCK_IMAGE_NAME):$(IMAGE_TAG) --label $(LABEL) -f images/drydock/Dockerfile .
+	docker build -t $(IMAGE) --label $(LABEL) -f images/drydock/Dockerfile .
 endif
 ifeq ($(PUSH_IMAGE), true)
-	docker push $(IMAGE_PREFIX)/$(DRYDOCK_IMAGE_NAME):$(IMAGE_TAG)
+	docker push $(IMAGE)
 endif
 
 
diff --git a/tests/postgres/start_postgres.sh b/tests/postgres/start_postgres.sh
index e4c85811..67298f42 100755
--- a/tests/postgres/start_postgres.sh
+++ b/tests/postgres/start_postgres.sh
@@ -1,13 +1,13 @@
 #!/bin/bash
 set -x
-DRYDOCK_IMAGE="${IMAGE_PREFIX}/${DRYDOCK_IMAGE_NAME}:${IMAGE_TAG}"
+IMAGE="${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG}"
 
 if [[ ! -z $(docker ps | grep 'psql_integration') ]]
 then
   sudo docker stop 'psql_integration'
 fi
 
-DRYDOCK_IMAGE=${DRYDOCK_IMAGE:-"drydock:latest"}
+IMAGE=${IMAGE:-"drydock:latest"}
 
 if [[ ! -z $(docker ps | grep 'psql_integration') ]]
 then
@@ -22,4 +22,4 @@ docker run --rm --net host postgres:9.5 psql -h localhost -c "create database dr
 
 export DRYDOCK_DB_URL="postgresql+psycopg2://drydock:drydock@localhost:5432/drydock"
 
-sudo docker run --rm -t --net=host -e DRYDOCK_DB_URL="$DRYDOCK_DB_URL" --entrypoint /usr/local/bin/alembic $DRYDOCK_IMAGE upgrade head
+sudo docker run --rm -t --net=host -e DRYDOCK_DB_URL="$DRYDOCK_DB_URL" --entrypoint /usr/local/bin/alembic $IMAGE upgrade head
diff --git a/tools/drydock_image_run.sh b/tools/drydock_image_run.sh
index 9bc223e8..a1136f82 100755
--- a/tools/drydock_image_run.sh
+++ b/tools/drydock_image_run.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -x
 
-DRYDOCK_IMAGE="${IMAGE_PREFIX}/${DRYDOCK_IMAGE_NAME}:${IMAGE_TAG}"
+IMAGE=${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG}
 
 function start_db {
     if [[ ! -z $(docker ps | grep 'psql_integration') ]]
@@ -40,7 +40,7 @@ function init_db {
     docker run --rm -t --net=host \
       -e DRYDOCK_DB_URL="${DRYDOCK_DB_URL}" \
       --entrypoint /usr/local/bin/alembic \
-      ${DRYDOCK_IMAGE} \
+      ${IMAGE} \
       upgrade head
 }
 
@@ -49,7 +49,7 @@ function test_drydock {
     docker run \
       -d --name 'drydock_test' --net host \
       -v ${TMPETC}:/etc/drydock \
-      ${DRYDOCK_IMAGE}
+      ${IMAGE}
 
     sleep 10
 
diff --git a/tox.ini b/tox.ini
index 2a631925..9842b2d1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -36,7 +36,7 @@ commands=
     {toxinidir}/tests/unit/{posargs}
 
 [testenv:integration]
-passenv=DRYDOCK_IMAGE_NAME IMAGE_PREFIX IMAGE_TAG
+passenv=DOCKER_REGISTRY IMAGE_NAME IMAGE_PREFIX IMAGE_TAG
 setenv=
   PYTHONWARNING=all
   YAMLDIR={toxinidir}/tests/yaml_samples/
@@ -47,7 +47,7 @@ commands=
 
 [testenv:coverage]
 usedevelop=True
-passenv=DRYDOCK_IMAGE_NAME IMAGE_PREFIX IMAGE_TAG
+passenv=DOCKER_REGISTRY IMAGE_NAME IMAGE_PREFIX IMAGE_TAG
 setenv=
   YAMLDIR={toxinidir}/tests/yaml_samples/
 commands=