Add GIT_COMMIT var to CI build

Author: axelstudios

.github/workflows/ci.yml

@@ -2,9 +2,9 @@ name: CI
 
 on:
   push:
-  # Reenable pull_request if we start receiving 3rd party contributions.
-  # Otherwise all pull_requests will also be push test and we are enforcing
-  # that code must be up to date with parent in the PRs.
+  # Re-enable pull_request if we start receiving 3rd party contributions.
+  # Otherwise, all pull_requests will also be push test and we are enforcing
+  # that code must be up-to-date with parent in the PRs.
   #pull_request:
 
 jobs:
@@ -76,6 +76,8 @@ jobs:
       # the webpack calling on the web container for .dev.yml can take some
       # time.
       - name: Build and run stack
+        env:
+          GIT_COMMIT: ${{ github.sha }}
         run: |
           printenv
           docker-compose -f docker-compose.yml -f docker-compose.dev.yml up --build -d worker
@@ -122,6 +124,8 @@ jobs:
           poetry-version: 1.2.1
 
       - name: Build and run stack
+        env:
+          GIT_COMMIT: ${{ github.sha }}
         run: |
           printenv
           docker-compose up --build -d
@@ -173,6 +177,8 @@ jobs:
           poetry-version: 1.2.1
 
       - name: Build and run stack
+        env:
+          GIT_COMMIT: ${{ github.sha }}
         run: |
           export HISTORIAN_ENABLE=true
           printenv

alfalfa_web/Dockerfile

@@ -1,4 +1,6 @@
 FROM node:16 AS base
+ARG GIT_COMMIT
+ENV GIT_COMMIT=$GIT_COMMIT
 
 RUN apt-get update && apt-get install -y \
     ca-certificates \

alfalfa_web/webpack.config.js

@@ -11,8 +11,14 @@ const WebpackBeforeBuildPlugin = require("before-build-webpack");
 const isProd = process.env.NODE_ENV === "production";
 
 const getSha = () => {
-  const stdout = npmRun.execSync("git rev-parse --short=10 HEAD", { cwd: __dirname });
-  const sha = stdout.toString().trim();
+  let sha = process.env.GIT_COMMIT;
+  if (!sha) {
+    try {
+      sha = npmRun.execSync("git rev-parse HEAD", { cwd: __dirname }).toString().trim().substring(0, 7);
+    } catch (e) {
+      console.error("Failed to determine git sha");
+    }
+  }
   fs.writeFileSync(path.resolve(__dirname, "build", "sha.json"), JSON.stringify({ sha }));
 };
 

docker-compose.dev.yml

@@ -26,6 +26,7 @@ services:
     environment:
       - AWS_ACCESS_KEY_ID
       - AWS_SECRET_ACCESS_KEY
+      - GIT_COMMIT
       - JOB_QUEUE_URL
       - MONGO_DB_NAME
       - MONGO_URL

docker-compose.yml

@@ -20,6 +20,7 @@ services:
     environment:
       - AWS_ACCESS_KEY_ID
       - AWS_SECRET_ACCESS_KEY
+      - GIT_COMMIT
       - JOB_QUEUE_URL
       - MONGO_DB_NAME
       - MONGO_URL