From 1d5ce423f29bd2599ba6880e8f60a5f1fe4b4598 Mon Sep 17 00:00:00 2001
From: Raj Babu Das <mail.rajdas@gmail.com>
Date: Sat, 26 Jun 2021 18:10:23 +0530
Subject: [PATCH] Fixing github workflow push pipeline (#190)

* adding download env step in  github workflow

Signed-off-by: rajdas98 <mail.rajdas@gmail.com>

* adding download env step in  github workflow

Signed-off-by: rajdas98 <mail.rajdas@gmail.com>
---
 .github/workflows/push.yaml | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml
index 2adc8bbfd9..8b5cd4a78e 100644
--- a/.github/workflows/push.yaml
+++ b/.github/workflows/push.yaml
@@ -37,7 +37,7 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: env_artifact
-          path: signoz/env-vars
+          path: env-vars
 
   build-and-push-frontend:
     runs-on: ubuntu-latest
@@ -47,17 +47,17 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
 
-      - name: Downloading image artficate
+      - name: Downloading image artifact
         uses: actions/download-artifact@v2
         with:
           name: env_artifact
-          path: signoz
 
       - name: Build frontend docker image
         shell: bash
         run: |
+          source env-vars
           cd frontend
-          docker build . -f Dockerfile
+          docker build . -f Dockerfile -t  ${{ secrets.REPONAME }}/${FRONTEND_IMAGE}:${IMG_TAG}
 
       - name: Login to DockerHub
         uses: docker/login-action@v1
@@ -84,17 +84,17 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
       
-      - name: Downloading image artficate
+      - name: Downloading image artifact
         uses: actions/download-artifact@v2
         with:
           name: env_artifact
-          path: signoz
 
       - name: Build query-service image
         shell: bash
         run: |
+          source env-vars
           cd pkg/query-service
-          docker build . -f Dockerfile
+          docker build . -f Dockerfile -t ${{ secrets.REPONAME }}/${QUERY_SERVICE}:${IMG_TAG}
 
       - name: Login to DockerHub
         uses: docker/login-action@v1
@@ -121,23 +121,17 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
 
-      - name: Downloading image artficate
+      - name: Downloading image artifact
         uses: actions/download-artifact@v2
         with:
           name: env_artifact
-          path: signoz
 
       - name: Build flattener docker image
         shell: bash
         run: |
+          source env-vars
           cd pkg/processors/flattener
-          docker build . -f Dockerfile
-
-      - name: Build flattener processor docker image
-        shell: bash
-        run: |
-          cd pkg/query-service
-          docker build . -f Dockerfile
+          docker build . -f Dockerfile -t ${{ secrets.REPONAME }}/${FLATTENER_PROCESSOR}:${IMG_TAG}
 
       - name: Login to DockerHub
         uses: docker/login-action@v1