From 495a53ea2323bde8c07805315ab36f7bde031728 Mon Sep 17 00:00:00 2001
From: pingcap-github-bot <sre-bot@pingcap.com>
Date: Thu, 27 Feb 2020 10:51:32 +0800
Subject: [PATCH] unify tidb-backup-manager image name (#1791) (#1796)

---
 Makefile                                                  | 4 ++--
 ci/release_tidb_operator_binary_and_image.groovy          | 8 ++++----
 images/{backup-manager => tidb-backup-manager}/Dockerfile | 0
 .../{backup-manager => tidb-backup-manager}/entrypoint.sh | 0
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename images/{backup-manager => tidb-backup-manager}/Dockerfile (100%)
 rename images/{backup-manager => tidb-backup-manager}/entrypoint.sh (100%)

diff --git a/Makefile b/Makefile
index 2369a5a08e..a42d7a43a0 100644
--- a/Makefile
+++ b/Makefile
@@ -58,7 +58,7 @@ apiserver:
 	$(GO_BUILD) -ldflags '$(LDFLAGS)' -o images/tidb-operator/bin/tidb-apiserver cmd/apiserver/main.go
 
 backup-manager:
-	$(GO_BUILD) -ldflags '$(LDFLAGS)' -o images/backup-manager/bin/tidb-backup-manager cmd/backup-manager/main.go
+	$(GO_BUILD) -ldflags '$(LDFLAGS)' -o images/tidb-backup-manager/bin/tidb-backup-manager cmd/backup-manager/main.go
 
 ifeq ($(NO_BUILD),y)
 backup-docker:
@@ -66,7 +66,7 @@ backup-docker:
 else
 backup-docker: backup-manager
 endif
-	docker build --tag "${DOCKER_REGISTRY}/pingcap/tidb-backup-manager:${IMAGE_TAG}" images/backup-manager
+	docker build --tag "${DOCKER_REGISTRY}/pingcap/tidb-backup-manager:${IMAGE_TAG}" images/tidb-backup-manager
 
 e2e-docker-push: e2e-docker
 	docker push "${DOCKER_REGISTRY}/pingcap/tidb-operator-e2e:${IMAGE_TAG}"
diff --git a/ci/release_tidb_operator_binary_and_image.groovy b/ci/release_tidb_operator_binary_and_image.groovy
index 8b8b117b72..0850b68fa0 100644
--- a/ci/release_tidb_operator_binary_and_image.groovy
+++ b/ci/release_tidb_operator_binary_and_image.groovy
@@ -30,8 +30,8 @@ def call(BUILD_BRANCH, RELEASE_TAG, CREDENTIALS_ID, CHART_ITEMS) {
 
 					stage('Push tidb-backup-manager Docker Image'){
 						withDockerServer([uri: "${env.DOCKER_HOST}"]) {
-							docker.build("uhub.service.ucloud.cn/pingcap/backup-manager:${RELEASE_TAG}", "images/backup-manager").push()
-							docker.build("pingcap/backup-manager:${RELEASE_TAG}", "images/backup-manager").push()
+							docker.build("uhub.service.ucloud.cn/pingcap/tidb-backup-manager:${RELEASE_TAG}", "images/tidb-backup-manager").push()
+							docker.build("pingcap/tidb-backup-manager:${RELEASE_TAG}", "images/tidb-backup-manager").push()
 						}
 					}
 
@@ -94,8 +94,8 @@ def call(BUILD_BRANCH, RELEASE_TAG, CREDENTIALS_ID, CHART_ITEMS) {
 		slackmsg = "${slackmsg}" + "\n" +
 		"tidb-operator Docker Image: `pingcap/tidb-operator:${RELEASE_TAG}`" + "\n" +
 		"tidb-operator Docker Image: `uhub.ucloud.cn/pingcap/tidb-operator:${RELEASE_TAG}`" + "\n" +
-		"backup-manager Docker Image: `pingcap/backup-manager:${RELEASE_TAG}`" + "\n" +
-		"backup-manager Docker Image: `uhub.ucloud.cn/pingcap/backup-manager:${RELEASE_TAG}`"
+		"tidb-backup-manager Docker Image: `pingcap/tidb-backup-manager:${RELEASE_TAG}`" + "\n" +
+		"tidb-backup-manager Docker Image: `uhub.ucloud.cn/pingcap/tidb-backup-manager:${RELEASE_TAG}`"
 
 
 		for(String chartItem : CHART_ITEMS.split(' ')){
diff --git a/images/backup-manager/Dockerfile b/images/tidb-backup-manager/Dockerfile
similarity index 100%
rename from images/backup-manager/Dockerfile
rename to images/tidb-backup-manager/Dockerfile
diff --git a/images/backup-manager/entrypoint.sh b/images/tidb-backup-manager/entrypoint.sh
similarity index 100%
rename from images/backup-manager/entrypoint.sh
rename to images/tidb-backup-manager/entrypoint.sh