From f2c05b64b45d2323765797a875fad3cdaed7dbdc Mon Sep 17 00:00:00 2001
From: Uche Madu <dreemer6@yahoo.com>
Date: Sat, 30 Sep 2023 11:17:56 +0100
Subject: [PATCH] fix workflow git push

---
 .github/workflows/retag.yaml | 8 ++------
 Dockerfile                   | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/retag.yaml b/.github/workflows/retag.yaml
index ce794d3..b6dd347 100644
--- a/.github/workflows/retag.yaml
+++ b/.github/workflows/retag.yaml
@@ -15,6 +15,8 @@ env:
     GAR_LOCATION: us-central1
     REPOSITORY: deb-capstone-airflow-gke
     IMAGE: airflow2.7.1-custom
+    VALUES_FILE: argocd-app/helm-charts/airflow/values-dev.yaml
+    SHORT_SHA: ${{ substr(github.sha, 0, 8) }}
 
 jobs:
   retag_and_push:
@@ -23,9 +25,6 @@ jobs:
     permissions:
         contents: 'read'
         id-token: 'write'
-
-    env:
-        VALUES_FILE: argocd-app/helm-charts/airflow/values-dev.yaml
     
     steps:
       - name: Checkout Code
@@ -61,9 +60,6 @@ jobs:
       
       - name: Retag Docker Image
         run: |
-            echo "SHORT_SHA=${GITHUB_SHA::8}" >> $GITHUB_ENV
-            echo "GITHUB_SHA=$GITHUB_SHA"
-            echo "SHORT_SHA=${GITHUB_SHA::8}"
             docker pull "$GAR_LOCATION-docker.pkg.dev/$PROJECT_ID/$REPOSITORY/$IMAGE:$FEATURE_BRANCH_NAME"
             docker tag "$GAR_LOCATION-docker.pkg.dev/$PROJECT_ID/$REPOSITORY/$IMAGE:$FEATURE_BRANCH_NAME" "$GAR_LOCATION-docker.pkg.dev/$PROJECT_ID/$REPOSITORY/$IMAGE:$SHORT_SHA"
             docker push "$GAR_LOCATION-docker.pkg.dev/$PROJECT_ID/$REPOSITORY/$IMAGE:$SHORT_SHA"
diff --git a/Dockerfile b/Dockerfile
index 5eeb9f5..d631b24 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@
 ARG AIRFLOW_VERSION=2.7.1
 
 # Using the official Apache Airflow image
-FROM apache/airflow:${AIRFLOW_VERSION}
+FROM apache/airflow:${AIRFLOW_VERSION}  
 
 WORKDIR /usr/local/airflow