Also declare the arg and narrow down the scope of variables

Author: krokosik

Dockerfile

@@ -3,12 +3,16 @@ ARG NODE_VERSION=22.16.0
 
 FROM node:${NODE_VERSION}-alpine${ALPINE_VERSION} AS base
 
+ARG APP_VERSION
+ARG GIT_SHA
+
 ENV SKIP_ENV_VALIDATION="true"
 ENV DOCKER_OUTPUT=1
 ENV NEXT_TELEMETRY_DISABLED=1
 ENV COREPACK_ENABLE_DOWNLOAD_PROMPT=0
-ENV APP_VERSION=${APP_VERSION}
-ENV GIT_SHA=${GIT_SHA}
+
+ENV NEXT_PUBLIC_APP_VERSION=${APP_VERSION}
+ENV NEXT_PUBLIC_GIT_SHA=${GIT_SHA}
 
 RUN apk update && apk add --no-cache libc6-compat
 
@@ -24,9 +28,6 @@ RUN pnpm build
 
 FROM node:${NODE_VERSION}-alpine${ALPINE_VERSION} AS release
 
-ARG APP_VERSION
-ARG GIT_SHA
-
 ENV NODE_ENV=production
 ENV DOCKER_OUTPUT=1
 
@@ -43,8 +44,6 @@ COPY --from=base /app/prisma/migrations ./prisma/migrations
 
 # set this so it throws error where starting server
 ENV SKIP_ENV_VALIDATION="false"
-ENV APP_VERSION=${APP_VERSION}
-ENV GIT_SHA=${GIT_SHA}
 
 COPY ./start.sh ./start.sh
 

src/components/Account/DebugInfo.tsx

@@ -35,7 +35,7 @@ export const DebugInfo: React.FC<React.PropsWithChildren> = ({ children }) => {
       }
     };
 
-    if (env.NEXT_PUBLIC_VERSION) {
+    if (env.NEXT_PUBLIC_APP_VERSION) {
       void fetchLatestVersion();
     }
   }, []);
@@ -46,8 +46,8 @@ export const DebugInfo: React.FC<React.PropsWithChildren> = ({ children }) => {
     if (env.NEXT_PUBLIC_GIT_SHA) {
       debugInfo.push(`${t('account.debug_info_details.git')}: ${env.NEXT_PUBLIC_GIT_SHA}`);
     }
-    if (env.NEXT_PUBLIC_VERSION) {
-      debugInfo.push(`${t('account.debug_info_details.version')} ${env.NEXT_PUBLIC_VERSION}`);
+    if (env.NEXT_PUBLIC_APP_VERSION) {
+      debugInfo.push(`${t('account.debug_info_details.version')} ${env.NEXT_PUBLIC_APP_VERSION}`);
     }
     try {
       void navigator.clipboard.writeText(debugInfo.join('\n'));
@@ -78,10 +78,12 @@ export const DebugInfo: React.FC<React.PropsWithChildren> = ({ children }) => {
             />
             <DebugInfoRow
               label={t('account.debug_info_details.version')}
-              value={env.NEXT_PUBLIC_VERSION}
+              value={env.NEXT_PUBLIC_APP_VERSION}
               className="mt-4"
             />
-            {newVersion && env.NEXT_PUBLIC_VERSION && newVersion !== env.NEXT_PUBLIC_VERSION ? (
+            {newVersion &&
+            env.NEXT_PUBLIC_APP_VERSION &&
+            newVersion !== env.NEXT_PUBLIC_APP_VERSION ? (
               <p className="mt-4 text-sm text-yellow-600">
                 {t('account.debug_info_details.new_version_available')}: {newVersion}
               </p>

src/env.ts

@@ -80,7 +80,7 @@ export const env = createEnv({
    * `NEXT_PUBLIC_`. Note that these are only evaluated at build time!
    */
   client: {
-    NEXT_PUBLIC_VERSION: z.string().optional(),
+    NEXT_PUBLIC_APP_VERSION: z.string().optional(),
     NEXT_PUBLIC_GIT_SHA: z.string().optional(),
   },
 
@@ -143,8 +143,8 @@ export const env = createEnv({
     UPLOAD_MAX_FILE_SIZE_MB: process.env.UPLOAD_MAX_FILE_SIZE_MB
       ? Number(process.env.UPLOAD_MAX_FILE_SIZE_MB)
       : 10,
-    NEXT_PUBLIC_VERSION: process.env.APP_VERSION,
-    NEXT_PUBLIC_GIT_SHA: process.env.GIT_SHA,
+    NEXT_PUBLIC_APP_VERSION: process.env.NEXT_PUBLIC_APP_VERSION,
+    NEXT_PUBLIC_GIT_SHA: process.env.NEXT_PUBLIC_GIT_SHA,
   },
   /**
    * Run `build` or `dev` with `SKIP_ENV_VALIDATION` to skip env validation. This is especially