fix(Makefile): make DEV_REGISTRY silent if registry.hub.docker.com

Matthew · Matthew · commit ede9bf8e8c78 · 2015-07-06T11:46:32.000-07:00
docker push registry.hub.docker.com/deisci/builder has been failing recently.
However, removing the FQDN works.
diff --git a/builder/Makefile b/builder/Makefile
@@ -9,7 +9,7 @@ GO_PACKAGES_REPO_PATH = $(addprefix $(repo_path)/,$(GO_PACKAGES))
 
 COMPONENT = $(notdir $(repo_path))
 IMAGE = $(IMAGE_PREFIX)$(COMPONENT):$(BUILD_TAG)
-DEV_IMAGE = $(DEV_REGISTRY)/$(IMAGE)
+DEV_IMAGE = $(REGISTRY)$(IMAGE)
 BINARIES := extract-domain extract-types extract-version generate-buildhook get-app-config get-app-values publish-release-controller yaml2json-procfile
 BINARY_DEST_DIR := rootfs/usr/bin
 
diff --git a/cache/Makefile b/cache/Makefile
@@ -8,7 +8,7 @@ GO_PACKAGES_REPO_PATH = $(addprefix $(repo_path)/,$(GO_PACKAGES))
 
 COMPONENT = $(notdir $(repo_path))
 IMAGE = $(IMAGE_PREFIX)$(COMPONENT):$(BUILD_TAG)
-DEV_IMAGE = $(DEV_REGISTRY)/$(IMAGE)
+DEV_IMAGE = $(REGISTRY)$(IMAGE)
 BINARY_DEST_DIR = image/bin
 
 build: check-docker
diff --git a/controller/Makefile b/controller/Makefile
@@ -6,7 +6,7 @@ all: build run
 
 COMPONENT = controller
 IMAGE = $(IMAGE_PREFIX)$(COMPONENT):$(BUILD_TAG)
-DEV_IMAGE = $(DEV_REGISTRY)/$(IMAGE)
+DEV_IMAGE = $(REGISTRY)$(IMAGE)
 
 build: check-docker
 	docker build -t $(IMAGE) .
diff --git a/database/Makefile b/database/Makefile
@@ -2,7 +2,7 @@ include ../includes.mk
 
 COMPONENT = database
 IMAGE = $(IMAGE_PREFIX)$(COMPONENT):$(BUILD_TAG)
-DEV_IMAGE = $(DEV_REGISTRY)/$(IMAGE)
+DEV_IMAGE = $(REGISTRY)$(IMAGE)
 
 build: check-docker
 	docker build -t $(IMAGE) .
diff --git a/includes.mk b/includes.mk
@@ -8,7 +8,7 @@ GOVET = $(GO) vet
 
 SELF_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
 DOCKER_HOST = $(shell echo $$DOCKER_HOST)
-REGISTRY = $(shell echo $$DEV_REGISTRY)
+REGISTRY = $(shell if [ "$$DEV_REGISTRY" == "registry.hub.docker.com" ]; then echo; else echo $$DEV_REGISTRY/; fi)
 GIT_SHA = $(shell git rev-parse --short HEAD)
 
 ifndef IMAGE_PREFIX
diff --git a/logger/Makefile b/logger/Makefile
@@ -10,7 +10,7 @@ GO_TESTABLE_PACKAGES_REPO_PATH = $(addprefix $(repo_path)/,syslog syslogd)
 
 COMPONENT = $(notdir $(repo_path))
 IMAGE = $(IMAGE_PREFIX)$(COMPONENT):$(BUILD_TAG)
-DEV_IMAGE = $(DEV_REGISTRY)/$(IMAGE)
+DEV_IMAGE = $(REGISTRY)$(IMAGE)
 BINARY_DEST_DIR = image/bin
 
 build: check-docker
diff --git a/logspout/Makefile b/logspout/Makefile
@@ -10,7 +10,7 @@ GO_PACKAGES_REPO_PATH = $(addprefix $(repo_path)/,$(GO_PACKAGES))
 COMPONENT = $(notdir $(repo_path))
 DOCKER_IMAGE := $(IMAGE_PREFIX)$(COMPONENT)
 RELEASE_IMAGE := $(DOCKER_IMAGE):$(BUILD_TAG)
-DEV_DOCKER_IMAGE := $(DEV_REGISTRY)/$(RELEASE_IMAGE)
+DEV_DOCKER_IMAGE := $(REGISTRY)$(RELEASE_IMAGE)
 
 build: check-docker
 	GOOS=linux GOARCH=amd64 CGO_ENABLED=0 godep go build -a -installsuffix cgo -ldflags '-s' -o image/logspout
diff --git a/publisher/Makefile b/publisher/Makefile
@@ -10,7 +10,7 @@ GO_PACKAGES_REPO_PATH = $(addprefix $(repo_path)/,$(GO_PACKAGES))
 COMPONENT = $(notdir $(repo_path))
 DOCKER_IMAGE := $(IMAGE_PREFIX)$(COMPONENT)
 RELEASE_IMAGE := $(DOCKER_IMAGE):$(BUILD_TAG)
-REMOTE_IMAGE := $(REGISTRY)/$(RELEASE_IMAGE)
+REMOTE_IMAGE := $(REGISTRY)$(RELEASE_IMAGE)
 BINARY_DEST_DIR = image/bin
 
 build: check-docker
diff --git a/registry/Makefile b/registry/Makefile
@@ -2,7 +2,7 @@ include ../includes.mk
 
 COMPONENT = registry
 IMAGE = $(IMAGE_PREFIX)$(COMPONENT):$(BUILD_TAG)
-DEV_IMAGE = $(DEV_REGISTRY)/$(IMAGE)
+DEV_IMAGE = $(REGISTRY)$(IMAGE)
 
 build: check-docker
 	docker build -t $(IMAGE) .
diff --git a/router/Makefile b/router/Makefile
@@ -9,7 +9,7 @@ GO_PACKAGES_REPO_PATH = $(addprefix $(repo_path)/,$(GO_PACKAGES))
 
 COMPONENT = $(notdir $(repo_path))
 IMAGE = $(IMAGE_PREFIX)$(COMPONENT):$(BUILD_TAG)
-DEV_IMAGE = $(DEV_REGISTRY)/$(IMAGE)
+DEV_IMAGE = $(REGISTRY)$(IMAGE)
 BUILD_IMAGE = $(COMPONENT)-build
 BINARY_DEST_DIR = image/bin
 
diff --git a/store/Makefile b/store/Makefile
@@ -4,15 +4,15 @@ TEMPLATE_IMAGES=admin daemon gateway metadata monitor
 BUILT_IMAGES=base $(TEMPLATE_IMAGES)
 
 ADMIN_IMAGE = $(IMAGE_PREFIX)store-admin:$(BUILD_TAG)
-ADMIN_DEV_IMAGE = $(DEV_REGISTRY)/$(ADMIN_IMAGE)
+ADMIN_DEV_IMAGE = $(REGISTRY)$(ADMIN_IMAGE)
 DAEMON_IMAGE = $(IMAGE_PREFIX)store-daemon:$(BUILD_TAG)
-DAEMON_DEV_IMAGE = $(DEV_REGISTRY)/$(DAEMON_IMAGE)
+DAEMON_DEV_IMAGE = $(REGISTRY)$(DAEMON_IMAGE)
 GATEWAY_IMAGE = $(IMAGE_PREFIX)store-gateway:$(BUILD_TAG)
-GATEWAY_DEV_IMAGE = $(DEV_REGISTRY)/$(GATEWAY_IMAGE)
+GATEWAY_DEV_IMAGE = $(REGISTRY)$(GATEWAY_IMAGE)
 METADATA_IMAGE = $(IMAGE_PREFIX)store-metadata:$(BUILD_TAG)
-METADATA_DEV_IMAGE = $(DEV_REGISTRY)/$(METADATA_IMAGE)
+METADATA_DEV_IMAGE = $(REGISTRY)$(METADATA_IMAGE)
 MONITOR_IMAGE = $(IMAGE_PREFIX)store-monitor:$(BUILD_TAG)
-MONITOR_DEV_IMAGE = $(DEV_REGISTRY)/$(MONITOR_IMAGE)
+MONITOR_DEV_IMAGE = $(REGISTRY)$(MONITOR_IMAGE)
 
 build: check-docker
 	@# Build base as normal
diff --git a/swarm/Makefile b/swarm/Makefile
@@ -9,7 +9,7 @@ GO_PACKAGES_REPO_PATH = $(addprefix $(repo_path)/,$(GO_PACKAGES))
 
 COMPONENT = $(notdir $(repo_path))
 IMAGE = $(IMAGE_PREFIX)$(COMPONENT):$(BUILD_TAG)
-DEV_IMAGE = $(DEV_REGISTRY)/$(IMAGE)
+DEV_IMAGE = $(REGISTRY)$(IMAGE)
 BUILD_IMAGE = $(COMPONENT)-build
 BINARY_DEST_DIR = image/bin
 
