chk
/
AppFlowy-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #928 from AppFlowy-IO/simplify-migration-script 

fix: remove dependencies on unnecessary postgres roles
This commit is contained in:
Khor Shu Heng 2024-10-24 16:04:38 +08:00 committed by GitHub
parent aea83801f7 6a34be316e
commit ee482cf15d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev.env
View File

@ -129,7 +129,7 @@ APPFLOWY_COLLABORATE_REMOVE_BATCH_SIZE=100
# AppFlowy Worker # AppFlowy Worker
APPFLOWY_WORKER_REDIS_URL=redis://localhost:6379 APPFLOWY_WORKER_REDIS_URL=redis://localhost:6379
APPFLOWY_WORKER_DATABASE_URL=postgres://postgres:password@postgres:5432/postgres APPFLOWY_WORKER_DATABASE_URL=postgres://postgres:password@localhost:5432/postgres
# AppFlowy Web # AppFlowy Web
APPFLOWY_WEB_URL=http://localhost:3000 APPFLOWY_WEB_URL=http://localhost:3000

4
docker-compose-ci.yml
View File

@ -36,6 +36,8 @@ services:
- POSTGRES_DB=${POSTGRES_DB:-postgres} - POSTGRES_DB=${POSTGRES_DB:-postgres}
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-password} - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-password}
- POSTGRES_HOST=${POSTGRES_HOST:-postgres} - POSTGRES_HOST=${POSTGRES_HOST:-postgres}
- SUPABASE_USER=${SUPABASE_USER:-supabase_auth_admin}
- SUPABASE_PASSWORD=${SUPABASE_PASSWORD:-root}
volumes: volumes:
- ./migrations/before:/docker-entrypoint-initdb.d - ./migrations/before:/docker-entrypoint-initdb.d
@ -93,7 +95,7 @@ services:
- RUST_LOG=${RUST_LOG:-info} - RUST_LOG=${RUST_LOG:-info}
- APPFLOWY_ENVIRONMENT=production - APPFLOWY_ENVIRONMENT=production
- APPFLOWY_DATABASE_URL=${APPFLOWY_DATABASE_URL} - APPFLOWY_DATABASE_URL=${APPFLOWY_DATABASE_URL}
- APPFLOWY_REDIS_URI=redis://redis:6379 - APPFLOWY_REDIS_URI=${APPFLOWY_REDIS_URI}
- APPFLOWY_GOTRUE_JWT_SECRET=${GOTRUE_JWT_SECRET} - APPFLOWY_GOTRUE_JWT_SECRET=${GOTRUE_JWT_SECRET}
- APPFLOWY_GOTRUE_JWT_EXP=${GOTRUE_JWT_EXP} - APPFLOWY_GOTRUE_JWT_EXP=${GOTRUE_JWT_EXP}
- APPFLOWY_GOTRUE_BASE_URL=${APPFLOWY_GOTRUE_BASE_URL} - APPFLOWY_GOTRUE_BASE_URL=${APPFLOWY_GOTRUE_BASE_URL}

2
docker-compose-dev.yml
View File

@ -27,6 +27,8 @@ services:
- POSTGRES_DB=${POSTGRES_DB:-postgres} - POSTGRES_DB=${POSTGRES_DB:-postgres}
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-password} - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-password}
- POSTGRES_HOST=${POSTGRES_HOST:-postgres} - POSTGRES_HOST=${POSTGRES_HOST:-postgres}
- SUPABASE_USER=${SUPABASE_USER:-supabase_auth_admin}
- SUPABASE_PASSWORD=${SUPABASE_PASSWORD:-root}
ports: ports:
- 5432:5432 - 5432:5432
volumes: volumes:

12
migrations/before/supabase_auth.sh
View File

@ -14,16 +14,6 @@ psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-E
END LOOP; END LOOP;
END; END;
\$\$; \$\$;
SELECT create_roles(ARRAY ['anon', 'authenticated']);
-- Create supabase_admin user if it does not exist
DO \$\$ BEGIN IF NOT EXISTS (
SELECT
FROM pg_catalog.pg_roles
WHERE rolname = 'supabase_admin'
) THEN CREATE USER supabase_admin LOGIN CREATEROLE CREATEDB REPLICATION BYPASSRLS;
END IF;
END \$\$;
-- Create supabase_auth_admin user if it does not exist -- Create supabase_auth_admin user if it does not exist
DO \$\$ BEGIN IF NOT EXISTS ( DO \$\$ BEGIN IF NOT EXISTS (
@ -42,4 +32,4 @@ psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-E
-- Set search_path for supabase_auth_admin -- Set search_path for supabase_auth_admin
ALTER USER $SUPABASE_USER SET search_path = 'auth'; ALTER USER $SUPABASE_USER SET search_path = 'auth';
EOSQL EOSQL