From 563bd4f16c39b92081b9773ea8b2d1ad3b61aedb Mon Sep 17 00:00:00 2001 From: Jeffrey Paul Date: Thu, 24 Oct 2019 08:33:57 -0700 Subject: [PATCH] update makefile with better dockerhub support --- Makefile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 33bb1f7..b20091f 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ VERSION := $(shell git rev-parse --short HEAD) BUILDTIME := $(shell date -u '+%Y-%m-%dT%H:%M:%SZ') BUILDTIMEFILENAME := $(shell date -u '+%Y%m%d-%H%M%SZ') +BUILDTIMETAG := $(shell date -u '+%Y%m%d%H%M%S') BUILDUSER := $(shell whoami) BUILDHOST := $(shell hostname -s) BUILDARCH := $(shell uname -m) @@ -33,9 +34,16 @@ fmt: test: build-docker-image build-docker-image: - docker build -t $(IMAGENAME) . + docker build -t $(IMAGENAME):$(VERSION) -t $(IMAGENAME):latest -t $(IMAGENAME):$(BUILDTIMETAG) . dist: build-docker-image -mkdir -p ./output docker run --rm --entrypoint cat $(IMAGENAME) /bin/$(FN) > output/$(FN) docker save $(IMAGENAME) | bzip2 > output/$(BUILDTIMEFILENAME).$(FN).tbz2 + +hub: upload-docker-image + +upload-docker-image: build-docker-image + docker push $(IMAGENAME):$(VERSION) + docker push $(IMAGENAME):$(BUILDTIMETAG) + docker push $(IMAGENAME):latest