Skip to content
This repository has been archived by the owner on Mar 15, 2022. It is now read-only.

Commit

Permalink
Actually fixes the builds for automation
Browse files Browse the repository at this point in the history
Signed-off-by: Timothy St. Clair <[email protected]>
  • Loading branch information
timothysc committed Jan 11, 2018
1 parent 7065941 commit deba014
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,17 @@ BUILD_IMAGE ?= gcr.io/heptio-images/golang:1.9-alpine3.6
DOCKER ?= docker
DIR := ${CURDIR}

all: local container

local:
$(DOCKER) run --rm -v $(DIR):$(BUILDMNT) -w $(BUILDMNT) $(BUILD_IMAGE) go build
all: container

container:
$(DOCKER) run --rm -v $(DIR):$(BUILDMNT) -w $(BUILDMNT) $(BUILD_IMAGE) go build
$(DOCKER) build -t $(REGISTRY)/$(TARGET):latest -t $(REGISTRY)/$(TARGET):$(VERSION) .

# TODO: Determine tagging mechanics
push:
$(DOCKER) push $(REGISTRY)/$(TARGET):latest
if git describe --tags --exact-match >/dev/null 2>&1; \
then \
$(DOCKER) push $(REGISTRY)/$(TARGET):$(VERSION)
$(DOCKER) push $(REGISTRY)/$(TARGET):$(VERSION) \
fi

test:
Expand Down

0 comments on commit deba014

Please sign in to comment.