mirror of
https://github.com/blakeblackshear/frigate.git
synced 2025-12-20 12:06:43 +03:00
Merge 52e6fbebd2 into de066d0062
This commit is contained in:
commit
80182da27c
2
.github/actions/setup/action.yml
vendored
2
.github/actions/setup/action.yml
vendored
@ -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:
|
||||
|
||||
4
.github/workflows/ci.yml
vendored
4
.github/workflows/ci.yml
vendored
@ -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: |
|
||||
|
||||
@ -318,6 +318,10 @@ 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/ ./
|
||||
|
||||
@ -33,7 +33,7 @@ i18n
|
||||
fallbackLng: "en", // use en if detected lng is not available
|
||||
|
||||
backend: {
|
||||
loadPath: "locales/{{lng}}/{{ns}}.json",
|
||||
loadPath: `locales/{{lng}}/{{ns}}.json?v=${import.meta.env.GIT_COMMIT_HASH || "unknown"}`,
|
||||
},
|
||||
|
||||
ns: [
|
||||
|
||||
@ -5,11 +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: {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user