fix: include commit hash when building on GitHub

Signed-off-by: Matej Focko <[email protected]>

.github/workflows/build-and-push.yml

@@ -39,6 +39,7 @@ jobs:
           unique_tag="${branch}-${GITHUB_SHA::7}"
           echo "tag=${tag} ${unique_tag}" >> $GITHUB_OUTPUT
           echo "api=${api}" >> $GITHUB_OUTPUT
+          echo "commit_sha=${GITHUB_SHA::7}" >> $GITHUB_OUTPUT
         id: branch_tag
 
       - name: Build Image
@@ -49,7 +50,7 @@ jobs:
           dockerfiles: ${{ matrix.dockerfile }}
           image: ${{ matrix.image }}
           tags: ${{ steps.branch_tag.outputs.tag }}
-          build-args: REACT_APP_API_URL=${{ steps.branch_tag.outputs.api }}
+          build-args: REACT_APP_API_URL=${{ steps.branch_tag.outputs.api }} REACT_APP_GIT_SHA=${{ steps.branch_tag.outputs.commit_sha }}
           oci: true
 
       - name: Push To Quay

Dockerfile

@@ -4,6 +4,9 @@ FROM quay.io/packit/base
 ARG REACT_APP_API_URL=https://stg.packit.dev/api
 ENV REACT_APP_API_URL ${REACT_APP_API_URL}
 
+ARG REACT_APP_GIT_SHA=dev
+ENV REACT_APP_GIT_SHA ${REACT_APP_GIT_SHA}
+
 ENV HOME=/home/packit_dashboard
 
 WORKDIR /src

Makefile

@@ -42,7 +42,7 @@ run-container-stg: build-stg
 build-stg:
 	$(CONTAINER_ENGINE) build --rm \
 		--build-arg REASCT_APP_API_URL=$(API_STG) \
-		--build-arg GIT_SHA=$(GIT_SHA) \
+		--build-arg REACT_APP_GIT_SHA=$(GIT_SHA) \
 		-t $(IMAGE) -f Dockerfile .
 
 push-stg: build-stg