feat: update environment variable for Umami ID and adjust related configurations

apps/infoalloggi/Dockerfile

@@ -22,7 +22,7 @@ ENV BASE_URL=$BASE_URL \
     NEXT_PUBLIC_STRIPE_PUBLIC_KEY=$NEXT_PUBLIC_STRIPE_PUBLIC_KEY \
     STRIPE_SECRET_KEY="mock" \
     STRIPE_WEBHOOK_SECRET="mock" \
-    UMAMI_ID=$UMAMI_ID
+    NEXT_PUBLIC_UMAMI_ID=$NEXT_PUBLIC_UMAMI_ID
 
 RUN SKIP_ENV_VALIDATION=1 npm run build
 
@@ -88,8 +88,8 @@ ARG STORAGE_TOKEN
 ENV STORAGE_TOKEN=$STORAGE_TOKEN
 ARG BROWSER_WS_URL
 ENV BROWSER_WS_URL=$BROWSER_WS_URL
-ARG UMAMI_ID
-ENV UMAMI_ID=$UMAMI_ID
+ARG NEXT_PUBLIC_UMAMI_ID
+ENV NEXT_PUBLIC_UMAMI_ID=$NEXT_PUBLIC_UMAMI_ID
 
 RUN apk add --no-cache curl
 

apps/infoalloggi/src/env.ts

@@ -31,16 +31,18 @@ export const env = createEnv({
 		STORAGE_URL: z.string(),
 		STORAGE_TOKEN: z.string(),
 		BROWSER_WS_URL: z.string(),
-		UMAMI_ID: z.string().optional()
+		
 	},
 	client: {
 		NEXT_PUBLIC_BASE_URL: z.string(),
 		NEXT_PUBLIC_STRIPE_PUBLIC_KEY: z.string(),
+		NEXT_PUBLIC_UMAMI_ID: z.string(),
 		//NEXT_PUBLIC_TEST: z.string(),
 	},
 	experimental__runtimeEnv: {
 		NEXT_PUBLIC_BASE_URL: process.env.NEXT_PUBLIC_BASE_URL,
 		NEXT_PUBLIC_STRIPE_PUBLIC_KEY: process.env.NEXT_PUBLIC_STRIPE_PUBLIC_KEY,
+		NEXT_PUBLIC_UMAMI_ID: process.env.NEXT_PUBLIC_UMAMI_ID,
 		//NEXT_PUBLIC_TEST: process.env.NEXT_PUBLIC_TEST,
 	},
 	skipValidation: process.env.SKIP_ENV_VALIDATION === "1" || false,

apps/infoalloggi/src/pages/_document.tsx

@@ -57,7 +57,7 @@ export default function Document() {
 				<Main />
 				<NextScript />
 				<Script
-					data-website-id={env.UMAMI_ID}
+					data-website-id={env.NEXT_PUBLIC_UMAMI_ID}
 					defer
 					src={`https://analytics.${env.BASE_URL.replace("https://", "").replace("http://", "")}/script.js`}
 				></Script>

build_and_push_ghcr.sh

@@ -66,6 +66,7 @@ docker build \
   --build-arg BASE_URL="${BASE_URL}" \
   --build-arg NEXT_PUBLIC_BASE_URL="${BASE_URL}" \
   --build-arg NEXT_PUBLIC_STRIPE_PUBLIC_KEY="${NEXT_PUBLIC_STRIPE_PUBLIC_KEY}" \
+  --build-arg NEXT_PUBLIC_UMAMI_ID="${NEXT_PUBLIC_UMAMI_ID}" \
   -t "${IMAGE}" \
   --label "org.opencontainers.image.description=${DESCRIPTION}" \
   -f "./apps/infoalloggi/Dockerfile" \

docker-compose.yml

@@ -173,6 +173,7 @@ services:
       STORAGE_URL: http://storage:8080
       STORAGE_TOKEN: ${STORAGE_TOKEN}
       BROWSER_WS_URL: "ws://browserless:3000"
+      NEXT_PUBLIC_UMAMI_ID: ${NEXT_PUBLIC_UMAMI_ID}
     networks:
       - dokploy-network
     expose: