Skip to content

Commit 10b116d

Browse files
committed
feat: update calendso
1 parent 4cc7938 commit 10b116d

File tree

2 files changed

+24
-8
lines changed

2 files changed

+24
-8
lines changed

stacks/calendso.yml

+10-7
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,17 @@
22

33
x-calendso: &calendso
44
environment:
5+
- VERSION=${VERSION:-v4.7.8}
56
- NODE_ENV=production
67
- POSTGRES_USER=calendso
78
- POSTGRES_PASSWORD=myp@ssw0rd
89
- POSTGRES_DB=calendso
910
- DATABASE_URL=postgresql://calendso:myp@ssw0rd@postgres:5432/calendso
1011
- NEXT_PUBLIC_WEBAPP_URL=${SCHEME:-https}://${DOMAIN:-calendso.localhost}
1112
- NEXT_PUBLIC_WEBSITE_URL=${SCHEME:-https}://${DOMAIN:-calendso.localhost}
13+
- NEXT_PUBLIC_API_V2_URL=${SCHEME:-https}://${DOMAIN:-calendso.localhost}/api/v2
1214
- NEXTAUTH_URL=${SCHEME:-https}://${DOMAIN:-calendso.localhost}
13-
- NEXTAUTH_SECRET=${NEXTAUTH_SECRET:-mys3cr3t} # openssl rand -base64 32
15+
- NEXTAUTH_SECRET=${NEXTAUTH_SECRET:-mys3cr3t} # openssl rand -base64 32
1416
- NEXT_PUBLIC_IS_E2E=true
1517
- MS_GRAPH_CLIENT_ID=${MS_GRAPH_CLIENT_ID}
1618
- MS_GRAPH_CLIENT_SECRET=${MS_GRAPH_CLIENT_SECRET}
@@ -21,7 +23,7 @@ x-calendso: &calendso
2123
- EMAIL_SERVER_PORT=${SMTP_PORT:-587}
2224
- EMAIL_SERVER_USER=${SMTP_USER:-email_user}
2325
- EMAIL_SERVER_PASSWORD=${SMTP_PASSWORD:-password}
24-
- CALENDSO_ENCRYPTION_KEY=${CALENDSO_ENCRYPTION_KEY:-mys3cr3t} # openssl rand -base64 24
26+
- CALENDSO_ENCRYPTION_KEY=${CALENDSO_ENCRYPTION_KEY:-mys3cr3t} # openssl rand -base64 24
2527
- CALCOM_TELEMETRY_DISABLED=${CALCOM_TELEMETRY_DISABLED:-1}
2628
- GOOGLE_API_CREDENTIALS=${GOOGLE_API_CREDENTIALS}
2729
- STACK_NAME={{ index .Service.Labels "com.docker.stack.namespace" }}
@@ -35,15 +37,16 @@ services:
3537
command:
3638
- -c
3739
- |
38-
docker image inspect calendso:$${DOMAIN} && exit 0
40+
docker image inspect calendso:$${DOMAIN} && exit 0 > /dev/null 2>&1
3941
apk add git
4042
git clone https://github.com/calcom/docker
4143
cd docker
44+
git checkout $${VERSION}
4245
git submodule update --init
43-
sed -i -e 's/session.data.hasValidLicense/true/g' calcom/packages/features/ee/common/components/v2/LicenseRequired.tsx
44-
sed -i -e 's/cal.com/'$$DOMAIN'/g' calcom/packages/features/ee/teams/pages/team-profile-view.tsx
45-
docker build \
46+
sed -i -e 's/session.data.hasValidLicense/true/g' calcom/packages/features/ee/common/components/LicenseRequired.tsx
47+
DOCKER_BUILDKIT=0 docker build \
4648
--build-arg NEXT_PUBLIC_WEBAPP_URL=$${NEXT_PUBLIC_WEBAPP_URL} \
49+
--build-arg NEXT_PUBLIC_API_V2_URL=$${NEXT_PUBLIC_API_V2_URL} \
4750
--build-arg CALCOM_TELEMETRY_DISABLED=$${CALCOM_TELEMETRY_DISABLED} \
4851
--build-arg NEXTAUTH_SECRET=$${NEXTAUTH_SECRET} \
4952
--build-arg CALENDSO_ENCRYPTION_KEY=$${CALENDSO_ENCRYPTION_KEY} \
@@ -74,7 +77,7 @@ services:
7477
- traefik
7578

7679
postgres:
77-
image: postgres:12-alpine
80+
image: postgres:14-alpine
7881
environment:
7982
- POSTGRES_DB=calendso
8083
- POSTGRES_USER=calendso

templates.json

+14-1
Original file line numberDiff line numberDiff line change
@@ -602,6 +602,7 @@
602602
"title": "Calendso",
603603
"description": "Alternative open-source à Calendly",
604604
"categories": ["Calendar"],
605+
"manual": true,
605606
"enabled": true,
606607
"trial": 7,
607608
"price": 19,
@@ -612,6 +613,18 @@
612613
"stackfile": "stacks/calendso.yml"
613614
},
614615
"env": [
616+
{
617+
"name": "ADMIN_EMAIL",
618+
"label": "Admin Email",
619+
"type": "email",
620+
"disabled": true
621+
},
622+
{
623+
"name": "ADMIN_PASSWORD",
624+
"label": "Admin password",
625+
"type": "password",
626+
"disabled": true
627+
},
615628
{
616629
"name": "SMTP_HOST",
617630
"label": "SMTP Host"
@@ -633,7 +646,7 @@
633646
{
634647
"name": "SMTP_PORT",
635648
"label": "SMTP Port",
636-
"value": 587,
649+
"value": "587",
637650
"type": "number"
638651
}
639652
]

0 commit comments

Comments
 (0)