use makefile to generate image

PeterGrace · Dec 5, 2020 · 9aa7f88 · 9aa7f88
1 parent a4ddfd6
commit 9aa7f88
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -13,6 +13,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Build the Docker image
-      run: docker build . --file Dockerfile --tag petergrace/opentsdb-docker:latest
+      - uses: actions/checkout@v2
+      - name: Login to dockerhub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.HUB_DOCKER_USERNAME }}
+          password: ${{ secrets.HUB_DOCKER_PAT }}
+      - name: run makefile
+        run: make gh-build
+        shell: bash
diff --git a/Makefile b/Makefile
@@ -0,0 +1,11 @@
+all: build
+
+build:
+	docker build -t petergrace/opentsdb-docker .
+
+gh-build: HASH=$(shell git rev-parse --short HEAD)
+gh-build:
+	docker build -t petergrace/opentsdb-docker:$(HASH) .
+	docker tag petergrace/opentsdb-docker:$(HASH) petergrace/opentsdb-docker:latest
+	docker push petergrace/opentsdb-docker:$(HASH)
+	docker push petergrace/opentsdb-docker:latest