From 6af135d3b18cbb92bc0f72ef37dacd8fff495297 Mon Sep 17 00:00:00 2001
From: Travis Jeffery <tj@travisjeffery.com>
Date: Thu, 12 Oct 2017 00:37:11 -0500
Subject: [PATCH] docker: update for dep and use makefile

---
 Dockerfile | 16 +++-------------
 Makefile   |  8 ++++++++
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index dc1bed0d..9478d6bf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,23 +1,13 @@
 FROM golang:1.9-alpine  
-
 RUN apk update && apk upgrade && \
-    apk add --no-cache bash git openssh make
-
-RUN go get -u github.com/kardianos/govendor 
+    apk add --no-cache bash git openssh make && \
+    go get -u github.com/golang/dep/cmd/dep
 ADD . /go/src/github.com/travisjeffery/jocko
 WORKDIR /go/src/github.com/travisjeffery/jocko
-RUN govendor sync
-RUN govendor test -v -p=1 +local
-RUN go build -o jocko cmd/jocko/main.go
-RUN go build -o createtopic cmd/createtopic/main.go
+RUN GOOS=linux GOARCH=amd64 make deps build
 
 FROM alpine:latest
-
 COPY --from=0 /go/src/github.com/travisjeffery/jocko/jocko /usr/local/bin/jocko
-COPY --from=0 /go/src/github.com/travisjeffery/jocko/createtopic /usr/local/bin/createtopic
-
 EXPOSE 9092 9093 9094
-
 VOLUME "/tmp/jocko"
-
 CMD ["jocko"]
diff --git a/Makefile b/Makefile
index fe3da757..cbedade3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,5 @@
+BUILD_PATH := jocko
+DOCKER_TAG := latest
 
 all: deps test
 .PHONY: all
@@ -7,6 +9,12 @@ deps:
 	@which dep 2>/dev/null || go get -u github.com/golang/dep/cmd/dep
 	dep ensure
 
+build:
+	go build -o $(BUILD_PATH) cmd/jocko/main.go
+
+build-docker:
+	docker build -t travisjeffery/jocko:$(DOCKER_TAG) .
+
 .PHONY: test
 test:
 	go test -v ./...