Compare commits
22 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
41e0acd485 | ||
|
|
cbbcca72e0 | ||
|
|
9e4e764779 | ||
|
|
617d7ec421 | ||
|
|
12216641af | ||
|
|
2b0f668f18 | ||
|
|
924575106e | ||
|
|
91015a7239 | ||
|
|
70ecb7be40 | ||
|
|
2343fbba23 | ||
|
|
4324d2cf23 | ||
|
|
8bf4b08540 | ||
|
|
519002ff91 | ||
|
|
3666764226 | ||
|
|
c4cbe6e4e9 | ||
|
|
15b7d4b5e4 | ||
|
|
d2378bf66c | ||
|
|
aff514fa86 | ||
|
|
640f2e8cdc | ||
|
|
dfa2544b6c | ||
|
|
3200f0345a | ||
|
|
e215762942 |
@@ -32,6 +32,9 @@ POSTGRES_PASSWORD=magical_password
|
|||||||
POSTGRES_DB=calendso
|
POSTGRES_DB=calendso
|
||||||
DATABASE_HOST=database:5432
|
DATABASE_HOST=database:5432
|
||||||
DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${DATABASE_HOST}/${POSTGRES_DB}
|
DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${DATABASE_HOST}/${POSTGRES_DB}
|
||||||
|
# Needed to run migrations while using a connection pooler like PgBouncer
|
||||||
|
# Use the same one as DATABASE_URL if you're not using a connection pooler
|
||||||
|
DATABASE_DIRECT_URL=${DATABASE_URL}
|
||||||
GOOGLE_API_CREDENTIALS={}
|
GOOGLE_API_CREDENTIALS={}
|
||||||
|
|
||||||
# Set this to '1' if you don't want Cal to collect anonymous usage
|
# Set this to '1' if you don't want Cal to collect anonymous usage
|
||||||
|
|||||||
@@ -121,6 +121,7 @@ jobs:
|
|||||||
NEXT_PUBLIC_LICENSE_CONSENT=${{ env.NEXT_PUBLIC_LICENSE_CONSENT }}
|
NEXT_PUBLIC_LICENSE_CONSENT=${{ env.NEXT_PUBLIC_LICENSE_CONSENT }}
|
||||||
NEXT_PUBLIC_TELEMETRY_KEY=${{ env.NEXT_PUBLIC_TELEMETRY_KEY }}
|
NEXT_PUBLIC_TELEMETRY_KEY=${{ env.NEXT_PUBLIC_TELEMETRY_KEY }}
|
||||||
DATABASE_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@${{ env.DATABASE_HOST }}/${{ env.POSTGRES_DB }}
|
DATABASE_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@${{ env.DATABASE_HOST }}/${{ env.POSTGRES_DB }}
|
||||||
|
DATABASE_DIRECT_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@${{ env.DATABASE_HOST }}/${{ env.POSTGRES_DB }}
|
||||||
|
|
||||||
- name: Test runtime
|
- name: Test runtime
|
||||||
run: |
|
run: |
|
||||||
@@ -131,6 +132,7 @@ jobs:
|
|||||||
docker run --rm --network stack \
|
docker run --rm --network stack \
|
||||||
-p 3000:3000 \
|
-p 3000:3000 \
|
||||||
-e DATABASE_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@database/${{ env.POSTGRES_DB }} \
|
-e DATABASE_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@database/${{ env.POSTGRES_DB }} \
|
||||||
|
-e DATABASE_DIRECT_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@database/${{ env.POSTGRES_DB }} \
|
||||||
-e NEXTAUTH_SECRET=${{ env.NEXTAUTH_SECRET }} \
|
-e NEXTAUTH_SECRET=${{ env.NEXTAUTH_SECRET }} \
|
||||||
-e CALENDSO_ENCRYPTION_KEY=${{ env.CALENDSO_ENCRYPTION_KEY }} \
|
-e CALENDSO_ENCRYPTION_KEY=${{ env.CALENDSO_ENCRYPTION_KEY }} \
|
||||||
$tag &
|
$tag &
|
||||||
@@ -187,6 +189,7 @@ jobs:
|
|||||||
NEXT_PUBLIC_LICENSE_CONSENT=${{ env.NEXT_PUBLIC_LICENSE_CONSENT }}
|
NEXT_PUBLIC_LICENSE_CONSENT=${{ env.NEXT_PUBLIC_LICENSE_CONSENT }}
|
||||||
NEXT_PUBLIC_TELEMETRY_KEY=${{ env.NEXT_PUBLIC_TELEMETRY_KEY }}
|
NEXT_PUBLIC_TELEMETRY_KEY=${{ env.NEXT_PUBLIC_TELEMETRY_KEY }}
|
||||||
DATABASE_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@${{ env.DATABASE_HOST }}/${{ env.POSTGRES_DB }}
|
DATABASE_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@${{ env.DATABASE_HOST }}/${{ env.POSTGRES_DB }}
|
||||||
|
DATABASE_DIRECT_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@${{ env.DATABASE_HOST }}/${{ env.POSTGRES_DB }}
|
||||||
if: ${{ !github.event.release.prerelease }}
|
if: ${{ !github.event.release.prerelease }}
|
||||||
|
|
||||||
- name: Image digest
|
- name: Image digest
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ ENV NEXT_PUBLIC_WEBAPP_URL=http://NEXT_PUBLIC_WEBAPP_URL_PLACEHOLDER \
|
|||||||
NEXT_PUBLIC_LICENSE_CONSENT=$NEXT_PUBLIC_LICENSE_CONSENT \
|
NEXT_PUBLIC_LICENSE_CONSENT=$NEXT_PUBLIC_LICENSE_CONSENT \
|
||||||
CALCOM_TELEMETRY_DISABLED=$CALCOM_TELEMETRY_DISABLED \
|
CALCOM_TELEMETRY_DISABLED=$CALCOM_TELEMETRY_DISABLED \
|
||||||
DATABASE_URL=$DATABASE_URL \
|
DATABASE_URL=$DATABASE_URL \
|
||||||
|
DATABASE_DIRECT_URL=$DATABASE_URL \
|
||||||
NEXTAUTH_SECRET=${NEXTAUTH_SECRET} \
|
NEXTAUTH_SECRET=${NEXTAUTH_SECRET} \
|
||||||
CALENDSO_ENCRYPTION_KEY=${CALENDSO_ENCRYPTION_KEY} \
|
CALENDSO_ENCRYPTION_KEY=${CALENDSO_ENCRYPTION_KEY} \
|
||||||
NODE_OPTIONS=--max-old-space-size=${MAX_OLD_SPACE_SIZE}
|
NODE_OPTIONS=--max-old-space-size=${MAX_OLD_SPACE_SIZE}
|
||||||
|
|||||||
@@ -206,7 +206,8 @@ These variables must also be provided at runtime
|
|||||||
| NEXTAUTH_URL | Location of the auth server. By default, this is the Cal.com docker instance itself. | optional | `{NEXT_PUBLIC_WEBAPP_URL}/api/auth` |
|
| NEXTAUTH_URL | Location of the auth server. By default, this is the Cal.com docker instance itself. | optional | `{NEXT_PUBLIC_WEBAPP_URL}/api/auth` |
|
||||||
| NEXTAUTH_SECRET | must match build variable | required | `secret` |
|
| NEXTAUTH_SECRET | must match build variable | required | `secret` |
|
||||||
| CALENDSO_ENCRYPTION_KEY | must match build variable | required | `secret` |
|
| CALENDSO_ENCRYPTION_KEY | must match build variable | required | `secret` |
|
||||||
| DATABASE_URL | database url with credentials | required | `postgresql://unicorn_user:magical_password@database:5432/calendso` |
|
| DATABASE_URL | database url with credentials - if using a connection pooler, this setting should point there | required | `postgresql://unicorn_user:magical_password@database:5432/calendso` |
|
||||||
|
| DATABASE_DIRECT_URL | direct database url with credentials if using a connection pooler (e.g. PgBouncer, Prisma Accelerate, etc.) | optional | |
|
||||||
|
|
||||||
### Build-time variables
|
### Build-time variables
|
||||||
|
|
||||||
@@ -219,7 +220,8 @@ Updating these variables is not required for evaluation, but is required for run
|
|||||||
| NEXT_PUBLIC_WEBAPP_URL | Base URL injected into static files | optional | `http://localhost:3000` |
|
| NEXT_PUBLIC_WEBAPP_URL | Base URL injected into static files | optional | `http://localhost:3000` |
|
||||||
| NEXT_PUBLIC_LICENSE_CONSENT | license consent - true/false | | |
|
| NEXT_PUBLIC_LICENSE_CONSENT | license consent - true/false | | |
|
||||||
| CALCOM_TELEMETRY_DISABLED | Allow cal.com to collect anonymous usage data (set to `1` to disable) | | |
|
| CALCOM_TELEMETRY_DISABLED | Allow cal.com to collect anonymous usage data (set to `1` to disable) | | |
|
||||||
| DATABASE_URL | database url with credentials | required | `postgresql://unicorn_user:magical_password@database:5432/calendso` |
|
| DATABASE_URL | database url with credentials - if using a connection pooler, this setting should point there | required | `postgresql://unicorn_user:magical_password@database:5432/calendso` |
|
||||||
|
| DATABASE_DIRECT_URL | direct database url with credentials if using a connection pooler (e.g. PgBouncer, Prisma Accelerate, etc.) | optional | |
|
||||||
| NEXTAUTH_SECRET | Cookie encryption key | required | `secret` |
|
| NEXTAUTH_SECRET | Cookie encryption key | required | `secret` |
|
||||||
| CALENDSO_ENCRYPTION_KEY | Authentication encryption key | required | `secret` |
|
| CALENDSO_ENCRYPTION_KEY | Authentication encryption key | required | `secret` |
|
||||||
|
|
||||||
|
|||||||
2
calcom
2
calcom
Submodule calcom updated: 30ba168fc3...6d53cd84f8
@@ -32,6 +32,7 @@ services:
|
|||||||
NEXTAUTH_SECRET: ${NEXTAUTH_SECRET}
|
NEXTAUTH_SECRET: ${NEXTAUTH_SECRET}
|
||||||
CALENDSO_ENCRYPTION_KEY: ${CALENDSO_ENCRYPTION_KEY}
|
CALENDSO_ENCRYPTION_KEY: ${CALENDSO_ENCRYPTION_KEY}
|
||||||
DATABASE_URL: ${DATABASE_URL}
|
DATABASE_URL: ${DATABASE_URL}
|
||||||
|
DATABASE_DIRECT_URL: ${DATABASE_URL}
|
||||||
network: stack
|
network: stack
|
||||||
restart: always
|
restart: always
|
||||||
networks:
|
networks:
|
||||||
@@ -41,6 +42,7 @@ services:
|
|||||||
env_file: .env
|
env_file: .env
|
||||||
environment:
|
environment:
|
||||||
- DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${DATABASE_HOST}/${POSTGRES_DB}
|
- DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${DATABASE_HOST}/${POSTGRES_DB}
|
||||||
|
- DATABASE_DIRECT_URL=${DATABASE_URL}
|
||||||
depends_on:
|
depends_on:
|
||||||
- database
|
- database
|
||||||
|
|
||||||
@@ -55,6 +57,7 @@ services:
|
|||||||
env_file: .env
|
env_file: .env
|
||||||
environment:
|
environment:
|
||||||
- DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${DATABASE_HOST}/${POSTGRES_DB}
|
- DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${DATABASE_HOST}/${POSTGRES_DB}
|
||||||
|
- DATABASE_DIRECT_URL=${DATABASE_URL}
|
||||||
depends_on:
|
depends_on:
|
||||||
- database
|
- database
|
||||||
command:
|
command:
|
||||||
|
|||||||
Reference in New Issue
Block a user