call make target

platform9 · Sep 18, 2024 · 1dbb8f1 · 1dbb8f1
1 parent ea1837b
commit 1dbb8f1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 16 deletions.
diff --git a/.github/workflows/hostplumber-multiarch-build-and-push.yml b/.github/workflows/hostplumber-multiarch-build-and-push.yml
@@ -22,17 +22,10 @@ jobs:
         run:
            echo ${{ env.USERNAME }} ${{ env.PASSWORD }}
 
-      - name: Output Run NUMBER
-        run: echo ${{ github.run_number }}
-
       - name: Set env
-        run: 
+        run:
           echo "TAG=$(echo "${{ env.BRANCH }}" | tr -d /)" >> $GITHUB_ENV 
 
-      - name: Set env 
-        if: startsWith(${{ env.TAG }}, 'v*') == true
-            run: echo "TAG=$(echo "${{ env.BRANCH }}")  >> $GITHUB_ENV
-
       - uses: actions/checkout@v3
 
       - name: Setup Docker BuildX
@@ -53,10 +46,6 @@ jobs:
           password: ${{ env.PASSWORD }}
 
       - name: Build/Push image to Docker Container Registry
-        uses: docker/build-push-action@v3
-        with:
-          context: hostplumber
-          tags: quay.io/platform9/hostplumber:${{ env.TAG }}
-          push: ${{ env.PUSH }}
-          build-args: ${{ env.BUILD_ARGS}}
-          platforms: ${{ env.PLATFORMS }}
+        run:
+           TEAMCITY_BUILD_ID=${{ github.run_number }}
+           make -C hostplumber img-build-push
diff --git a/Makefile b/Makefile
@@ -154,7 +154,6 @@ img-build: $(BUILD_DIR) img-test
 	echo ${IMG} > $(BUILD_DIR)/container-tag
 
 img-build-push: img-build
-	docker login
 	docker push ${IMG}
 	echo ${IMG} > $(BUILD_DIR)/container-tag