Skip to content

Commit

Permalink
unify tidb-backup-manager image name (#1791) (#1796)
Browse files Browse the repository at this point in the history
  • Loading branch information
sre-bot authored Feb 27, 2020
1 parent 345d724 commit 495a53e
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,15 @@ 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:
@echo "NO_BUILD=y, skip build for $@"
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}"
Expand Down
8 changes: 4 additions & 4 deletions ci/release_tidb_operator_binary_and_image.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
}

Expand Down Expand Up @@ -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(' ')){
Expand Down
File renamed without changes.
File renamed without changes.

0 comments on commit 495a53e

Please sign in to comment.