diff --git a/docker-compose-saml.yml b/docker-compose-saml.yml deleted file mode 100644 index c05b08ba71..0000000000 --- a/docker-compose-saml.yml +++ /dev/null @@ -1,17 +0,0 @@ -# this file is a helper to run Cal.com locally (with SAML login support) -# starts a postgres instance on port 5450 to use as a local db -version: "3.6" -services: - postgres: - image: postgres:13 - ports: - - "5450:5432" # expose pg on port 5450 to not collide with pg from elswhere - restart: always - volumes: - - db_data:/var/lib/postgresql/data - environment: - POSTGRES_DB: "cal-saml" - POSTGRES_PASSWORD: "" - POSTGRES_HOST_AUTH_METHOD: trust -volumes: - db_data: diff --git a/docker-compose.yml b/docker-compose.yml index 55d88a66c9..7e0911264d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,6 +10,7 @@ services: volumes: - db_data:/var/lib/postgresql/data environment: + POSTGRES_DB: "cal-saml" POSTGRES_PASSWORD: "" POSTGRES_HOST_AUTH_METHOD: trust volumes: diff --git a/package.json b/package.json index 28106a4665..b9d4e27ba8 100644 --- a/package.json +++ b/package.json @@ -8,19 +8,14 @@ "analyze:browser": "BUNDLE_ANALYZE=browser next build", "dev": "next dev", "db-up": "docker-compose up -d", - "db-saml-up": "docker compose -p cal-saml -f docker-compose-saml.yml up -d", "db-migrate": "yarn prisma migrate dev", "db-deploy": "yarn prisma migrate deploy", "db-seed": "yarn ts-node scripts/seed.ts", "db-nuke": "docker-compose down --volumes --remove-orphans", - "db-saml-nuke": "docker-compose -p cal-saml -f docker-compose-saml.yml down --volumes --remove-orphans", "db-setup": "run-s db-up db-migrate db-seed", "db-reset": "run-s db-nuke db-setup", - "db-saml-setup": "run-s db-saml-up db-migrate db-seed", - "db-saml-reset": "run-s db-nuke db-saml-setup", "deploy": "run-s build db-deploy", "dx": "env-cmd run-s db-setup dev", - "dx-saml": "env-cmd run-s db-saml-setup dev", "test": "jest", "test-playwright": "jest --config jest.playwright.config.js", "test-codegen": "yarn playwright codegen http://localhost:3000",