Fix Makefile container build

pull/532/head
jackgr 9 years ago
parent ff0308f4b7
commit 2ec5a67fad

@ -20,10 +20,10 @@ DOCKER_REGISTRY ?= gcr.io
DOCKER_PROJECT ?= $(PROJECT) DOCKER_PROJECT ?= $(PROJECT)
# Support both local and remote repos, and support no project. # Support both local and remote repos, and support no project.
ifdef $(DOCKER_PROJECT) ifeq ($(DOCKER_PROJECT),)
PREFIX := $(DOCKER_REGISTRY)/$(DOCKER_PROJECT)
else
PREFIX := $(DOCKER_REGISTRY) PREFIX := $(DOCKER_REGISTRY)
else
PREFIX := $(DOCKER_REGISTRY)/$(DOCKER_PROJECT)
endif endif
FULL_IMAGE := $(PREFIX)/$(IMAGE) FULL_IMAGE := $(PREFIX)/$(IMAGE)
@ -52,13 +52,16 @@ info:
push: container push: container
ifeq ($(DOCKER_REGISTRY),gcr.io) ifeq ($(DOCKER_REGISTRY),gcr.io)
gcloud docker push $(FULL_IMAGE):$(TAG) gcloud docker push $(FULL_IMAGE):$(TAG)
gcloud docker push $(FULL_IMAGE):latest
else else
docker push $(FULL_IMAGE):$(TAG) docker push $(FULL_IMAGE):$(TAG)
docker push $(FULL_IMAGE):latest
endif endif
.PHONY: container .PHONY: container
container: .project .docker binary extras container: .project .docker binary extras
docker build -t $(FULL_IMAGE):$(TAG) -f Dockerfile . docker build -t $(FULL_IMAGE):$(TAG) -f Dockerfile .
docker tag -f $(FULL_IMAGE):$(TAG) $(FULL_IMAGE):latest
.project: .project:
ifeq ($(DOCKER_REGISTRY), gcr.io) ifeq ($(DOCKER_REGISTRY), gcr.io)

Loading…
Cancel
Save