Skip to content

Commit

Permalink
Merge pull request #9 from uche-madu/dev
Browse files Browse the repository at this point in the history
fix workflow git push
  • Loading branch information
uche-madu authored Sep 30, 2023
2 parents 4dd4e36 + f2c05b6 commit 65266f6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
8 changes: 2 additions & 6 deletions .github/workflows/retag.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 65266f6

Please sign in to comment.