Merge pull request #18 from ExpressenAB/feature/dockerbuild

missing version args
ExpressenAB · Aug 21, 2020 · 2f28c4d · 2f28c4d
2 parents 7961e53 + fedadb6
commit 2f28c4d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
@@ -76,7 +76,7 @@ jobs:
                 asset_name: cloudmonitor_exporter_${{ steps.vars.outputs.tag }}_windows_amd64.tar.gz
                 asset_content_type: application/gzip
           - name: Build Image
-            run: make docker
+            run: VERSION=${{ steps.vars.outputs.tag }} make docker
           - name: Login to docker hub
             run: docker login --username ${{ secrets.DOCKERHUB_USERNAME }} --password ${{ secrets.DOCKERHUB_PASSWORD }}
           - name: Push to docker hub

diff --git 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 --build-arg version=${VERSION} . -t cloudmonitor_exporter:${VERSION}
+	docker build --build-arg version=${VERSION} . -t bonniernews/cloudmonitor_exporter:${VERSION}