From 2a835fc0c08a150620bad370ad9d7ab6062c5ae4 Mon Sep 17 00:00:00 2001
From: Reda NOUSHI <reda_noushi@yahoo.com>
Date: Wed, 20 Jul 2016 01:00:33 +0100
Subject: [PATCH] Use tini as a minimal init for the docker image

---
 Dockerfile | 9 +++++++++
 Makefile   | 4 +---
 2 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 Dockerfile

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 000000000..d5a0e4756
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,9 @@
+FROM alpine:3.4
+
+RUN apk add --update tini
+
+ADD postgres_exporter /
+
+EXPOSE 9113
+
+ENTRYPOINT ["/sbin/tini", "--", "/postgres_exporter"]
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 860109a85..2d9466401 100644
--- a/Makefile
+++ b/Makefile
@@ -11,9 +11,7 @@ postgres_exporter: $(GO_SRC)
 
 # Take a go build and turn it into a minimal container
 docker: postgres_exporter
-	tar -cf - postgres_exporter | docker import --change "EXPOSE 9113" \
-			--change 'ENTRYPOINT [ "/postgres_exporter" ]' \
-			- $(CONTAINER_NAME)
+	docker build -t $(CONTAINER_NAME) .
 
 vet:
 	go vet .