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.
This commit is contained in:
@@ -5,7 +5,6 @@ PRIVATE_SUPABASE_SERVICE_ROLE=
|
|||||||
|
|
||||||
# Selfhosting - should be true if you are selfhosting
|
# Selfhosting - should be true if you are selfhosting
|
||||||
PUBLIC_IS_SELFHOSTED=false
|
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 setup - Optional if you want to use Unsplash images
|
||||||
UNSPLASH_API_KEY=
|
UNSPLASH_API_KEY=
|
||||||
|
|||||||
@@ -31,7 +31,6 @@ COPY apps/dashboard ./apps/dashboard
|
|||||||
|
|
||||||
# Set env vars for SvelteKit to use Node adapter
|
# Set env vars for SvelteKit to use Node adapter
|
||||||
ENV PUBLIC_IS_SELFHOSTED=true \
|
ENV PUBLIC_IS_SELFHOSTED=true \
|
||||||
DEPLOYMENT_PROVIDER=docker \
|
|
||||||
PUBLIC_SUPABASE_URL=$PUBLIC_SUPABASE_URL \
|
PUBLIC_SUPABASE_URL=$PUBLIC_SUPABASE_URL \
|
||||||
PUBLIC_SUPABASE_ANON_KEY=$PUBLIC_SUPABASE_ANON_KEY \
|
PUBLIC_SUPABASE_ANON_KEY=$PUBLIC_SUPABASE_ANON_KEY \
|
||||||
PRIVATE_SUPABASE_SERVICE_ROLE=$PRIVATE_SUPABASE_SERVICE_ROLE \
|
PRIVATE_SUPABASE_SERVICE_ROLE=$PRIVATE_SUPABASE_SERVICE_ROLE \
|
||||||
@@ -68,7 +67,6 @@ EXPOSE 3000
|
|||||||
# Set environment variables for production
|
# Set environment variables for production
|
||||||
ENV NODE_ENV=production \
|
ENV NODE_ENV=production \
|
||||||
PUBLIC_IS_SELFHOSTED=true \
|
PUBLIC_IS_SELFHOSTED=true \
|
||||||
DEPLOYMENT_PROVIDER=docker \
|
|
||||||
PUBLIC_SUPABASE_URL=$PUBLIC_SUPABASE_URL \
|
PUBLIC_SUPABASE_URL=$PUBLIC_SUPABASE_URL \
|
||||||
PUBLIC_SUPABASE_ANON_KEY=$PUBLIC_SUPABASE_ANON_KEY \
|
PUBLIC_SUPABASE_ANON_KEY=$PUBLIC_SUPABASE_ANON_KEY \
|
||||||
PRIVATE_SUPABASE_SERVICE_ROLE=$PRIVATE_SUPABASE_SERVICE_ROLE \
|
PRIVATE_SUPABASE_SERVICE_ROLE=$PRIVATE_SUPABASE_SERVICE_ROLE \
|
||||||
|
|||||||
@@ -1,13 +1,12 @@
|
|||||||
import { vitePreprocess } from '@sveltejs/kit/vite';
|
import 'dotenv/config';
|
||||||
|
|
||||||
// import adapterAuto from '@sveltejs/adapter-auto';
|
// import adapterAuto from '@sveltejs/adapter-auto';
|
||||||
import adapterNode from '@sveltejs/adapter-node';
|
import adapterNode from '@sveltejs/adapter-node';
|
||||||
import adapterVercel from '@sveltejs/adapter-vercel';
|
import adapterVercel from '@sveltejs/adapter-vercel';
|
||||||
import path from 'path';
|
import path from 'path';
|
||||||
|
import { vitePreprocess } from '@sveltejs/kit/vite';
|
||||||
|
|
||||||
import 'dotenv/config';
|
const useNodeAdapter = process.env.PUBLIC_IS_SELFHOSTED === 'true';
|
||||||
|
|
||||||
const useNodeAdapter =
|
|
||||||
process.env.PUBLIC_IS_SELFHOSTED === 'true' && process.env.DEPLOYMENT_PROVIDER === 'docker';
|
|
||||||
|
|
||||||
/** @type {import('@sveltejs/kit').Config} */
|
/** @type {import('@sveltejs/kit').Config} */
|
||||||
const config = {
|
const config = {
|
||||||
|
|||||||
+3
-4
@@ -4,7 +4,7 @@
|
|||||||
# Author: rotimi-best
|
# Author: rotimi-best
|
||||||
# Date: 2024-09-18
|
# Date: 2024-09-18
|
||||||
|
|
||||||
version: '3.8'
|
version: "3.8"
|
||||||
|
|
||||||
services:
|
services:
|
||||||
api:
|
api:
|
||||||
@@ -24,7 +24,7 @@ services:
|
|||||||
- SMTP_PASSWORD=${SMTP_PASSWORD}
|
- SMTP_PASSWORD=${SMTP_PASSWORD}
|
||||||
- SMTP_PORT=${SMTP_PORT}
|
- SMTP_PORT=${SMTP_PORT}
|
||||||
ports:
|
ports:
|
||||||
- '3002:3002'
|
- "3002:3002"
|
||||||
volumes:
|
volumes:
|
||||||
# Node modules (optional - for faster development)
|
# Node modules (optional - for faster development)
|
||||||
- ./apps/api/node_modules:/app/node_modules
|
- ./apps/api/node_modules:/app/node_modules
|
||||||
@@ -62,14 +62,13 @@ services:
|
|||||||
- PUBLIC_SERVER_URL=${PUBLIC_SERVER_URL}
|
- PUBLIC_SERVER_URL=${PUBLIC_SERVER_URL}
|
||||||
- PUBLIC_IP_REGISTRY_KEY=${PUBLIC_IP_REGISTRY_KEY}
|
- PUBLIC_IP_REGISTRY_KEY=${PUBLIC_IP_REGISTRY_KEY}
|
||||||
ports:
|
ports:
|
||||||
- '3000:3000'
|
- "3000:3000"
|
||||||
volumes:
|
volumes:
|
||||||
- .:/app
|
- .:/app
|
||||||
- /app/node_modules
|
- /app/node_modules
|
||||||
- /app/apps/dashboard/node_modules
|
- /app/apps/dashboard/node_modules
|
||||||
environment:
|
environment:
|
||||||
- PUBLIC_IS_SELFHOSTED=true
|
- PUBLIC_IS_SELFHOSTED=true
|
||||||
- DEPLOYMENT_PROVIDER=docker
|
|
||||||
# Supabase - Database
|
# Supabase - Database
|
||||||
- PUBLIC_SUPABASE_URL=${PUBLIC_SUPABASE_URL}
|
- PUBLIC_SUPABASE_URL=${PUBLIC_SUPABASE_URL}
|
||||||
- PUBLIC_SUPABASE_ANON_KEY=${PUBLIC_SUPABASE_ANON_KEY}
|
- PUBLIC_SUPABASE_ANON_KEY=${PUBLIC_SUPABASE_ANON_KEY}
|
||||||
|
|||||||
+1
-1
@@ -9,7 +9,7 @@
|
|||||||
"format": "prettier . --write",
|
"format": "prettier . --write",
|
||||||
"release": "standard-version",
|
"release": "standard-version",
|
||||||
"ci": "cypress run",
|
"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",
|
"dashboard:start": "cd apps/dashboard && node build",
|
||||||
"supabase:push": "pnpx supabase link --project-ref $PROJECT_ID && pnpx supabase db push --include-all"
|
"supabase:push": "pnpx supabase link --project-ref $PROJECT_ID && pnpx supabase db push --include-all"
|
||||||
},
|
},
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://turborepo.org/schema.json",
|
"$schema": "https://turborepo.org/schema.json",
|
||||||
"globalEnv": ["PUBLIC_IS_SELFHOSTED", "DEPLOYMENT_PROVIDER"],
|
"globalEnv": ["PUBLIC_IS_SELFHOSTED"],
|
||||||
"pipeline": {
|
"pipeline": {
|
||||||
"@cio/dashboard#build": {
|
"@cio/dashboard#build": {
|
||||||
"dependsOn": ["@cio/api#build"]
|
"dependsOn": ["@cio/api#build"]
|
||||||
|
|||||||
Reference in New Issue
Block a user