Skip to content

Commit

Permalink
Revert "Fix Dockerhub registry URL 2 (Yelp#445)" (Yelp#446)
Browse files Browse the repository at this point in the history
This reverts commit af67cc4.
  • Loading branch information
justineyster authored and GitHub Enterprise committed Jun 16, 2021
1 parent af67cc4 commit 2de4cd2
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Makefile.ibm
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ DOCKER_REGISTRY_ART := txo-toolbox-team-docker-local.artifactory.swg-devops.com
DOCKER_USER_ART := dssadmin@us.ibm.com
DOCKER_PASS_ART := $(ART_API_KEY)

DOCKER_REGISTRY_DOCKERHUB := hub.docker.com
DOCKER_REGISTRY_DOCKERHUB := registry.hub.docker.com
DOCKER_USER_DOCKERHUB := $(DOCKER_HUB_USERNAME)
DOCKER_PASS_DOCKERHUB := $(DOCKER_HUB_API_KEY)

Expand Down Expand Up @@ -85,8 +85,8 @@ docker-publish-images: docker-login

docker-publish-image:
ifeq ($(DOCKER_REGISTRY), $(DOCKER_REGISTRY_DOCKERHUB))
docker tag $(DOCKER_DOMAIN_LOCAL)/$(IMAGE_NAME) $(DOCKER_REGISTRY)/r/$(DOCKERHUB_DOMAIN)/$(IMAGE_NAME):$(IMAGE_TAG)
docker push $(DOCKER_REGISTRY)/r/$(DOCKERHUB_DOMAIN)/$(IMAGE_NAME):$(IMAGE_TAG)
docker tag $(DOCKER_DOMAIN_LOCAL)/$(IMAGE_NAME) $(DOCKER_REGISTRY)/$(DOCKERHUB_DOMAIN)/$(IMAGE_NAME):$(IMAGE_TAG)
docker push $(DOCKER_REGISTRY)/$(DOCKERHUB_DOMAIN)/$(IMAGE_NAME):$(IMAGE_TAG)
else
docker tag $(DOCKER_DOMAIN_LOCAL)/$(IMAGE_NAME) $(DOCKER_REGISTRY)/$(DOCKER_DOMAIN)/$(IMAGE_NAME):$(IMAGE_TAG)
docker push $(DOCKER_REGISTRY)/$(DOCKER_DOMAIN)/$(IMAGE_NAME):$(IMAGE_TAG)
Expand Down

0 comments on commit 2de4cd2

Please sign in to comment.