From dc638e46cc7c77b4f83250d67bbdac24534afb89 Mon Sep 17 00:00:00 2001
From: Roman Mohr <rmohr@redhat.com>
Date: Tue, 5 Mar 2019 09:08:26 +0100
Subject: [PATCH] Stick with DOCKER_* env variables for now

Keep DOCKER_PREFIX and DOCKER_TAG also for bazel right now. If we change
that, let's change it for everything to CONTAINER_TAG and
CONTAINER_PREFIX.
---
 .travis.yml                          | 4 ++--
 Makefile                             | 4 ++--
 cluster/ephemeral-provider-common.sh | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b08cf92705ad..3920482701d1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,7 @@ script:
 
 deploy:
 - provider: script
-  script: docker login -u="$DOCKER_USER" -p="$DOCKER_PASS" && CONTAINER_PREFIX="index.docker.io/kubevirt" CONTAINER_TAG="latest" make bazel-push-images
+  script: docker login -u="$DOCKER_USER" -p="$DOCKER_PASS" && DOCKER_PREFIX="index.docker.io/kubevirt" DOCKER_TAG="latest" make bazel-push-images
   skip_cleanup: true
   on:
     branch: master
@@ -39,7 +39,7 @@ deploy:
     all_branches: true
     condition: $TRAVIS_BRANCH != revert-*
 - provider: script
-  script: docker login -u="$DOCKER_USER" -p="$DOCKER_PASS" && CONTAINER_PREFIX="index.docker.io/kubevirt" CONTAINER_TAG="$TRAVIS_TAG" make bazel-push-images
+  script: docker login -u="$DOCKER_USER" -p="$DOCKER_PASS" && DOCKER_PREFIX="index.docker.io/kubevirt" DOCKER_TAG="$TRAVIS_TAG" make bazel-push-images
   skip_cleanup: true
   file:
   on:
diff --git a/Makefile b/Makefile
index bd68dc891880..e15e374e4880 100644
--- a/Makefile
+++ b/Makefile
@@ -16,8 +16,8 @@ bazel-push-images:
 	hack/dockerized "bazel run \
 		--platforms=@io_bazel_rules_go//go/toolchain:linux_amd64 \
 		--workspace_status_command=./hack/print-workspace-status.sh \
-		--define container_prefix=${CONTAINER_PREFIX} \
-		--define container_tag=${CONTAINER_TAG} \
+		--define container_prefix=${DOCKER_PREFIX} \
+		--define container_tag=${DOCKER_TAG} \
 		//:push-images"
 
 bazel-tests:
diff --git a/cluster/ephemeral-provider-common.sh b/cluster/ephemeral-provider-common.sh
index 3814eb509bb2..a18b860081d0 100644
--- a/cluster/ephemeral-provider-common.sh
+++ b/cluster/ephemeral-provider-common.sh
@@ -41,7 +41,7 @@ function _add_common_params() {
 function build() {
     # Build everyting and publish it
     ${KUBEVIRT_PATH}hack/dockerized "DOCKER_PREFIX=${DOCKER_PREFIX} DOCKER_TAG=${DOCKER_TAG} KUBEVIRT_PROVIDER=${KUBEVIRT_PROVIDER} IMAGE_PULL_POLICY=${IMAGE_PULL_POLICY} VERBOSITY=${VERBOSITY} ./hack/build-manifests.sh"
-    CONTAINER_PREFIX=${docker_prefix} CONTAINER_TAG=${docker_tag} make bazel-push-images
+    DOCKER_PREFIX=${docker_prefix} DOCKER_TAG=${docker_tag} make bazel-push-images
 
     # Make sure that all nodes use the newest images
     container=""