From fd2e3f5d7612d8acd99d16ddc066725e3e610d11 Mon Sep 17 00:00:00 2001 From: Rotimi Best Date: Sat, 4 Oct 2025 08:13:01 +0100 Subject: [PATCH] chore: clean up environment variable usage and formatting in configuration files - Updated docker-compose.yaml to use double quotes for version and port mappings. - Removed DEPLOYMENT_PROVIDER from global environment variables in turbo.json and Dockerfile. - Adjusted dashboard build command in package.json to remove DEPLOYMENT_PROVIDER. - Cleaned up .env.example by removing the DEPLOYMENT_PROVIDER comment. - Simplified SvelteKit adapter condition in svelte.config.js. --- apps/dashboard/.env.example | 1 - apps/dashboard/Dockerfile | 2 -- apps/dashboard/svelte.config.js | 9 ++++----- docker-compose.yaml | 7 +++---- package.json | 2 +- turbo.json | 2 +- 6 files changed, 9 insertions(+), 14 deletions(-) diff --git a/apps/dashboard/.env.example b/apps/dashboard/.env.example index 638d2779..f1c023d3 100644 --- a/apps/dashboard/.env.example +++ b/apps/dashboard/.env.example @@ -5,7 +5,6 @@ PRIVATE_SUPABASE_SERVICE_ROLE= # Selfhosting - should be true if you are selfhosting PUBLIC_IS_SELFHOSTED=false -DEPLOYMENT_PROVIDER= # docker or empty. empty will use adapter-auto for sveltekit build # Unsplash setup - Optional if you want to use Unsplash images UNSPLASH_API_KEY= diff --git a/apps/dashboard/Dockerfile b/apps/dashboard/Dockerfile index ae9df640..e97737b2 100644 --- a/apps/dashboard/Dockerfile +++ b/apps/dashboard/Dockerfile @@ -31,7 +31,6 @@ COPY apps/dashboard ./apps/dashboard # Set env vars for SvelteKit to use Node adapter ENV PUBLIC_IS_SELFHOSTED=true \ - DEPLOYMENT_PROVIDER=docker \ PUBLIC_SUPABASE_URL=$PUBLIC_SUPABASE_URL \ PUBLIC_SUPABASE_ANON_KEY=$PUBLIC_SUPABASE_ANON_KEY \ PRIVATE_SUPABASE_SERVICE_ROLE=$PRIVATE_SUPABASE_SERVICE_ROLE \ @@ -68,7 +67,6 @@ EXPOSE 3000 # Set environment variables for production ENV NODE_ENV=production \ PUBLIC_IS_SELFHOSTED=true \ - DEPLOYMENT_PROVIDER=docker \ PUBLIC_SUPABASE_URL=$PUBLIC_SUPABASE_URL \ PUBLIC_SUPABASE_ANON_KEY=$PUBLIC_SUPABASE_ANON_KEY \ PRIVATE_SUPABASE_SERVICE_ROLE=$PRIVATE_SUPABASE_SERVICE_ROLE \ diff --git a/apps/dashboard/svelte.config.js b/apps/dashboard/svelte.config.js index 17bd517b..78c66f5b 100644 --- a/apps/dashboard/svelte.config.js +++ b/apps/dashboard/svelte.config.js @@ -1,13 +1,12 @@ -import { vitePreprocess } from '@sveltejs/kit/vite'; +import 'dotenv/config'; + // import adapterAuto from '@sveltejs/adapter-auto'; import adapterNode from '@sveltejs/adapter-node'; import adapterVercel from '@sveltejs/adapter-vercel'; import path from 'path'; +import { vitePreprocess } from '@sveltejs/kit/vite'; -import 'dotenv/config'; - -const useNodeAdapter = - process.env.PUBLIC_IS_SELFHOSTED === 'true' && process.env.DEPLOYMENT_PROVIDER === 'docker'; +const useNodeAdapter = process.env.PUBLIC_IS_SELFHOSTED === 'true'; /** @type {import('@sveltejs/kit').Config} */ const config = { diff --git a/docker-compose.yaml b/docker-compose.yaml index 2cb60df6..1be1f9e6 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -4,7 +4,7 @@ # Author: rotimi-best # Date: 2024-09-18 -version: '3.8' +version: "3.8" services: api: @@ -24,7 +24,7 @@ services: - SMTP_PASSWORD=${SMTP_PASSWORD} - SMTP_PORT=${SMTP_PORT} ports: - - '3002:3002' + - "3002:3002" volumes: # Node modules (optional - for faster development) - ./apps/api/node_modules:/app/node_modules @@ -62,14 +62,13 @@ services: - PUBLIC_SERVER_URL=${PUBLIC_SERVER_URL} - PUBLIC_IP_REGISTRY_KEY=${PUBLIC_IP_REGISTRY_KEY} ports: - - '3000:3000' + - "3000:3000" volumes: - .:/app - /app/node_modules - /app/apps/dashboard/node_modules environment: - PUBLIC_IS_SELFHOSTED=true - - DEPLOYMENT_PROVIDER=docker # Supabase - Database - PUBLIC_SUPABASE_URL=${PUBLIC_SUPABASE_URL} - PUBLIC_SUPABASE_ANON_KEY=${PUBLIC_SUPABASE_ANON_KEY} diff --git a/package.json b/package.json index 09e06a6e..48f485c9 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "format": "prettier . --write", "release": "standard-version", "ci": "cypress run", - "dashboard:build": "cd apps/dashboard && pnpm i && PUBLIC_IS_SELFHOSTED=true NODE_OPTIONS='--max-old-space-size=20384' DEPLOYMENT_PROVIDER=docker pnpm build", + "dashboard:build": "cd apps/dashboard && pnpm i && PUBLIC_IS_SELFHOSTED=true NODE_OPTIONS='--max-old-space-size=20384' pnpm build", "dashboard:start": "cd apps/dashboard && node build", "supabase:push": "pnpx supabase link --project-ref $PROJECT_ID && pnpx supabase db push --include-all" }, diff --git a/turbo.json b/turbo.json index cde7b05b..0cec25d5 100644 --- a/turbo.json +++ b/turbo.json @@ -1,6 +1,6 @@ { "$schema": "https://turborepo.org/schema.json", - "globalEnv": ["PUBLIC_IS_SELFHOSTED", "DEPLOYMENT_PROVIDER"], + "globalEnv": ["PUBLIC_IS_SELFHOSTED"], "pipeline": { "@cio/dashboard#build": { "dependsOn": ["@cio/api#build"]