From 8fd667e97a1a0b972a889d4292bf9992ca88ca35 Mon Sep 17 00:00:00 2001 From: Rohith Date: Fri, 18 Sep 2015 18:06:53 +0100 Subject: [PATCH] - adding the docker build stage in makefile --- Dockerfile | 2 ++ Makefile | 9 ++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index aeeb078..4f9a402 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,6 @@ FROM gliderlabs/alpine:latest MAINTAINER Rohith +ADD build/vault-sidekick /vault-sidekick + ENTRYPOINT [ "/vault-sidekick" ] diff --git a/Makefile b/Makefile index a091fdc..199a7c9 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ AUTHOR=gambol99 HARDWARE=$(shell uname -m) VERSION=$(shell awk '/const Version/ { print $$4 }' version.go | sed 's/"//g') -.PHONY: test examples authors changelog build +.PHONY: test examples authors changelog build docker default: build @@ -12,9 +12,12 @@ build: mkdir -p build go build -o build/${NAME} +docker: build + sudo docker build -t ${AUTHOR}/${NAME} . + clean: rm -rf ./build 2>/dev/null - + authors: git log --format='%aN <%aE>' | sort -u > AUTHORS @@ -24,4 +27,4 @@ test: go test -v changelog: release - git log $(shell git tag | tail -n1)..HEAD --no-merges --format=%B > changelog \ No newline at end of file + git log $(shell git tag | tail -n1)..HEAD --no-merges --format=%B > changelog