Merge pull request #833 from blockscout/nz-git-sha-fix

Fixing GIT_COMMIT_SHA in docker image

.github/workflows/e2e-tests.yml

@@ -65,8 +65,8 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
-            GIT_COMMIT_SHA=${{ env.GITHUB_SHA_SHORT }}
-
+            GIT_COMMIT_SHA=${{ env.SHORT_SHA }}
+            GIT_TAG=${{ github.ref_type == 'tag' && github.github.ref_name || '' }}
   deploy_and_tests:
     # if: github.event.review.state == 'approved'
     needs: push_to_registry

.github/workflows/publish-docker-deploy-review-l2.yml

@@ -40,7 +40,7 @@ jobs:
 
       - name: Add outputs
         run: |
-          echo "::set-output name=short-sha::${{ env.GITHUB_EVENT_PULL_REQUEST_HEAD_SHA_SHORT }}"
+          echo "::set-output name=short-sha::${{ env.SHORT_SHA }}"
         id: output-step
 
       - name: Build and push
@@ -53,7 +53,7 @@ jobs:
           tags: ghcr.io/blockscout/frontend:prerelease-${{ env.GITHUB_REF_NAME_SLUG }}
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
-            GIT_COMMIT_SHA=${{ env.GITHUB_EVENT_PULL_REQUEST_HEAD_SHA_SHORT }}
+            GIT_COMMIT_SHA=${{ env.SHORT_SHA }}
 
   deploy_review_l2:
     name: Deploy review l2

.github/workflows/publish-docker-deploy-review.yml

@@ -40,7 +40,7 @@ jobs:
 
       - name: Add outputs
         run: |
-          echo "::set-output name=short-sha::${{ env.GITHUB_EVENT_PULL_REQUEST_HEAD_SHA_SHORT }}"
+          echo "::set-output name=short-sha::${{ env.SHORT_SHA }}"
         id: output-step
 
       - name: Build and push
@@ -53,7 +53,7 @@ jobs:
           tags: ghcr.io/blockscout/frontend:prerelease-${{ env.GITHUB_REF_NAME_SLUG }}
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
-            GIT_COMMIT_SHA=${{ env.GITHUB_EVENT_PULL_REQUEST_HEAD_SHA_SHORT }}
+            GIT_COMMIT_SHA=${{ env.SHORT_SHA }}
 
   deploy_review:
     name: Deploy review

Dockerfile

@@ -26,16 +26,18 @@ ARG NEXT_PUBLIC_SENTRY_DSN
 ARG SENTRY_CSP_REPORT_URI
 ARG SENTRY_AUTH_TOKEN
 
-# pass commit sha to the app (uses by sentry.io as release version)
-ARG GIT_COMMIT_SHA
-ENV NEXT_PUBLIC_GIT_COMMIT_SHA=$GIT_COMMIT_SHA
-
 RUN yarn build
 
 # Production image, copy all the files and run next
 FROM node:18-alpine AS runner
 WORKDIR /app
 
+# pass commit sha to the app (uses by sentry.io as release version)
+ARG GIT_COMMIT_SHA
+ENV NEXT_PUBLIC_GIT_COMMIT_SHA=$GIT_COMMIT_SHA
+ARG GIT_TAG
+ENV NEXT_PUBLIC_GIT_TAG=$GIT_TAG
+
 ENV NODE_ENV production
 # Uncomment the following line in case you want to disable telemetry during runtime.
 # ENV NEXT_TELEMETRY_DISABLED 1