From 87fba0e22fd8a89fb2d1eed7332fde540e95228c Mon Sep 17 00:00:00 2001 From: Eric Ho Date: Tue, 10 Nov 2015 12:58:08 +0800 Subject: [PATCH] Build and push image to other registry Command: `make push DOCKER_REGISTRY=index.docker.io PROJECT=(your account)` --- expandybird/Makefile | 11 ++++++++--- manager/Makefile | 13 +++++++++---- resourcifier/Makefile | 9 +++++++-- 3 files changed, 24 insertions(+), 9 deletions(-) diff --git a/expandybird/Makefile b/expandybird/Makefile index 6667a064a..eb6ecc41a 100644 --- a/expandybird/Makefile +++ b/expandybird/Makefile @@ -1,17 +1,22 @@ -# Makefile for the Docker image gcr.io/$(PROJECT)/expandybird +# Makefile for the Docker image $(DOCKER_REGISTRY)/$(PROJECT)/expandybird # MAINTAINER: Jack Greenfield # If you update this image please check the tag value before pushing. .PHONY : all build test push container clean -PREFIX := gcr.io/$(PROJECT) +DOCKER_REGISTRY := gcr.io +PREFIX := $(DOCKER_REGISTRY)/$(PROJECT) IMAGE := expandybird TAG := latest DIR := . push: container +ifeq ($(DOCKER_REGISTRY),gcr.io) gcloud docker push $(PREFIX)/$(IMAGE):$(TAG) +else + docker push $(PREFIX)/$(IMAGE):$(TAG) +endif container: expandybird cp $(shell which expandybird) . @@ -25,4 +30,4 @@ expandybird: clean: -docker rmi $(PREFIX)/$(IMAGE):$(TAG) rm -f expandybird - + diff --git a/manager/Makefile b/manager/Makefile index 7c100ce60..afbaeaf88 100644 --- a/manager/Makefile +++ b/manager/Makefile @@ -1,10 +1,11 @@ -# Makefile for the Docker image gcr.io/$(PROJECT)/manager +# Makefile for the Docker image $(DOCKER_REGISTRY)/$(PROJECT)/manager # MAINTAINER: Jack Greenfield # If you update this image please check the tag value before pushing. .PHONY : all build test push container clean .project -PREFIX := gcr.io/$(PROJECT) +DOCKER_REGISTRY := gcr.io +PREFIX := $(DOCKER_REGISTRY)/$(PROJECT) IMAGE := manager TAG := latest @@ -12,11 +13,15 @@ ROOT_DIR := $(abspath ./..) DIR = $(ROOT_DIR) push: container +ifeq ($(DOCKER_REGISTRY),gcr.io) gcloud docker push $(PREFIX)/$(IMAGE):$(TAG) +else + docker push $(PREFIX)/$(IMAGE):$(TAG) +endif -container: +container: docker build -t $(PREFIX)/$(IMAGE):$(TAG) -f Dockerfile $(DIR) clean: -docker rmi $(PREFIX)/$(IMAGE):$(TAG) - \ No newline at end of file + diff --git a/resourcifier/Makefile b/resourcifier/Makefile index 3ae2743e1..54956e717 100644 --- a/resourcifier/Makefile +++ b/resourcifier/Makefile @@ -1,10 +1,11 @@ -# Makefile for the Docker image gcr.io/$(PROJECT)/resourcifier +# Makefile for the Docker image $(DOCKER_REGISTRY)/$(PROJECT)/resourcifier # MAINTAINER: Jack Greenfield # If you update this image please check the tag value before pushing. .PHONY : all build test push container clean -PREFIX := gcr.io/$(PROJECT) +DOCKER_REGISTRY := gcr.io +PREFIX := $(DOCKER_REGISTRY)/$(PROJECT) IMAGE := resourcifier TAG := latest @@ -12,7 +13,11 @@ ROOT_DIR := $(abspath ./..) DIR = $(ROOT_DIR) push: container +ifeq ($(DOCKER_REGISTRY),gcr.io) gcloud docker push $(PREFIX)/$(IMAGE):$(TAG) +else + docker push $(PREFIX)/$(IMAGE):$(TAG) +endif container: docker build -t $(PREFIX)/$(IMAGE):$(TAG) -f Dockerfile $(DIR)