From 7558029271362c643e8807dcd2dac60b5d901ee8 Mon Sep 17 00:00:00 2001 From: songtianlun Date: Sun, 18 Aug 2024 13:34:37 +0800 Subject: [PATCH] fix: supabase domain in one path --- .../templates/supabase/docker-compose.yml | 56 ++++--------------- apps/dokploy/templates/supabase/index.ts | 5 +- 2 files changed, 13 insertions(+), 48 deletions(-) diff --git a/apps/dokploy/templates/supabase/docker-compose.yml b/apps/dokploy/templates/supabase/docker-compose.yml index ae1f616e..6fdf579a 100644 --- a/apps/dokploy/templates/supabase/docker-compose.yml +++ b/apps/dokploy/templates/supabase/docker-compose.yml @@ -15,13 +15,7 @@ services: - dokploy-network restart: unless-stopped healthcheck: - test: - [ - "CMD", - "node", - "-e", - "require('http').get('http://localhost:3000/api/profile', (r) => {if (r.statusCode !== 200) throw new Error(r.statusCode)})" - ] + test: [ "CMD", "node", "-e", "require('http').get('http://localhost:3000/api/profile', (r) => {if (r.statusCode !== 200) throw new Error(r.statusCode)})" ] timeout: 5s interval: 5s retries: 3 @@ -36,7 +30,7 @@ services: DEFAULT_PROJECT_NAME: ${STUDIO_DEFAULT_PROJECT} SUPABASE_URL: http://kong:8000 - SUPABASE_PUBLIC_URL: ${SUPABASE_PUBLIC_URL} + SUPABASE_PUBLIC_URL: http://${SUPABASE_URL} SUPABASE_ANON_KEY: ${ANON_KEY} SUPABASE_SERVICE_KEY: ${SERVICE_ROLE_KEY} AUTH_JWT_SECRET: ${JWT_SECRET} @@ -65,7 +59,7 @@ services: - 8443 labels: - traefik.enable=true - - traefik.http.routers.frontend-app.rule=Host(`${BASE_URL}`) + - traefik.http.routers.frontend-app.rule=Host(`${SUPABASE_URL}`) - traefik.http.routers.frontend-app.entrypoints=web - traefik.http.services.frontend-app.loadbalancer.server.port=${KONG_HTTP_PORT} depends_on: @@ -99,15 +93,7 @@ services: analytics: condition: service_healthy healthcheck: - test: - [ - "CMD", - "wget", - "--no-verbose", - "--tries=1", - "--spider", - "http://localhost:9999/health" - ] + test: [ "CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:9999/health" ] timeout: 5s interval: 5s retries: 3 @@ -115,12 +101,12 @@ services: environment: GOTRUE_API_HOST: 0.0.0.0 GOTRUE_API_PORT: 9999 - API_EXTERNAL_URL: ${API_EXTERNAL_URL} + API_EXTERNAL_URL: http://${SUPABASE_URL} GOTRUE_DB_DRIVER: postgres GOTRUE_DB_DATABASE_URL: postgres://supabase_auth_admin:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB} - GOTRUE_SITE_URL: ${SITE_URL} + GOTRUE_SITE_URL: http://${SUPABASE_URL} GOTRUE_URI_ALLOW_LIST: ${ADDITIONAL_REDIRECT_URLS} GOTRUE_DISABLE_SIGNUP: ${DISABLE_SIGNUP} @@ -197,18 +183,7 @@ services: analytics: condition: service_healthy healthcheck: - test: - [ - "CMD", - "curl", - "-sSfL", - "--head", - "-o", - "/dev/null", - "-H", - "Authorization: Bearer ${ANON_KEY}", - "http://localhost:4000/api/tenants/realtime-dev/health" - ] + test: [ "CMD", "curl", "-sSfL", "--head", "-o", "/dev/null", "-H", "Authorization: Bearer ${ANON_KEY}", "http://localhost:4000/api/tenants/realtime-dev/health" ] timeout: 5s interval: 5s retries: 3 @@ -245,15 +220,7 @@ services: imgproxy: condition: service_started healthcheck: - test: - [ - "CMD", - "wget", - "--no-verbose", - "--tries=1", - "--spider", - "http://localhost:5000/status" - ] + test: [ "CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:5000/status" ] timeout: 5s interval: 5s retries: 3 @@ -379,8 +346,8 @@ services: # Uncomment to use Big Query backend for analytics # GOOGLE_PROJECT_ID: ${GOOGLE_PROJECT_ID} # GOOGLE_PROJECT_NUMBER: ${GOOGLE_PROJECT_NUMBER} - #ports: - # - 4000:4000 + #ports: + # - 4000:4000 expose: - 4000 @@ -464,6 +431,7 @@ services: volumes: db-config: + networks: dokploy-network: - external: true \ No newline at end of file + external: true diff --git a/apps/dokploy/templates/supabase/index.ts b/apps/dokploy/templates/supabase/index.ts index 68f49090..2a21dfe8 100644 --- a/apps/dokploy/templates/supabase/index.ts +++ b/apps/dokploy/templates/supabase/index.ts @@ -17,9 +17,9 @@ export function generate(schema: Schema): Template { const logflareApiKey = generateBase64(64); const envs = [ + `SUPABASE_URL=${randomDomain}`, `POSTGRES_PASSWORD=${postgresPassword}`, `JWT_SECRET=${jwtSecret}`, - `BASE_URL=http://${randomDomain}`, `ANON_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyAgCiAgICAicm9sZSI6ICJhbm9uIiwKICAgICJpc3MiOiAic3VwYWJhc2UtZGVtbyIsCiAgICAiaWF0IjogMTY0MTc2OTIwMCwKICAgICJleHAiOiAxNzk5NTM1NjAwCn0.dc_X5iR_VP_qT0zsiyj_I_OZ2T9FtRU2BBNWN8Bu4GE`, `SERVICE_ROLE_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyAgCiAgICAicm9sZSI6ICJzZXJ2aWNlX3JvbGUiLAogICAgImlzcyI6ICJzdXBhYmFzZS1kZW1vIiwKICAgICJpYXQiOiAxNjQxNzY5MjAwLAogICAgImV4cCI6IDE3OTk1MzU2MDAKfQ.DaYlNEoUrrEn2Ig7tqibS-PHK5vgusbcbo7X36XVt4Q`, `DASHBOARD_USERNAME=supabase`, @@ -30,11 +30,9 @@ export function generate(schema: Schema): Template { `KONG_HTTP_PORT=8000`, `KONG_HTTPS_PORT=8443`, `PGRST_DB_SCHEMAS=public,storage,graphql_public`, - `SITE_URL=http://${randomDomain}`, `ADDITIONAL_REDIRECT_URLS=`, `JWT_EXPIRY=3600`, `DISABLE_SIGNUP=false`, - `API_EXTERNAL_URL=http://${randomDomain}`, `MAILER_URLPATHS_CONFIRMATION="/auth/v1/verify"`, `MAILER_URLPATHS_INVITE="/auth/v1/verify"`, `MAILER_URLPATHS_RECOVERY="/auth/v1/verify"`, @@ -53,7 +51,6 @@ export function generate(schema: Schema): Template { `STUDIO_DEFAULT_ORGANIZATION=Default Organization`, `STUDIO_DEFAULT_PROJECT=Default Project`, `STUDIO_PORT=3000`, - `SUPABASE_PUBLIC_URL=http://${randomDomain}`, `IMGPROXY_ENABLE_WEBP_DETECTION=true`, `FUNCTIONS_VERIFY_JWT=false`, `LOGFLARE_LOGGER_BACKEND_API_KEY=${logflareApiKey}`,