Marco/infoalloggi-monorepo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 6 Wiki Activity Actions

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

Browse source
This commit is contained in:
Marco Pedone 2026-03-09 14:09:32 +01:00
parent f20e5e8192
commit e563aa43fd
5 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/infoalloggi/Dockerfile
View file

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

4
apps/infoalloggi/src/env.ts
View file

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

2
apps/infoalloggi/src/pages/_document.tsx
View file

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

1
build_and_push_ghcr.sh
View file

@ -66,6 +66,7 @@ docker build \
--build-arg BASE_URL="${BASE_URL}" \ --build-arg BASE_URL="${BASE_URL}" \
--build-arg NEXT_PUBLIC_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_STRIPE_PUBLIC_KEY="${NEXT_PUBLIC_STRIPE_PUBLIC_KEY}" \
--build-arg NEXT_PUBLIC_UMAMI_ID="${NEXT_PUBLIC_UMAMI_ID}" \
-t "${IMAGE}" \ -t "${IMAGE}" \
--label "org.opencontainers.image.description=${DESCRIPTION}" \ --label "org.opencontainers.image.description=${DESCRIPTION}" \
-f "./apps/infoalloggi/Dockerfile" \ -f "./apps/infoalloggi/Dockerfile" \

1
docker-compose.yml
View file

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