fix-push-image-to-registry

Author: eranra

.github/workflows/pull_request.yml

@@ -15,17 +15,15 @@ jobs:
         go: ['1.17']
 
     steps:
-    - name: Install make
+    - name: install make
       run: sudo apt-get install make
-    - name: Set up Go 1.x
+    - name: set up go 1.x
       uses: actions/setup-go@v2
       with:
         go-version: ${{ matrix.go }}
-      id: go
-    - uses: actions/checkout@v2
-
-    - name: Run build
+    - name: checkout
+      uses: actions/checkout@v2
+    - name: run build
       run: make build
-      
-    - name: Run test
+    - name: run test
       run: make test

.github/workflows/push_image.yml

@@ -1,10 +1,13 @@
-name: push image to Quay.io
+name: Push image to quay.io
 on:
   push:
+    branches: [ main ]
 
 env:
   REGISTRY_USER: netobserv+github_ci
   REGISTRY_PASSWORD: ${{ secrets.QUAY_SECRET }}
+  IMAGE: quay.io/netobserv/flowlogs2metrics
+  TAG: latest
 
 jobs:
   push-image:
@@ -14,19 +17,28 @@ jobs:
       matrix:
         go: ['1.17']
     steps:
-      - name: podman login to Quay.io
+      - name: install make
+        run: sudo apt-get install make
+      - name: set up go 1.x
+        uses: actions/setup-go@v2
+        with:
+          go-version: ${{ matrix.go }}
+      - name: checkout
+        uses: actions/checkout@v2
+      - name: build image
+        run: make build-image
+      - name: podman login to quay.io
         uses: redhat-actions/podman-login@v1
         with:
           username: ${{ env.REGISTRY_USER }}
           password: ${{ env.REGISTRY_PASSWORD }}
           registry: quay.io
-      - name: Install make
-        run: sudo apt-get install make
-      - name: Set up Go 1.x
-        uses: actions/setup-go@v2
+      - name: push to quay.io
+        id: push-to-quay
+        uses: redhat-actions/push-to-registry@v2
         with:
-          go-version: ${{ matrix.go }}
-        id: go
-      - uses: actions/checkout@v2
-      - name: push image
-        run: make push-image
+          image: ${{ env.IMAGE }}
+          tags: ${{ env.TAG }}
+          registry: quay.io/quay-user
+      - name: print image url
+        run: echo "Image pushed to ${{ steps.push-to-quay.outputs.registry-paths }}"

Makefile

@@ -97,11 +97,14 @@ run: build ## Run
 
 ##@ Docker
 
-# note: to push custom image tag use: DOCKER_TAG=test make push-image
+# note: to build and push custom image tag use: DOCKER_TAG=test make push-image
+.PHONY: build-image
+build-image:
+	DOCKER_BUILDKIT=1 $(OCI_RUNTIME) build -t $(DOCKER_IMG):$(DOCKER_TAG) -f contrib/docker/Dockerfile .
+
 .PHONY: push-image
-push-image: ## Push latest image
+push-image: build-image ## Push latest image
 	@echo 'publish image $(DOCKER_TAG) to $(DOCKER_IMG)'
-	DOCKER_BUILDKIT=1 $(OCI_RUNTIME) build -t $(DOCKER_IMG):$(DOCKER_TAG) -f contrib/docker/Dockerfile .
 	DOCKER_BUILDKIT=1 $(OCI_RUNTIME) push $(DOCKER_IMG):$(DOCKER_TAG)
 
 ##@ kubernetes