From 9ee3a13e38dc7eda96a8bb83ad1dbd9472397267 Mon Sep 17 00:00:00 2001
From: "Rikard Gynnerstedt (BN)" <Rikard Gynnerstedt>
Date: Fri, 21 Aug 2020 15:54:16 +0200
Subject: [PATCH 1/2] added docker build

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

diff --git a/Dockerfile b/Dockerfile
index c280c6e..4373262 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,2 +1,7 @@
-FROM golang:onbuild
-EXPOSE 9143
+FROM alpine:latest
+
+ARG version=0.0.0
+
+COPY build/cloudmonitor_exporter_${version}_linux_amd64/cloudmonitor_exporter .
+
+EXPOSE 9143
\ No newline at end of file
diff --git a/Makefile b/Makefile
index bd60709..902b66f 100644
--- a/Makefile
+++ b/Makefile
@@ -43,3 +43,5 @@ rpm: package
 	@mkdir -p build/rpm
 	docker run --rm -i -v $(shell pwd):/docker centos:7 /docker/package/rpm/build_rpm.sh ${VERSION}
 
+docker: xbuild
+	docker build . -t cloudmonitor_exporter:${VERSION}
\ No newline at end of file

From 46e59018aeb320939d5b333e4ac24236dd88d2b7 Mon Sep 17 00:00:00 2001
From: "Rikard Gynnerstedt (BN)" <Rikard Gynnerstedt>
Date: Fri, 21 Aug 2020 16:01:28 +0200
Subject: [PATCH 2/2] added docker login/push to workflow

---
 .github/workflows/build-release.yml | 6 ++++++
 Makefile                            | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
index 0587f96..aa22fa6 100644
--- a/.github/workflows/build-release.yml
+++ b/.github/workflows/build-release.yml
@@ -75,3 +75,9 @@ jobs:
                 asset_path: build/tgz/cloudmonitor_exporter_${{ steps.vars.outputs.tag }}_windows_amd64.tar.gz
                 asset_name: cloudmonitor_exporter_${{ steps.vars.outputs.tag }}_windows_amd64.tar.gz
                 asset_content_type: application/gzip
+          - name: Build Image
+            run: make docker
+          - name: Login to docker hub
+            run: docker login --username ${{ secrets.DOCKERHUB_USERNAME }} --password ${{ secrets.DOCKERHUB_PASSWORD }}
+          - name: Push to docker hub
+            run: docker push bonniernews/cloudmonitor_exporter:${{ steps.vars.outputs.tag }}
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 902b66f..15a3067 100644
--- a/Makefile
+++ b/Makefile
@@ -44,4 +44,4 @@ rpm: package
 	docker run --rm -i -v $(shell pwd):/docker centos:7 /docker/package/rpm/build_rpm.sh ${VERSION}
 
 docker: xbuild
-	docker build . -t cloudmonitor_exporter:${VERSION}
\ No newline at end of file
+	docker build --build-arg version=${VERSION} . -t cloudmonitor_exporter:${VERSION}
\ No newline at end of file