Merge 52e6fbebd2 into de066d0062

.github/actions/setup/action.yml

@@ -4,6 +4,8 @@ inputs:
   GITHUB_TOKEN:
     required: true
 outputs:
+  short-sha:
+    value: ${{ steps.create-short-sha.outputs.SHORT_SHA }}
   image-name:
     value: ghcr.io/${{ steps.lowercaseRepo.outputs.lowercase }}:${{ steps.create-short-sha.outputs.SHORT_SHA }}
   cache-name:

.github/workflows/ci.yml

@@ -37,6 +37,8 @@ jobs:
           context: .
           file: docker/main/Dockerfile
           push: true
+          build-args: 
+            GIT_COMMIT_HASH=${{ steps.setup.outputs.short-sha }}
           platforms: linux/amd64
           target: frigate
           tags: ${{ steps.setup.outputs.image-name }}-amd64
@@ -61,6 +63,8 @@ jobs:
           context: .
           file: docker/main/Dockerfile
           push: true
+          build-args:
+            GIT_COMMIT_HASH=${{ steps.setup.outputs.short-sha }}
           platforms: linux/arm64
           target: frigate
           tags: |

.gitignore

@@ -15,7 +15,6 @@ frigate/version.py
 web/build
 web/node_modules
 web/coverage
-web/.env
 core
 !/web/**/*.ts
 .idea/*

Makefile

@@ -14,7 +14,6 @@ push-boards: $(BOARDS:%=push-%)
 
 version:
 	echo 'VERSION = "$(VERSION)-$(COMMIT_HASH)"' > frigate/version.py
-	echo 'VITE_GIT_COMMIT_HASH=$(COMMIT_HASH)' > web/.env
 
 local: version
 	docker buildx build --target=frigate --file docker/main/Dockerfile . \

docker/main/Dockerfile

@@ -319,6 +319,9 @@ FROM --platform=$BUILDPLATFORM node:20 AS web-build
 WORKDIR /work
 COPY web/package.json web/package-lock.json ./
 
+ARG GIT_COMMIT_HASH
+ENV GIT_COMMIT_HASH=$GIT_COMMIT_HASH
+
 RUN npm install
 
 COPY web/ ./

web/.gitignore

@@ -22,4 +22,3 @@ dist-ssr
 *.njsproj
 *.sln
 *.sw?
-.env

web/src/utils/i18n.ts

@@ -33,7 +33,7 @@ i18n
     fallbackLng: "en", // use en if detected lng is not available
 
     backend: {
-      loadPath: `locales/{{lng}}/{{ns}}.json?v=${import.meta.env.VITE_GIT_COMMIT_HASH || "unknown"}`,
+      loadPath: `locales/{{lng}}/{{ns}}.json?v=${import.meta.env.GIT_COMMIT_HASH || "unknown"}`,
     },
 
     ns: [

web/vite.config.ts

@@ -5,10 +5,12 @@ import react from "@vitejs/plugin-react-swc";
 import monacoEditorPlugin from "vite-plugin-monaco-editor";
 
 const proxyHost = process.env.PROXY_HOST || "localhost:5000";
+const gitCommitHash = process.env.GIT_COMMIT_HASH || "unknown";
 // https://vitejs.dev/config/
 export default defineConfig({
   define: {
     "import.meta.vitest": "undefined",
+    "import.meta.env.GIT_COMMIT_HASH": JSON.stringify(gitCommitHash),
   },
   server: {
     proxy: {