From 1b956cbf6a6b6565a7294c0c2d2314c6192a888b Mon Sep 17 00:00:00 2001
From: "ali.alkhalidi" <ali.alkhalidi@securekey.com>
Date: Thu, 11 Feb 2021 13:01:03 -0500
Subject: [PATCH] fix failed build #264

Signed-off-by: ali.alkhalidi <ali.alkhalidi@securekey.com>
---
 Makefile               | 6 +++---
 ci/azure-pipelines.yml | 3 +++
 ci/version_var.sh      | 2 ++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index b33ab8a..9d6872a 100644
--- a/Makefile
+++ b/Makefile
@@ -5,8 +5,8 @@
 
 DOCKER_OUTPUT_NS                 ?= ghcr.io
 # Namespace for the did method image
-DID_METHOD_REST_IMAGE_NAME       ?= trustbloc/trustbloc-did-method/did-method-rest
-DID_METHOD_CLI_IMAGE_NAME       ?= trustbloc/trustbloc-did-method/did-method-cli
+DID_METHOD_REST_IMAGE_NAME       ?= trustbloc/driver-did-trustbloc
+DID_METHOD_CLI_IMAGE_NAME       ?= trustbloc/did-method-cli
 
 # Tool commands (overridable)
 ALPINE_VER ?= 3.12
@@ -55,7 +55,7 @@ generate-config-hash: did-method-cli
 
 .PHONY: did-method-rest-docker
 did-method-rest-docker:
-	@echo "Building did method rest docker image"
+	@echo "Building did method docker image"
 	@docker build -f ./images/did-method-rest/Dockerfile --no-cache -t $(DOCKER_OUTPUT_NS)/$(DID_METHOD_REST_IMAGE_NAME):latest \
 	--build-arg GO_VER=$(GO_VER) \
 	--build-arg ALPINE_VER=$(ALPINE_VER) .
diff --git a/ci/azure-pipelines.yml b/ci/azure-pipelines.yml
index b1108bd..7a4a537 100644
--- a/ci/azure-pipelines.yml
+++ b/ci/azure-pipelines.yml
@@ -75,6 +75,9 @@ jobs:
           make did-method-rest-docker
           docker tag ghcr.io/trustbloc/driver-did-trustbloc:latest ${TRUSTBLOC_DID_METHOD_PKG}:${TRUSTBLOC_DID_METHOD_TAG}
           docker push ${TRUSTBLOC_DID_METHOD_PKG}:${TRUSTBLOC_DID_METHOD_TAG}
+          make did-method-cli-docker
+          docker tag ghcr.io/trustbloc/did-method-cli:latest ${TRUSTBLOC_DID_METHOD_CLI_PKG}:${TRUSTBLOC_DID_METHOD_TAG}
+          docker push ${TRUSTBLOC_DID_METHOD_CLI_PKG}:${TRUSTBLOC_DID_METHOD_TAG}
         env:
           DOCKER_USER: $(DOCKER_USER)
           DOCKER_PASSWORD: $(DOCKER_PASSWORD)
diff --git a/ci/version_var.sh b/ci/version_var.sh
index 3550f38..f5bea22 100644
--- a/ci/version_var.sh
+++ b/ci/version_var.sh
@@ -13,6 +13,7 @@ IS_RELEASE=false
 # Project Parameters
 SOURCE_REPO=trustbloc-did-method
 BASE_PKG_NAME=driver-did-trustbloc
+CLI_PKG_NAME=did-method-cli
 RELEASE_REPO=ghcr.io/trustbloc
 SNAPSHOT_REPO=ghcr.io/trustbloc-cicd
 
@@ -29,3 +30,4 @@ fi
 
 export TRUSTBLOC_DID_METHOD_TAG=${PROJECT_VERSION}
 export TRUSTBLOC_DID_METHOD_PKG=${PROJECT_PKG_REPO}/${BASE_PKG_NAME}
+export TRUSTBLOC_DID_METHOD_CLI_PKG=${PROJECT_PKG_REPO}/${CLI_PKG_NAME}