From d0e9a2966a799bee58c532dbd96d5167eaa80390 Mon Sep 17 00:00:00 2001
From: Stefan Martinov <stefan.martinov@gmail.com>
Date: Wed, 8 May 2019 18:04:58 +0200
Subject: [PATCH] chore: add correct expose file and better makefile

---
 Dockerfile |  6 +++---
 Makefile   | 13 ++++++++++---
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 755a58d..5d7aa1f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -29,9 +29,9 @@ COPY --from=build-env /contentserver /usr/sbin/contentserver
 
 VOLUME $CONTENT_SERVER_VAR_DIR
 
-EXPOSE 80
-EXPOSE 9200 ## Prometheus Listener
-
 ENTRYPOINT ["/usr/sbin/contentserver"]
 
 CMD ["-address=$CONTENT_SERVER_ADDR", "-log-level=$CONTENT_SERVER_LOG_LEVEL", "-var-dir=$CONTENT_SERVER_VAR_DIR"]
+
+EXPOSE 80
+EXPOSE 9200
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 416f315..063c6f8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 SHELL := /bin/bash
 
-TAG=`git describe --exact-match --tags $(git log -n1 --pretty='%h') 2>/dev/null || git rev-parse --abbrev-ref HEAD`
+TAG?=latest
+IMAGE=docker-registry.bestbytes.net/contentserver
 
 all: build test
 tag:
@@ -15,11 +16,17 @@ build-arch: clean
 build-docker: clean build-arch
 	curl https://curl.haxx.se/ca/cacert.pem > .cacert.pem
 	docker build -q . > .image_id
-	docker tag `cat .image_id` docker-registry.bestbytes.net/contentserver:$(TAG)
-	echo "# tagged container `cat .image_id` as docker-registry.bestbytes.net/contentserver:$(TAG)"
+	docker tag `cat .image_id` $(IMAGE):$(TAG)
+	echo "# tagged container `cat .image_id` as $(IMAGE):$(TAG)"
 	rm -vf .image_id .cacert.pem
 
 package: build
 	pkg/build.sh
 test:
 	go test ./...
+
+docker-build:
+	docker build -t $(IMAGE):$(TAG) .
+
+docker-push:
+	docker push $(IMAGE):$(TAG)
\ No newline at end of file