diff --git a/apps/infoalloggi/Dockerfile b/apps/infoalloggi/Dockerfile index 2b5403f..b697650 100644 --- a/apps/infoalloggi/Dockerfile +++ b/apps/infoalloggi/Dockerfile @@ -21,8 +21,7 @@ ENV BASE_URL=$BASE_URL \ NEXT_PUBLIC_BASE_URL=$NEXT_PUBLIC_BASE_URL \ NEXT_PUBLIC_STRIPE_PUBLIC_KEY=$NEXT_PUBLIC_STRIPE_PUBLIC_KEY \ STRIPE_SECRET_KEY="mock" \ - STRIPE_WEBHOOK_SECRET="mock" \ - NEXT_PUBLIC_UMAMI_ID=$NEXT_PUBLIC_UMAMI_ID + STRIPE_WEBHOOK_SECRET="mock" RUN SKIP_ENV_VALIDATION=1 npm run build @@ -88,8 +87,6 @@ ARG STORAGE_TOKEN ENV STORAGE_TOKEN=$STORAGE_TOKEN ARG BROWSER_WS_URL ENV BROWSER_WS_URL=$BROWSER_WS_URL -ARG NEXT_PUBLIC_UMAMI_ID -ENV NEXT_PUBLIC_UMAMI_ID=$NEXT_PUBLIC_UMAMI_ID RUN apk add --no-cache curl diff --git a/apps/infoalloggi/src/env.ts b/apps/infoalloggi/src/env.ts index 387e4a4..254a9b3 100644 --- a/apps/infoalloggi/src/env.ts +++ b/apps/infoalloggi/src/env.ts @@ -31,18 +31,15 @@ export const env = createEnv({ STORAGE_URL: z.string(), STORAGE_TOKEN: z.string(), BROWSER_WS_URL: z.string(), - }, 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, diff --git a/apps/infoalloggi/src/pages/_document.tsx b/apps/infoalloggi/src/pages/_document.tsx index a2bb032..af38dcc 100644 --- a/apps/infoalloggi/src/pages/_document.tsx +++ b/apps/infoalloggi/src/pages/_document.tsx @@ -1,6 +1,4 @@ import { Head, Html, Main, NextScript } from "next/document"; -import Script from "next/script"; -import { env } from "~/env"; import { inter } from "~/utils/fonts"; export default function Document() { @@ -56,12 +54,8 @@ export default function Document() {
- ); } + diff --git a/build_and_push_ghcr.sh b/build_and_push_ghcr.sh index 0e4b9f6..5ef9889 100644 --- a/build_and_push_ghcr.sh +++ b/build_and_push_ghcr.sh @@ -66,7 +66,6 @@ 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" \ diff --git a/docker-compose.yml b/docker-compose.yml index 27ad778..34475d2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -173,7 +173,6 @@ 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: @@ -212,57 +211,6 @@ services: tiles: condition: service_healthy - umami-db: - image: postgres:15-alpine - environment: - POSTGRES_DB: ${UMAMI_DB_NAME:-umamidb} - POSTGRES_USER: ${UMAMI_DB_USER:-umami_user} - POSTGRES_PASSWORD: ${UMAMI_DB_PASSWORD} - volumes: - - umami-db-data:/var/lib/postgresql/data - restart: always - networks: - - dokploy-network - healthcheck: - test: ["CMD-SHELL", "pg_isready -U $${UMAMI_DB_USER:-umami_user} -d $${UMAMI_DB_NAME:-umamidb}"] - interval: 5s - timeout: 5s - retries: 5 - - umami: - image: ghcr.io/umami-software/umami:postgresql-latest - expose: - - 3000 - environment: - DATABASE_URL: postgresql://${UMAMI_DB_USER:-umami_user}:${UMAMI_DB_PASSWORD}@umami-db:5432/${UMAMI_DB_NAME:-umamidb} - APP_SECRET: ${UMAMI_APP_SECRET} - depends_on: - umami-db: - condition: service_healthy - restart: always - init: true - healthcheck: - test: ["CMD-SHELL", "curl http://localhost:3000/api/heartbeat"] - interval: 5s - timeout: 5s - retries: 5 - networks: - - dokploy-network - labels: - - "traefik.enable=true" - # HTTP ROUTER - - "traefik.http.routers.umami-info-http.rule=Host(`analytics.${DOMAIN}`)" - - "traefik.http.routers.umami-info-http.entrypoints=web" - - "traefik.http.routers.umami-info-http.service=umami-info-http" - - "traefik.http.routers.umami-info-http.middlewares=redirect-to-https@file" - - "traefik.http.services.umami-info-http.loadbalancer.server.port=3000" - # HTTPS ROUTER - - "traefik.http.routers.umami-info.rule=Host(`analytics.${DOMAIN}`)" - - "traefik.http.routers.umami-info.entrypoints=websecure" - - "traefik.http.routers.umami-info.service=umami-info" - - "traefik.http.routers.umami-info.tls.certresolver=letsencrypt" - - "traefik.http.services.umami-info.loadbalancer.server.port=3000" - networks: dokploy-network: external: true @@ -272,4 +220,3 @@ volumes: tiles-data: keydb-data: dbdata: - umami-db-data: