From 6ae83e0a0b8c503779368348de957637396b4cd3 Mon Sep 17 00:00:00 2001
From: Aaron Hurt <ahurt@anbcs.com>
Date: Wed, 9 Nov 2016 23:34:15 -0600
Subject: [PATCH] updates for automated docker hub builds

---
 .dockerignore  |  1 +
 Dockerfile     | 15 +++++++++++++++
 Makefile       | 11 +++++------
 build/build.sh |  4 ++--
 build/docker   |  8 --------
 5 files changed, 23 insertions(+), 16 deletions(-)
 create mode 120000 .dockerignore
 create mode 100644 Dockerfile
 delete mode 100644 build/docker

diff --git a/.dockerignore b/.dockerignore
new file mode 120000
index 0000000..3e4e48b
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1 @@
+.gitignore
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..4fdfbbd
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,15 @@
+FROM alpine:latest
+ENV GOPATH /opt/go
+ENV SRCPATH $GOPATH/src/github.com/myENA/consul-backinator
+COPY . $SRCPATH
+RUN \
+	apk add --no-cache --no-progress ca-certificates go git bash && \
+	mkdir -p $GOPATH/bin && \
+	export PATH=$GOPATH/bin:$PATH && \
+	cd $SRCPATH && \
+	chmod +x build/build.sh && \
+	build/build.sh -i && \
+	mv consul-backinator /usr/local/bin/consul-backinator && \
+	apk del --no-cache --no-progress --purge go git bash && \
+	rm -rf $GOPATH /tmp/* /root/.glide
+ENTRYPOINT ["/usr/local/bin/consul-backinator"]
diff --git a/Makefile b/Makefile
index db952a0..0d5f1b1 100644
--- a/Makefile
+++ b/Makefile
@@ -21,10 +21,9 @@ check:
 clean:
 	@build/build.sh -d
 
-docker: release
-	$(sudo) docker build -t $(IMAGE_PATH):$(RELEASE_VERSION) -f build/docker . && \
-	$(sudo) docker tag $(IMAGE_PATH):$(RELEASE_VERSION) $(IMAGE_PATH):latest
+docker:
+	$(sudo) docker build -t $(IMAGE_PATH):latest .
 
-docker_release: docker
-	$(sudo) docker push $(IMAGE_PATH):$(RELEASE_VERSION) && \
-	$(sudo) docker push $(IMAGE_PATH):latest
+docker_release:
+	$(sudo) docker build -t $(IMAGE_PATH):latest .
+	$(sudo) docker tag $(IMAGE_PATH):latest $(IMAGE_PATH):$(RELEASE_VERSION)
diff --git a/build/build.sh b/build/build.sh
index bcbb055..50c009f 100755
--- a/build/build.sh
+++ b/build/build.sh
@@ -89,8 +89,8 @@ else
 	printf "Building ... "
 
 	## build it
-	go build -o "${BUILD_NAME}" \
-	-ldflags="-X main.appVersion=${RELEASE_VERSION}"
+	CGO_ENABLED=0 go build -o "${BUILD_NAME}" \
+	-ldflags="-X main.appVersion=${RELEASE_VERSION} -s -w"
 
 	## go build return
 	RETVAL=$?
diff --git a/build/docker b/build/docker
deleted file mode 100644
index 721e58a..0000000
--- a/build/docker
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM alpine:latest
-RUN apk add --no-cache --no-progress ca-certificates
-ENV BIN /usr/local/bin/consul-backinator
-COPY dist/consul-backinator-*-amd64-linux.tar.gz /consul-backinator.tar.gz
-RUN tar xzf consul-backinator.tar.gz && \
-        mv consul-backinator*/consul-backinator* $BIN && \
-        rm -rf consul-backinator*
-ENTRYPOINT $BIN