From 9a5b25b27ffa14843301179fc3d1a82457bd5153 Mon Sep 17 00:00:00 2001 From: Eric Chiang Date: Tue, 9 Aug 2016 15:26:32 -0700 Subject: [PATCH] *: add dockerfile --- Dockerfile | 11 +++++++++++ Makefile | 17 ++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..c7609e27 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,11 @@ +FROM alpine:latest + +MAINTAINER Eric Chiang + +RUN apk add --update ca-certificates + +COPY bin/poke /poke + +ENTRYPOINT ["/poke"] + +CMD ["version"] diff --git a/Makefile b/Makefile index 00c7defc..0d565dc1 100644 --- a/Makefile +++ b/Makefile @@ -3,11 +3,16 @@ ORG_PATH=github.com/coreos REPO_PATH=$(ORG_PATH)/$(PROJ) export PATH := $(PWD)/bin:$(PATH) +VERSION=$(shell ./scripts/git-version) + +DOCKER_REPO=quay.io/ericchiang/poke +DOCKER_IMAGE=$(DOCKER_REPO):$(VERSION) + export GOBIN=$(PWD)/bin export GO15VENDOREXPERIMENT=1 export CGO_ENABLED:=0 -LD_FLAGS="-w -X $(REPO_PATH)/version.Version=$(shell ./scripts/git-version)" +LD_FLAGS="-w -X $(REPO_PATH)/version.Version=$(VERSION)" GOOS=$(shell go env GOOS) GOARCH=$(shell go env GOARCH) @@ -37,6 +42,16 @@ lint: golint $$package; \ done +.PHONY: docker-build +docker-build: bin/poke + @docker build -t $(DOCKER_IMAGE) . + +.PHONY: docker-push +docker-push: docker-build + @docker tag $(DOCKER_IMAGE) $(DOCKER_REPO):latest + @docker push $(DOCKER_IMAGE) + @docker push $(DOCKER_REPO):latest + clean: @rm bin/*