Merge pull request #1 from bison/docker-publish

Update Makefile and docker-publish workflow

Author: bison

.github/workflows/docker-publish.yml

@@ -26,13 +26,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Run tests
-        run: |
-          if [ -f docker-compose.test.yml ]; then
-            docker-compose --file docker-compose.test.yml build
-            docker-compose --file docker-compose.test.yml run sut
-          else
-            docker build . --file Dockerfile
-          fi
+        run: make
 
   # Push image to GitHub Packages.
   # See also https://docs.docker.com/docker-hub/builds/
@@ -50,6 +44,9 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
+      - name: Build app
+        run: make build
+
       - name: Build image
         run: docker build . --file Dockerfile --tag $IMAGE_NAME
 

Makefile

@@ -1,7 +1,15 @@
 VERSION:=$(shell cat VERSION)
 
+IMAGE_NAME ?= prometheus-example-app
+
 LDFLAGS="-X main.appVersion=$(VERSION)"
 
-all:
+.PHONY : all build image
+
+all: build image
+
+build:
 	CGO_ENABLED=0 go build -ldflags=$(LDFLAGS) -o prometheus-example-app --installsuffix cgo main.go
-	docker build -t quay.io/brancz/prometheus-example-app:$(VERSION) .
+
+image: build
+	docker build -t ghcr.io/rhobs/$(IMAGE_NAME):$(VERSION) .