Compare commits

...

94 Commits

Author SHA1 Message Date
actions-user
1726216896 tag version Cal.com version v5.2.12 2025-05-07 19:36:10 +00:00
actions-user
d7b9851d29 Auto updated submodule references 2025-05-07 04:06:28 +00:00
actions-user
9ccc13f524 Auto updated submodule references 2025-05-06 04:06:24 +00:00
Peer Richelsen
5f7a6ce637 Merge pull request #432 from creyD/patch-1 2025-05-05 15:39:24 +01:00
Conrad
87a2f7bc50 fix: adressed docker warnings 2025-05-05 10:51:54 +02:00
actions-user
1ce3e40476 Auto updated submodule references 2025-05-05 04:07:24 +00:00
actions-user
0e40ef9686 Auto updated submodule references 2025-05-03 04:05:42 +00:00
actions-user
6fd9f27bff Auto updated submodule references 2025-05-02 04:06:21 +00:00
actions-user
573a462e8d Auto updated submodule references 2025-05-01 04:09:12 +00:00
Peer Richelsen
0ef4ff6acc Merge pull request #381 from mokkin/patch-2 2025-04-30 18:41:50 +01:00
Peer Richelsen
50dc054e16 Merge pull request #380 from dvusboy/replace-placeholder-speedup 2025-04-30 18:41:25 +01:00
Peer Richelsen
88f5c5507d Merge pull request #427 from justinb-dfw/main 2025-04-30 18:36:17 +01:00
Peer Richelsen
dc14d4e4fd Merge pull request #429 from nnethery/GHA-dockerfile-patch 2025-04-30 18:36:02 +01:00
actions-user
fd3bf3b54d Auto updated submodule references 2025-04-30 04:06:22 +00:00
actions-user
11795cb920 Auto updated submodule references 2025-04-29 04:06:17 +00:00
actions-user
3d72150f36 Auto updated submodule references 2025-04-28 04:06:36 +00:00
actions-user
4a5f8e2ee8 Auto updated submodule references 2025-04-27 04:05:55 +00:00
actions-user
85e5fb426b Auto updated submodule references 2025-04-26 04:05:49 +00:00
actions-user
c9feaeade4 Auto updated submodule references 2025-04-25 04:06:24 +00:00
actions-user
41dfc814a1 Auto updated submodule references 2025-04-24 04:06:29 +00:00
actions-user
5517d5bea3 Auto updated submodule references 2025-04-23 04:06:23 +00:00
actions-user
7d4c6263ce Auto updated submodule references 2025-04-22 04:06:07 +00:00
actions-user
3dab184c3c Auto updated submodule references 2025-04-21 04:06:30 +00:00
actions-user
0c3e5c7b75 Auto updated submodule references 2025-04-20 04:05:46 +00:00
actions-user
9721b2b32e Auto updated submodule references 2025-04-19 04:05:41 +00:00
actions-user
7c899622b5 Auto updated submodule references 2025-04-18 04:06:09 +00:00
5bd7a1e636 Fix GHA docker builds 2025-04-17 19:51:32 -06:00
actions-user
cca794f103 Auto updated submodule references 2025-04-17 04:06:16 +00:00
actions-user
9908a2a945 Auto updated submodule references 2025-04-16 04:06:13 +00:00
justinbowenraya
6da2131c5f Update README.md 2025-04-15 12:06:42 -05:00
actions-user
abe271f0c9 Auto updated submodule references 2025-04-15 04:06:25 +00:00
actions-user
513748fb2e Auto updated submodule references 2025-04-13 04:31:17 +00:00
actions-user
4f394b2b8b Auto updated submodule references 2025-04-12 04:05:48 +00:00
actions-user
1580fa106c Auto updated submodule references 2025-04-11 04:06:20 +00:00
Peer Richelsen
3bc7c85842 Merge pull request #378 from nicostuhlfauth/main 2025-04-10 21:10:56 +02:00
Peer Richelsen
d3d720e982 Merge pull request #419 from unknown7703/renderyml_fix 2025-04-10 21:07:26 +02:00
actions-user
bac2ceb902 Auto updated submodule references 2025-04-10 04:06:19 +00:00
actions-user
14cb4d8206 Auto updated submodule references 2025-04-09 04:06:15 +00:00
actions-user
5dd3e7693d Auto updated submodule references 2025-04-08 04:06:10 +00:00
actions-user
0743108903 Auto updated submodule references 2025-04-07 04:06:14 +00:00
actions-user
b558ea9de2 Auto updated submodule references 2025-04-06 04:05:37 +00:00
actions-user
00ef51583d Auto updated submodule references 2025-04-05 04:05:36 +00:00
actions-user
dad9b467a1 Auto updated submodule references 2025-04-04 04:06:05 +00:00
actions-user
6c809a245a Auto updated submodule references 2025-04-03 04:06:20 +00:00
actions-user
782b3b6ef4 Auto updated submodule references 2025-04-02 04:06:01 +00:00
actions-user
3731f79161 Auto updated submodule references 2025-04-01 04:06:55 +00:00
actions-user
cd960074f7 Auto updated submodule references 2025-03-31 04:06:19 +00:00
actions-user
b953320385 Auto updated submodule references 2025-03-30 04:05:35 +00:00
actions-user
6f52eccc8d Auto updated submodule references 2025-03-29 04:05:42 +00:00
actions-user
057cb84882 Auto updated submodule references 2025-03-28 04:05:53 +00:00
actions-user
df57468382 Auto updated submodule references 2025-03-27 04:05:58 +00:00
actions-user
e5a749e98f Auto updated submodule references 2025-03-26 04:06:14 +00:00
actions-user
7cc329a4db Auto updated submodule references 2025-03-25 04:06:14 +00:00
actions-user
dd17a75674 Auto updated submodule references 2025-03-24 04:06:16 +00:00
actions-user
27354422ce Auto updated submodule references 2025-03-23 04:05:34 +00:00
actions-user
fd95e1ea1a Auto updated submodule references 2025-03-22 04:05:30 +00:00
actions-user
689173aad3 Auto updated submodule references 2025-03-21 04:06:03 +00:00
actions-user
cbb2742c01 Auto updated submodule references 2025-03-20 04:05:51 +00:00
actions-user
0ee82978fd Auto updated submodule references 2025-03-19 04:05:44 +00:00
actions-user
744c8b70d8 Auto updated submodule references 2025-03-18 04:06:04 +00:00
actions-user
e56114742e Auto updated submodule references 2025-03-17 04:06:20 +00:00
actions-user
da3d4c63f6 Auto updated submodule references 2025-03-16 04:05:23 +00:00
actions-user
1a5378932e Auto updated submodule references 2025-03-15 04:05:32 +00:00
actions-user
09aa825856 Auto updated submodule references 2025-03-14 04:05:45 +00:00
actions-user
3c5f2abee7 Auto updated submodule references 2025-03-13 04:06:05 +00:00
actions-user
aa39828980 Auto updated submodule references 2025-03-12 04:06:14 +00:00
actions-user
23cd49150a Auto updated submodule references 2025-03-11 04:05:46 +00:00
actions-user
0e389cb966 Auto updated submodule references 2025-03-10 04:05:16 +00:00
actions-user
8e5c28328c Auto updated submodule references 2025-03-09 04:04:41 +00:00
actions-user
ed05ae211e Auto updated submodule references 2025-03-08 04:05:03 +00:00
actions-user
96697981eb Auto updated submodule references 2025-03-07 04:05:50 +00:00
Aatreya
3589df075e fix: updated database plan name 2025-03-06 13:11:21 +05:30
actions-user
6bba996689 Auto updated submodule references 2025-03-06 04:05:45 +00:00
actions-user
86430ad2c2 Auto updated submodule references 2025-03-05 04:05:43 +00:00
actions-user
35f15d52f4 Auto updated submodule references 2025-03-04 04:05:45 +00:00
actions-user
9ea271140d Auto updated submodule references 2025-03-03 04:06:18 +00:00
actions-user
24bfe49499 Auto updated submodule references 2025-03-02 04:05:35 +00:00
actions-user
4bdf45d95d Auto updated submodule references 2025-03-01 04:05:35 +00:00
actions-user
435a008678 Auto updated submodule references 2025-02-28 04:06:04 +00:00
actions-user
9ec399714d Auto updated submodule references 2025-02-27 04:05:52 +00:00
actions-user
6e4f70891a Auto updated submodule references 2025-02-26 04:05:49 +00:00
actions-user
1d4cbf9567 Auto updated submodule references 2025-02-25 04:05:43 +00:00
actions-user
f7c83c837f Auto updated submodule references 2025-02-24 04:06:00 +00:00
actions-user
debc2edecd Auto updated submodule references 2025-02-23 04:05:35 +00:00
actions-user
2b2ccfb356 Auto updated submodule references 2025-02-22 04:06:06 +00:00
actions-user
bd9e116745 Auto updated submodule references 2025-02-21 04:06:01 +00:00
actions-user
1c7476a152 Auto updated submodule references 2025-02-20 04:05:34 +00:00
actions-user
159b3e2356 Auto updated submodule references 2025-02-19 04:05:34 +00:00
actions-user
79e4539e01 Auto updated submodule references 2025-02-18 04:05:48 +00:00
actions-user
df60908bbc Auto updated submodule references 2025-02-17 04:06:12 +00:00
actions-user
383975f0f9 Auto updated submodule references 2025-02-16 04:05:29 +00:00
mokkin
97be50b673 version is obsolete 2024-09-24 11:58:50 +02:00
K.C. Wong
7a298b2de3 Update replace-placeholder.sh
Speed up the replacement loop

* only look at files with "$FROM" pattern
2024-09-20 17:34:28 -07:00
Nicolas Stuhlfauth
137cc0d59c chore: Add EMAIL_FROM_NAME to .env.example 2024-09-18 19:51:37 +02:00
7 changed files with 13 additions and 13 deletions

View File

@@ -51,6 +51,7 @@ ZOOM_CLIENT_SECRET=
# E-mail settings # E-mail settings
# Configures the global From: header whilst sending emails. # Configures the global From: header whilst sending emails.
EMAIL_FROM_NAME=YourOrganizationName
EMAIL_FROM=notifications@example.com EMAIL_FROM=notifications@example.com
# Configure SMTP settings (@see https://nodemailer.com/smtp/). # Configure SMTP settings (@see https://nodemailer.com/smtp/).

View File

@@ -1,4 +1,4 @@
FROM node:18 as builder FROM node:18 AS builder
WORKDIR /calcom WORKDIR /calcom
@@ -29,11 +29,12 @@ COPY calcom/packages ./packages
COPY calcom/tests ./tests COPY calcom/tests ./tests
RUN yarn config set httpTimeout 1200000 RUN yarn config set httpTimeout 1200000
RUN npx turbo prune --scope=@calcom/web --docker RUN npx turbo prune --scope=@calcom/web --scope=@calcom/trpc --docker
RUN yarn install RUN yarn install
RUN yarn db-deploy RUN yarn db-deploy
RUN yarn --cwd packages/prisma seed-app-store RUN yarn --cwd packages/prisma seed-app-store
# Build and make embed servable from web/public/embed folder # Build and make embed servable from web/public/embed folder
RUN yarn workspace @calcom/trpc run build
RUN yarn --cwd packages/embeds/embed-core workspace @calcom/embed-core run build RUN yarn --cwd packages/embeds/embed-core workspace @calcom/embed-core run build
RUN yarn --cwd apps/web workspace @calcom/web run build RUN yarn --cwd apps/web workspace @calcom/web run build
@@ -41,12 +42,12 @@ RUN yarn --cwd apps/web workspace @calcom/web run build
# yarn workspaces focus --all --production # yarn workspaces focus --all --production
RUN rm -rf node_modules/.cache .yarn/cache apps/web/.next/cache RUN rm -rf node_modules/.cache .yarn/cache apps/web/.next/cache
FROM node:18 as builder-two FROM node:18 AS builder-two
WORKDIR /calcom WORKDIR /calcom
ARG NEXT_PUBLIC_WEBAPP_URL=http://localhost:3000 ARG NEXT_PUBLIC_WEBAPP_URL=http://localhost:3000
ENV NODE_ENV production ENV NODE_ENV=production
COPY calcom/package.json calcom/.yarnrc.yml calcom/turbo.json calcom/i18n.json ./ COPY calcom/package.json calcom/.yarnrc.yml calcom/turbo.json calcom/i18n.json ./
COPY calcom/.yarn ./.yarn COPY calcom/.yarn ./.yarn
@@ -64,7 +65,7 @@ ENV NEXT_PUBLIC_WEBAPP_URL=$NEXT_PUBLIC_WEBAPP_URL \
RUN scripts/replace-placeholder.sh http://NEXT_PUBLIC_WEBAPP_URL_PLACEHOLDER ${NEXT_PUBLIC_WEBAPP_URL} RUN scripts/replace-placeholder.sh http://NEXT_PUBLIC_WEBAPP_URL_PLACEHOLDER ${NEXT_PUBLIC_WEBAPP_URL}
FROM node:18 as runner FROM node:18 AS runner
WORKDIR /calcom WORKDIR /calcom
@@ -73,7 +74,7 @@ ARG NEXT_PUBLIC_WEBAPP_URL=http://localhost:3000
ENV NEXT_PUBLIC_WEBAPP_URL=$NEXT_PUBLIC_WEBAPP_URL \ ENV NEXT_PUBLIC_WEBAPP_URL=$NEXT_PUBLIC_WEBAPP_URL \
BUILT_NEXT_PUBLIC_WEBAPP_URL=$NEXT_PUBLIC_WEBAPP_URL BUILT_NEXT_PUBLIC_WEBAPP_URL=$NEXT_PUBLIC_WEBAPP_URL
ENV NODE_ENV production ENV NODE_ENV=production
EXPOSE 3000 EXPOSE 3000
HEALTHCHECK --interval=30s --timeout=30s --retries=5 \ HEALTHCHECK --interval=30s --timeout=30s --retries=5 \

View File

@@ -52,7 +52,7 @@ If you are evaluating Cal.com or running with minimal to no modifications, this
1. Clone calcom/docker 1. Clone calcom/docker
```bash ```bash
git clone https://github.com/calcom/docker.git git clone --recursive https://github.com/calcom/docker.git
``` ```
2. Change into the directory 2. Change into the directory

2
calcom

Submodule calcom updated: 5d709cf63c...4a96be4175

View File

@@ -1,5 +1,4 @@
# Use postgres/example user/password credentials # Use postgres/example user/password credentials
version: '3.8'
volumes: volumes:
database-data: database-data:

View File

@@ -23,4 +23,4 @@ services:
databases: databases:
- name: cal-postgres - name: cal-postgres
plan: starter plan: basic-1gb

View File

@@ -10,7 +10,6 @@ fi
# Only peform action if $FROM and $TO are different. # Only peform action if $FROM and $TO are different.
echo "Replacing all statically built instances of $FROM with $TO." echo "Replacing all statically built instances of $FROM with $TO."
find apps/web/.next/ apps/web/public -type f | for file in $(egrep -r -l "${FROM}" apps/web/.next/ apps/web/public/); do
while read file; do sed -i -e "s|$FROM|$TO|g" "$file"
sed -i "s|$FROM|$TO|g" "$file"
done done