Auto updated submodule references

fix: Test runtime issue with Docker container

.env.example

@@ -13,6 +13,10 @@ LICENSE=
 # NEXT_PUBLIC_APP_URL=http://localhost:3000
 
 NEXT_PUBLIC_WEBAPP_URL=http://localhost:3000
+NEXT_PUBLIC_API_V2_URL=http://localhost:5555/api/v2
+
+# Configure NEXTAUTH_URL manually if needed, otherwise it will resolve to {NEXT_PUBLIC_WEBAPP_URL}/api/auth
+# NEXTAUTH_URL=http://localhost:3000/api/auth
 
 # It is highly recommended that the NEXTAUTH_SECRET must be overridden and very unique
 # Use `openssl rand -base64 32` to generate a key
@@ -29,6 +33,9 @@ POSTGRES_PASSWORD=magical_password
 POSTGRES_DB=calendso
 DATABASE_HOST=database:5432
 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={}
 
 # Set this to '1' if you don't want Cal to collect anonymous usage
@@ -44,6 +51,7 @@ ZOOM_CLIENT_SECRET=
 
 # E-mail settings
 # Configures the global From: header whilst sending emails.
+EMAIL_FROM_NAME=YourOrganizationName
 EMAIL_FROM=notifications@example.com
 
 # Configure SMTP settings (@see https://nodemailer.com/smtp/).

.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+updates:
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/create-release-from-commit.yaml

@@ -0,0 +1,64 @@
+name: "Create Release Tag"
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'The new release tag to create (e.g., v3.8.1)'
+        required: true
+        type: string
+      commit_sha:
+        description: 'The short commit SHA from the calcom submodule to use for this release'
+        required: true
+        type: string
+
+jobs:
+  release:
+    name: "Tag Release"
+    runs-on: "ubuntu-latest"
+
+    steps:
+      - name: "Checkout main branch to get starting point"
+        uses: "actions/checkout@v4"
+        with:
+          token: ${{ secrets.TOKEN_GITEA }}
+          # We check out main, but will create the release commit off of it
+          # without modifying the branch itself.
+          ref: 'main' 
+          submodules: true
+
+      - name: "Create Release Commit and Tag"
+        run: |
+          # Configure git user for the commit
+          git config user.email "actions@gitea.local"
+          git config user.name "Gitea Actions"
+
+          echo "Updating submodule to commit ${{ inputs.commit_sha }}..."
+          
+          # Navigate into the submodule, fetch latest history, and check out the specific commit.
+          # This modifies the submodule's checked-out version in the working directory.
+          cd calcom
+          git fetch origin
+          git checkout ${{ inputs.commit_sha }}
+          cd ..
+
+          # Stage the change to the submodule pointer.
+          git add calcom
+
+          # Create a NEW commit. This commit is NOT on the main branch.
+          # It's a "dangling" commit that only HEAD is pointing to at this moment.
+          # The parent of this new commit is the latest commit from 'main'.
+          git commit -m "release: Version ${{ inputs.version }} with calcom at ${{ inputs.commit_sha }}"
+
+          # Get the full SHA of the new commit we just created.
+          NEW_COMMIT_SHA=$(git rev-parse HEAD)
+          echo "Created new release commit: $NEW_COMMIT_SHA"
+
+          echo "Creating and pushing tag ${{ inputs.version }}..."
+          
+          # Create an annotated tag pointing directly at our new, branchless commit.
+          git tag -a "${{ inputs.version }}" -m "Release ${{ inputs.version }}" $NEW_COMMIT_SHA
+          
+          # Push ONLY the new tag to the repository. Git will automatically send
+          # the required commit object ($NEW_COMMIT_SHA) along with the tag.
+          git push origin "${{ inputs.version }}"

.github/workflows/create-release.yaml

@@ -0,0 +1,77 @@
+name: "Create Gitea Release"
+
+# This workflow is triggered manually from the Gitea Actions UI
+on:
+  workflow_dispatch:
+    inputs:
+      RELEASE_TAG:
+        description: 'The release tag to create, formatted as v{Major}.{Minor}.{Patch}'
+        required: true
+
+jobs:
+  release:
+    name: "Release"
+    runs-on: "ubuntu-latest"
+
+    steps:
+      # Step 1: Check out the repository source code and its submodules.
+      # The TOKEN_GITEA is used here to grant permission for the later 'git push'.
+      - name: Checkout source
+        uses: "actions/checkout@v4"
+        with:
+          token: ${{ secrets.TOKEN_GITEA }}
+          submodules: true
+
+      # Step 2: Create a new release branch, update the submodule to the specified tag,
+      # and push the new branch to the Gitea repository.
+      - name: Create Branch and Update Submodule
+        run: |
+          # Configure git user for the commit
+          git config user.email "actions@gitea.local"
+          git config user.name "Gitea Actions"
+
+          # Create the new release branch
+          git checkout -b 'release-${{ inputs.RELEASE_TAG }}'
+
+          # Enter the submodule directory, fetch the latest tags, and check out the correct one.
+          # This points the submodule to the specific commit associated with the release tag.
+          (cd calcom && git fetch --tags origin && git checkout 'refs/tags/${{ inputs.RELEASE_TAG }}')
+
+          # Stage and commit the change to the submodule pointer
+          git add calcom
+          git commit -m "Update submodule to Cal.com version ${{ inputs.RELEASE_TAG }}"
+
+          # Push the newly created release branch to the remote Gitea repository
+          git push origin 'release-${{ inputs.RELEASE_TAG }}'
+
+      # Step 3: Call the Gitea API to create the official release object.
+      # This uses the same API token to authorize the action.
+      - name: "Create Gitea Release"
+        env:
+          GITEA_TOKEN: ${{ secrets.TOKEN_GITEA }}
+          GITEA_API_URL: https://git.nethery.dev/api/v1
+          OWNER: ${{ gitea.repository_owner }}
+          REPO: ${{ gitea.repository_name }}
+        run: |
+          # Determine if the tag indicates a pre-release
+          is_prerelease=false
+          if [[ "${{ inputs.RELEASE_TAG }}" == *"-rc"* || "${{ inputs.RELEASE_TAG }}" == *"-beta"* ]]; then
+            is_prerelease=true
+          fi
+
+          echo "Creating release ${{ inputs.RELEASE_TAG }}..."
+          echo "Is prerelease: $is_prerelease"
+
+          # Use curl to send a POST request to the Gitea API's 'create release' endpoint
+          curl --fail --silent --show-error -L -X POST \
+            -H "accept: application/json" \
+            -H "Authorization: token ${GITEA_TOKEN}" \
+            -H "Content-Type: application/json" \
+            "${GITEA_API_URL}/repos/${OWNER}/${REPO}/releases" \
+            -d '{
+              "tag_name": "${{ inputs.RELEASE_TAG }}",
+              "target_commitish": "release-${{ inputs.RELEASE_TAG }}",
+              "name": "${{ inputs.RELEASE_TAG }}",
+              "body": "For Cal.com release details, see: https://github.com/calcom/cal.com/releases/tag/${{ inputs.RELEASE_TAG }}",
+              "prerelease": '${is_prerelease}'
+            }'

.github/workflows/docker-build-push-dockerhub.yml

@@ -5,7 +5,10 @@ name: Build and push image to DockerHub
 # Controls when the workflow will run
 on:
   push:
-    branches: [main]
+    branches:
+      - 'main'
+    tags:
+      - 'v*'
   # update on run of Update Calendso nightly submodule update
   workflow_run:
     workflows: ["Update Calendso"]
@@ -14,15 +17,17 @@ on:
       - completed
   # Allow running workflow manually from the Actions tab
   workflow_dispatch:
+    # Uncomment below to allow specific version workflow run
+    # inputs:
+    #   version:
+    #     description: 'Version to build'
+    #     required: true
 
 # Leaving in example for releases. Initially we simply push to 'latest'
 # on:
   # release:
     # types: [ created ]
 
-  # # Allows you to run this workflow manually from the Actions tab
-  # workflow_dispatch:
-
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   # This workflow contains a single job called "build"
@@ -32,29 +37,52 @@ jobs:
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - name: Free Disk Space (Ubuntu)
+        uses: jlumbroso/free-disk-space@main
+        with:
+          # Free about 4.5 GB, elminating our disk space issues
+          tool-cache: true
+
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it, uncomment below
+      # - name: Checkout code at specified version
+      #   uses: actions/checkout@v2
+      #   with:
+      #     ref: ${{ github.event.inputs.version }}
+
+      - name: Base requirements
+        run: |
+          # packages
+          apk update && apk add --no-cache git docker docker-compose nodejs gpg openssh npm ansible
+
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Git submodule update
         run: |
           git submodule update --init
 
-      - name: Docker Login
+      - name: Log in to the Docker Hub registry
-      # You may pin to the exact commit or the version.
+        uses: docker/login-action@v3
-      # uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
-        uses: docker/login-action@v1.10.0
         with:
-          # Username used to log against the Docker registry
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          # Password or personal access token used to log against the Docker registry
           password: ${{ secrets.DOCKER_HUB_TOKEN }}
-          # Log out from the Docker registry at the end of a job
-          logout: true # optional, default is true
 
-      - name: Set up Docker builder
+      - name: Log in to the Github Container registry
-        id: buildx
+        uses: docker/login-action@v3
-        uses: docker/setup-buildx-action@v1.6.0
+        with:
+          registry: ghcr.io
+          username: nnethery
+          password: ${{ secrets.GHCR_TOKEN }}
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ghcr.io/nnethery/cal.com
+            nnethery/cal.com
+          flavor: |
+            latest=${{ !github.event.release.prerelease }}
 
       - name: Copy env
         run: |
@@ -63,43 +91,108 @@ jobs:
           echo "DATABASE_HOST=localhost:5432" >> $GITHUB_ENV
           eval $(sed -e '/^#/d' -e 's/^/export /' -e 's/$/;/' .env) ;
 
-      - name: Set up QEMU
+      # Temporarily disable ARM build due to runner performance issues
-        uses: docker/setup-qemu-action@v2
 
       - name: Start database
         run: |
           docker compose up -d database
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
         with:
           driver-opts: |
             network=container:database
           buildkitd-flags: |
             --allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host
+#         config-inline: |
+#           [worker.oci]
+#             max-parallelism = 1
 
-      - name: Build and push image
+      - name: Build image
         id: docker_build
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
+        with:
+          context: ./
+          file: ./Dockerfile
+          load: true  # Load the image into the Docker daemon
+          push: false # Do not push the image at this stage
+          platforms: linux/arm64 # Changed from linux/amd64
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            NEXT_PUBLIC_WEBAPP_URL=${{ env.NEXT_PUBLIC_WEBAPP_URL }}
+            NEXT_PUBLIC_API_V2_URL=${{ env.NEXT_PUBLIC_API_V2_URL }}
+            NEXT_PUBLIC_LICENSE_CONSENT=${{ env.NEXT_PUBLIC_LICENSE_CONSENT }}
+            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_DIRECT_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@${{ env.DATABASE_HOST }}/${{ env.POSTGRES_DB }}
+
+      # - name: Test runtime
+      #   run: |
+      #     tags="${{ steps.meta.outputs.tags }}"
+      #     IFS=',' read -ra ADDR <<< "$tags"  # Convert string to array using ',' as delimiter
+      #     tag=${ADDR[0]}  # Get the first tag
+
+      #     docker run --rm --network stack \
+      #       -p 3000:3000 \
+      #       -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 CALENDSO_ENCRYPTION_KEY=${{ env.CALENDSO_ENCRYPTION_KEY }} \
+      #       $tag &
+
+      #       server_pid=$!
+
+
+      #       echo "Waiting for the server to start..."
+      #       sleep 120
+
+      #       echo ${{ env.NEXT_PUBLIC_WEBAPP_URL }}/auth/login
+
+      #       apk add curl
+
+      #       for i in {1..60}; do
+      #         echo "Checking server health ($i/60)..."
+      #         response=$(curl -o /dev/null -s -w "%{http_code}" ${{ env.NEXT_PUBLIC_WEBAPP_URL }}/auth/login)
+      #         echo "HTTP Status Code: $response"
+      #         if [[ "$response" == "200" ]] || [[ "$response" == "307" ]]; then
+      #           echo "Server is healthy"
+      #           # Now, shutdown the server
+      #           kill $server_pid
+      #           exit 0
+      #         fi
+      #         sleep 1
+      #       done
+
+      #       echo "Server health check failed"
+      #       kill $server_pid
+      #       exit 1
+      #   env:
+      #     NEXTAUTH_SECRET: 'EI4qqDpcfdvf4A+0aQEEx8JjHxHSy4uWiZw/F32K+pA='
+      #     CALENDSO_ENCRYPTION_KEY: '0zfLtY99wjeLnsM7qsa8xsT+Q0oSgnOL'
+
+      - name: Push image
+        id: docker_push
+        uses: docker/build-push-action@v5
         with:
           context: ./
           file: ./Dockerfile
           push: true
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/arm64 # Changed from linux/amd64
-          tags: docker.io/${{ secrets.DOCKER_HUB_USERNAME }}/calendso:latest
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
           build-args: |
             NEXT_PUBLIC_WEBAPP_URL=${{ env.NEXT_PUBLIC_WEBAPP_URL }}
+            NEXT_PUBLIC_API_V2_URL=${{ env.NEXT_PUBLIC_API_V2_URL }}
             NEXT_PUBLIC_LICENSE_CONSENT=${{ env.NEXT_PUBLIC_LICENSE_CONSENT }}
             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_DIRECT_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@${{ env.DATABASE_HOST }}/${{ env.POSTGRES_DB }}
+        if: ${{ !github.event.release.prerelease }}
 
-      # - name: Build with docker compose
+      - name: Image digest
-      #   run: |
+        run: echo ${{ steps.docker_build.outputs.digest }}
-      #     DOCKER_BUILDKIT=0 docker compose build --build-arg DATABASE_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@${{ env.DATABASE_HOST }}/${{ env.POSTGRES_DB }} calcom
 
       - name: Cleanup
         run: |
           docker compose down
-
-      - name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}

.github/workflows/update-submodules.yml

@@ -13,7 +13,7 @@ jobs:
         shell: bash
     steps:
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Git submodule update
         run: |

Dockerfile

@@ -1,49 +1,87 @@
-FROM node:16 as builder
+FROM node:18 AS builder
 
 WORKDIR /calcom
-ARG NEXT_PUBLIC_WEBAPP_URL=http://localhost:3000
+
-ARG NEXT_PUBLIC_APP_URL
 ARG NEXT_PUBLIC_LICENSE_CONSENT
+ARG NEXT_PUBLIC_WEBSITE_TERMS_URL
+ARG NEXT_PUBLIC_WEBSITE_PRIVACY_POLICY_URL
 ARG CALCOM_TELEMETRY_DISABLED
 ARG DATABASE_URL
 ARG NEXTAUTH_SECRET=secret
 ARG CALENDSO_ENCRYPTION_KEY=secret
 ARG MAX_OLD_SPACE_SIZE=4096
+ARG NEXT_PUBLIC_API_V2_URL
 
-ENV NEXT_PUBLIC_WEBAPP_URL=$NEXT_PUBLIC_WEBAPP_URL \
+ENV NEXT_PUBLIC_WEBAPP_URL=http://NEXT_PUBLIC_WEBAPP_URL_PLACEHOLDER \
-    NEXT_PUBLIC_APP_URL=$NEXT_PUBLIC_APP_URL \
+    NEXT_PUBLIC_API_V2_URL=$NEXT_PUBLIC_API_V2_URL \
     NEXT_PUBLIC_LICENSE_CONSENT=$NEXT_PUBLIC_LICENSE_CONSENT \
+    NEXT_PUBLIC_WEBSITE_TERMS_URL=$NEXT_PUBLIC_WEBSITE_TERMS_URL \
+    NEXT_PUBLIC_WEBSITE_PRIVACY_POLICY_URL=$NEXT_PUBLIC_WEBSITE_PRIVACY_POLICY_URL \
     CALCOM_TELEMETRY_DISABLED=$CALCOM_TELEMETRY_DISABLED \
     DATABASE_URL=$DATABASE_URL \
+    DATABASE_DIRECT_URL=$DATABASE_URL \
     NEXTAUTH_SECRET=${NEXTAUTH_SECRET} \
     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} \
+    BUILD_STANDALONE=true
 
-COPY calcom/package.json calcom/yarn.lock calcom/turbo.json ./
+COPY calcom/package.json calcom/yarn.lock calcom/.yarnrc.yml calcom/playwright.config.ts calcom/turbo.json calcom/i18n.json ./
+COPY calcom/.yarn ./.yarn
 COPY calcom/apps/web ./apps/web
+COPY calcom/apps/api/v2 ./apps/api/v2
 COPY calcom/packages ./packages
+COPY calcom/tests ./tests
 
-RUN yarn config set network-timeout 1000000000 -g && \ 
+RUN yarn config set httpTimeout 1200000
-    yarn install --frozen-lockfile
+RUN npx turbo prune --scope=@calcom/web --scope=@calcom/trpc --docker
+RUN yarn install
+RUN yarn db-deploy
+RUN yarn --cwd packages/prisma seed-app-store
+# 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 apps/web workspace @calcom/web run build
 
-RUN yarn build
+# RUN yarn plugin import workspace-tools && \
+#     yarn workspaces focus --all --production
+RUN rm -rf node_modules/.cache .yarn/cache apps/web/.next/cache
 
-FROM node:16 as runner
+FROM node:18 AS builder-two
 
 WORKDIR /calcom
-ENV NODE_ENV production
+ARG NEXT_PUBLIC_WEBAPP_URL=http://localhost:3000
 
-RUN apt-get update && \
+ENV NODE_ENV=production
-    apt-get -y install netcat && \
-    rm -rf /var/lib/apt/lists/* && \
-    npm install --global prisma
 
-COPY calcom/package.json calcom/yarn.lock calcom/turbo.json ./
+COPY calcom/package.json calcom/.yarnrc.yml calcom/turbo.json calcom/i18n.json ./
+COPY calcom/.yarn ./.yarn
+COPY --from=builder /calcom/yarn.lock ./yarn.lock
 COPY --from=builder /calcom/node_modules ./node_modules
 COPY --from=builder /calcom/packages ./packages
 COPY --from=builder /calcom/apps/web ./apps/web
 COPY --from=builder /calcom/packages/prisma/schema.prisma ./prisma/schema.prisma
 COPY scripts scripts
 
+# Save value used during this build stage. If NEXT_PUBLIC_WEBAPP_URL and BUILT_NEXT_PUBLIC_WEBAPP_URL differ at
+# run-time, then start.sh will find/replace static values again.
+ENV NEXT_PUBLIC_WEBAPP_URL=$NEXT_PUBLIC_WEBAPP_URL \
+    BUILT_NEXT_PUBLIC_WEBAPP_URL=$NEXT_PUBLIC_WEBAPP_URL
+
+RUN scripts/replace-placeholder.sh http://NEXT_PUBLIC_WEBAPP_URL_PLACEHOLDER ${NEXT_PUBLIC_WEBAPP_URL}
+
+FROM node:18 AS runner
+
+
+WORKDIR /calcom
+COPY --from=builder-two /calcom ./
+ARG NEXT_PUBLIC_WEBAPP_URL=http://localhost:3000
+ENV NEXT_PUBLIC_WEBAPP_URL=$NEXT_PUBLIC_WEBAPP_URL \
+    BUILT_NEXT_PUBLIC_WEBAPP_URL=$NEXT_PUBLIC_WEBAPP_URL
+
+ENV NODE_ENV=production
 EXPOSE 3000
+
+HEALTHCHECK --interval=30s --timeout=30s --retries=5 \
+    CMD wget --spider http://localhost:3000 || exit 1
+
 CMD ["/calcom/scripts/start.sh"]

Dockerfile.render

@@ -0,0 +1 @@
+FROM calcom.docker.scarf.sh/calcom/cal.com

README.md

@@ -1,18 +1,33 @@
 <!-- PROJECT LOGO -->
-<div align="right">
+<p align="center">
   <a href="https://github.com/calcom/cal.com">
-    <img src="https://cal.com/logo.svg" alt="Logo" width="160" height="65">
+    <img src="https://user-images.githubusercontent.com/8019099/133430653-24422d2a-3c8d-4052-9ad6-0580597151ee.png" alt="Logo">
-  </a><br/>
+
-  <a href="https://cal.com">Website</a>
+  </a>
-  ·
+
-  <a href="https://github.com/calcom/docker/issues">Community Support</a>
+  <h3 align="center">Cal.com (formerly Calendso)</h3>
-</div>
+
+  <p align="center">
+    The open-source Calendly alternative. (Docker Edition)
+    <br />
+    <a href="https://cal.com"><strong>Learn more »</strong></a>
+    <br />
+    <br />
+    <a href="https://cal.com/slack">Slack</a>
+    ·
+    <a href="https://cal.com">Website</a>
+    ·
+    <a href="https://github.com/calcom/cal.com/issues">Core Cal.com related Issues</a>
+    ·
+    <a href="https://github.com/calcom/docker/issues">Docker specific Issues</a>
+    ·
+    <a href="https://cal.com/roadmap">Roadmap</a>
+  </p>
+</p>
 
 # Docker
 
-NOTE: DockerHub organization has not yet been renamed.
+This image can be found on DockerHub at [https://hub.docker.com/r/calcom/cal.com](https://hub.docker.com/r/calcom/cal.com)
-
-This image can be found on DockerHub at [https://hub.docker.com/r/calendso/calendso](https://hub.docker.com/r/calendso/calendso)
 
 The Docker configuration for Cal.com is an effort powered by people within the community. Cal.com, Inc. does not yet provide official support for Docker, but we will accept fixes and documentation at this time. Use at your own risk.
 
@@ -20,7 +35,7 @@ The Docker configuration for Cal.com is an effort powered by people within the c
 
 This Docker Image is managed by the Cal.com Community. Join the team [here](https://github.com/calcom/docker/discussions/32). Support for this image can be found via the repository, located at [https://github.com/calcom/docker](https://github.com/calcom/docker)
 
-Currently, this image is intended for local development/evaluation use only, as there are specific requirements for providing environmental variables at build-time in order to specify a non-localhost BASE_URL. (this is due to the nature of the static site compilation, which embeds the variable values). The ability to update these variables at runtime is in-progress and will be available in the future.
+**Currently, this image is intended for local development/evaluation use only, as there are specific requirements for providing environmental variables at build-time in order to specify a non-localhost BASE_URL. (this is due to the nature of the static site compilation, which embeds the variable values). The ability to update these variables at runtime is in-progress and will be available in the future.**
 
 For Production, for the time being, please checkout the repository and build/push your own image privately.
 
@@ -30,9 +45,89 @@ Make sure you have `docker` & `docker compose` installed on the server / system.
 
 Note: `docker compose` without the hyphen is now the primary method of using docker-compose, per the Docker documentation.
 
-## Getting Started
+## (Most users) Running Cal.com with Docker Compose
 
-1. Clone calcom-docker
+If you are evaluating Cal.com or running with minimal to no modifications, this option is for you.
+
+1. Clone calcom/docker
+
+    ```bash
+    git clone --recursive https://github.com/calcom/docker.git
+    ```
+
+2. Change into the directory
+
+    ```bash
+    cd docker
+    ```
+
+3. Prepare your configuration: Rename `.env.example` to `.env` and then update `.env`
+
+    ```bash
+    cp .env.example .env
+    ```
+
+    Most configurations can be left as-is, but for configuration options see [Important Run-time variables](#important-run-time-variables) below.
+
+    Update the appropriate values in your .env file, then proceed.
+
+4. (optional) Pre-Pull the images by running the following command:
+
+    ```bash
+    docker compose pull
+    ```
+
+    This will use the default image locations as specified by `image:` in the docker-compose.yaml file.
+
+    Note: To aid with support, by default Scarf.sh is used as registry proxy for download metrics.
+
+5. Start Cal.com via docker compose
+
+    (Most basic users, and for First Run) To run the complete stack, which includes a local Postgres database, Cal.com web app, and Prisma Studio:
+
+    ```bash
+    docker compose up -d
+    ```
+
+    To run Cal.com web app and Prisma Studio against a remote database, ensure that DATABASE_URL is configured for an available database and run:
+
+    ```bash
+    docker compose up -d calcom studio
+    ```
+
+    To run only the Cal.com web app, ensure that DATABASE_URL is configured for an available database and run:
+
+    ```bash
+    docker compose up -d calcom
+    ```
+
+    **Note: to run in attached mode for debugging, remove `-d` from your desired run command.**
+
+6. Open a browser to [http://localhost:3000](http://localhost:3000), or your defined NEXT_PUBLIC_WEBAPP_URL. The first time you run Cal.com, a setup wizard will initialize. Define your first user, and you're ready to go!
+
+## Updating Cal.com
+
+1. Stop the Cal.com stack
+
+    ```bash
+    docker compose down
+    ```
+
+2. Pull the latest changes
+
+    ```bash
+    docker compose pull
+    ```
+3. Update env vars as necessary.
+4. Re-start the Cal.com stack
+
+    ```bash
+    docker compose up -d
+    ```
+
+## (Advanced users) Build and Run Cal.com
+
+1. Clone calcom/docker
 
     ```bash
     git clone https://github.com/calcom/docker.git calcom-docker
@@ -54,6 +149,8 @@ Note: `docker compose` without the hyphen is now the primary method of using doc
 
 4. Rename `.env.example` to `.env` and then update `.env`
 
+    For configuration options see [Build-time variables](#build-time-variables) below. Update the appropriate values in your .env file, then proceed.
+
 5. Build the Cal.com docker image:
 
     Note: Due to application configuration requirements, an available database is currently required during the build process.
@@ -94,47 +191,47 @@ Note: `docker compose` without the hyphen is now the primary method of using doc
 
     **Note: to run in attached mode for debugging, remove `-d` from your desired run command.**
 
-8. (First Run) Open a browser to [http://localhost:5555](http://localhost:5555) to look at or modify the database content.
+8. Open a browser to [http://localhost:3000](http://localhost:3000), or your defined NEXT_PUBLIC_WEBAPP_URL. The first time you run Cal.com, a setup wizard will initialize. Define your first user, and you're ready to go!
-
-    a. Click on the `User` model to add a new user record.
-
-    b. Fill out the fields (remembering to encrypt your password with [BCrypt](https://bcrypt-generator.com/)) and click `Save 1 Record` to create your first user.
-
-9. Open a browser to [http://localhost:3000](http://localhost:3000) (or your appropriately configured NEXT_PUBLIC_WEBAPP_URL) and login with your just created, first user.
 
 ## Configuration
 
-### Build-time variables
-
-These variables must be provided at the time of the docker build, and can be provided by updating the .env file. Currently, if you require changes to these variables, you must follow the instructions to build and publish your own image. 
-
-Updating these variables is not required for evaluation, but is required for running in production. Instructions for generating variables can be found in the [cal.com instructions](https://github.com/calcom/cal.com) 
-
-| Variable | Description | Required | Default |
-| --- | --- | --- | --- |
-| NEXT_PUBLIC_WEBAPP_URL | Base URL injected into static files | required | `http://localhost:3000` |
-| NEXT_PUBLIC_LICENSE_CONSENT | license consent - true/false |  |  |
-| 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` |
-| NEXTAUTH_SECRET | Cookie encryption key | required | `secret` |
-| CALENDSO_ENCRYPTION_KEY | Authentication encryption key | required | `secret` |
-
 ### Important Run-time variables
 
 These variables must also be provided at runtime
 
 | Variable | Description | Required | Default |
 | --- | --- | --- | --- |
-| CALCOM_LICENSE_KEY | Enterprise License Key |  |  |
+| CALCOM_LICENSE_KEY | Enterprise License Key | optional |  |
+| NEXT_PUBLIC_WEBAPP_URL | Base URL of the site.  NOTE: if this value differs from the value used at build-time, there will be a slight delay during container start (to update the statically built files). | optional | `http://localhost:3000` |
+| 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` |
 | 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
+
+If building the image yourself, these variables must be provided at the time of the docker build, and can be provided by updating the .env file. Currently, if you require changes to these variables, you must follow the instructions to build and publish your own image.
+
+Updating these variables is not required for evaluation, but is required for running in production. Instructions for generating variables can be found in the [cal.com instructions](https://github.com/calcom/cal.com)
+
+| Variable | Description | Required | Default |
+| --- | --- | --- | --- |
+| NEXT_PUBLIC_WEBAPP_URL | Base URL injected into static files | optional | `http://localhost:3000` |
+| NEXT_PUBLIC_LICENSE_CONSENT | license consent - true/false |  |  |
+| NEXT_PUBLIC_WEBSITE_TERMS_URL | custom URL for terms and conditions website | optional | `https://cal.com/terms` |
+| NEXT_PUBLIC_WEBSITE_PRIVACY_POLICY_URL | custom URL for privacy policy website | optional | `https://cal.com/privacy` |
+| CALCOM_TELEMETRY_DISABLED | Allow cal.com to collect anonymous usage data (set to `1` to disable) | | |
+| 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` |
+| CALENDSO_ENCRYPTION_KEY | Authentication encryption key | required | `secret` |
 
 ## Git Submodules
 
 This repository uses a git submodule.
 
-To update the calcom submodule, use the following command:
+For users building their own images, to update the calcom submodule, use the following command:
 
 ```bash
 git submodule update --remote --init
@@ -144,5 +241,38 @@ For more advanced usage, please refer to the git documentation: [https://git-scm
 
 ## Troubleshooting
 
-* SSL edge termination: If running behind a load balancer which handles SSL certificates, you will need to add the environmental variable `NODE_TLS_REJECT_UNAUTHORIZED=0` to prevent requests from being rejected. Only do this if you know what you are doing and trust the services/load-balancers directing traffic to your service.
+### SSL edge termination
-* Failed to commit changes: Invalid 'prisma.user.create()': Certain versions may have trouble creating a user if the field `metadata` is empty. Using an empty json object `{}` as the field value should resolve this issue. Also, the `id` field will autoincrement, so you may also try leaving the value of `id` as empty.
+
+If running behind a load balancer which handles SSL certificates, you will need to add the environmental variable `NODE_TLS_REJECT_UNAUTHORIZED=0` to prevent requests from being rejected. Only do this if you know what you are doing and trust the services/load-balancers directing traffic to your service.
+
+### Failed to commit changes: Invalid 'prisma.user.create()'
+
+Certain versions may have trouble creating a user if the field `metadata` is empty. Using an empty json object `{}` as the field value should resolve this issue. Also, the `id` field will autoincrement, so you may also try leaving the value of `id` as empty.
+
+### CLIENT_FETCH_ERROR
+
+If you experience this error, it may be the way the default Auth callback in the server is using the WEBAPP_URL as a base url. The container does not necessarily have access to the same DNS as your local machine, and therefor needs to be configured to resolve to itself. You may be able to correct this by configuring `NEXTAUTH_URL=http://localhost:3000/api/auth`, to help the backend loop back to itself.
+```
+docker-calcom-1  | @calcom/web:start: [next-auth][error][CLIENT_FETCH_ERROR]
+docker-calcom-1  | @calcom/web:start: https://next-auth.js.org/errors#client_fetch_error request to http://testing.localhost:3000/api/auth/session failed, reason: getaddrinfo ENOTFOUND testing.localhost {
+docker-calcom-1  | @calcom/web:start:   error: {
+docker-calcom-1  | @calcom/web:start:     message: 'request to http://testing.localhost:3000/api/auth/session failed, reason: getaddrinfo ENOTFOUND testing.localhost',
+docker-calcom-1  | @calcom/web:start:     stack: 'FetchError: request to http://testing.localhost:3000/api/auth/session failed, reason: getaddrinfo ENOTFOUND testing.localhost\n' +
+docker-calcom-1  | @calcom/web:start:       '    at ClientRequest.<anonymous> (/calcom/node_modules/next/dist/compiled/node-fetch/index.js:1:65756)\n' +
+docker-calcom-1  | @calcom/web:start:       '    at ClientRequest.emit (node:events:513:28)\n' +
+docker-calcom-1  | @calcom/web:start:       '    at ClientRequest.emit (node:domain:489:12)\n' +
+docker-calcom-1  | @calcom/web:start:       '    at Socket.socketErrorListener (node:_http_client:494:9)\n' +
+docker-calcom-1  | @calcom/web:start:       '    at Socket.emit (node:events:513:28)\n' +
+docker-calcom-1  | @calcom/web:start:       '    at Socket.emit (node:domain:489:12)\n' +
+docker-calcom-1  | @calcom/web:start:       '    at emitErrorNT (node:internal/streams/destroy:157:8)\n' +
+docker-calcom-1  | @calcom/web:start:       '    at emitErrorCloseNT (node:internal/streams/destroy:122:3)\n' +
+docker-calcom-1  | @calcom/web:start:       '    at processTicksAndRejections (node:internal/process/task_queues:83:21)',
+docker-calcom-1  | @calcom/web:start:     name: 'FetchError'
+docker-calcom-1  | @calcom/web:start:   },
+docker-calcom-1  | @calcom/web:start:   url: 'http://testing.localhost:3000/api/auth/session',
+docker-calcom-1  | @calcom/web:start:   message: 'request to http://testing.localhost:3000/api/auth/session failed, reason: getaddrinfo ENOTFOUND testing.localhost'
+docker-calcom-1  | @calcom/web:start: }
+```
+
+
+<img referrerpolicy="no-referrer-when-downgrade" src="https://static.scarf.sh/a.png?x-pxid=81cda9f7-a102-453b-ac01-51c35650bd70" />

docker-compose.yaml

@@ -1,5 +1,4 @@
 # Use postgres/example user/password credentials
-version: '3.8'
 
 volumes:
   database-data:
@@ -21,16 +20,21 @@ services:
       - stack
 
   calcom:
+    image: calcom.docker.scarf.sh/calcom/cal.com
     build:
       context: .
       dockerfile: Dockerfile
       args:
         NEXT_PUBLIC_WEBAPP_URL: ${NEXT_PUBLIC_WEBAPP_URL}
+        NEXT_PUBLIC_API_V2_URL: ${NEXT_PUBLIC_API_V2_URL}
         NEXT_PUBLIC_LICENSE_CONSENT: ${NEXT_PUBLIC_LICENSE_CONSENT}
-        CALCOM_TELEMETRY_DISABLE: ${CALCOM_TELEMETRY_DISABLED}
+        NEXT_PUBLIC_WEBSITE_TERMS_URL: ${EXT_PUBLIC_WEBSITE_TERMS_URL}
+        NEXT_PUBLIC_WEBSITE_PRIVACY_POLICY_URL: ${NEXT_PUBLIC_WEBSITE_PRIVACY_POLICY_URL}
+        CALCOM_TELEMETRY_DISABLED: ${CALCOM_TELEMETRY_DISABLED}
         NEXTAUTH_SECRET: ${NEXTAUTH_SECRET}
         CALENDSO_ENCRYPTION_KEY: ${CALENDSO_ENCRYPTION_KEY}
         DATABASE_URL: ${DATABASE_URL}
+        DATABASE_DIRECT_URL: ${DATABASE_URL}
       network: stack
     restart: always
     networks:
@@ -40,12 +44,13 @@ services:
     env_file: .env
     environment:
       - DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${DATABASE_HOST}/${POSTGRES_DB}
+      - DATABASE_DIRECT_URL=${DATABASE_URL}
     depends_on:
       - database
 
 # Optional use of Prisma Studio. In production, comment out or remove the section below to prevent unwanted access to your database.
   studio:
-    image: calendso/calendso:latest
+    image: calcom.docker.scarf.sh/calcom/cal.com
     restart: always
     networks:
       - stack
@@ -54,6 +59,7 @@ services:
     env_file: .env
     environment:
       - DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${DATABASE_HOST}/${POSTGRES_DB}
+      - DATABASE_DIRECT_URL=${DATABASE_URL}
     depends_on:
       - database
     command:

render.yaml

@@ -0,0 +1,26 @@
+services:
+  - type: web
+    name: cal-web
+    plan: standard
+    repo: https://github.com/calcom/docker.git
+    dockerfilePath: ./Dockerfile.render
+    env: docker
+    envVars:
+
+      - key: DATABASE_URL
+        fromDatabase:
+          name: cal-postgres
+          property: connectionString
+
+      - key: CALENDSO_ENCRYPTION_KEY
+        value: secret
+
+      - key: NEXTAUTH_SECRET
+        value: secret
+
+      - key: CRON_API_KEY
+        value: 0cc0e6c35519bba620c9360cfe3e68d0
+
+databases:
+  - name: cal-postgres
+    plan: basic-1gb

scripts/replace-placeholder.sh

@@ -0,0 +1,15 @@
+FROM=$1
+TO=$2
+
+if [ "${FROM}" = "${TO}" ]; then
+    echo "Nothing to replace, the value is already set to ${TO}."
+
+    exit 0
+fi
+
+# Only peform action if $FROM and $TO are different.
+echo "Replacing all statically built instances of $FROM with $TO."
+
+for file in $(egrep -r -l "${FROM}" apps/web/.next/ apps/web/public/); do
+    sed -i -e "s|$FROM|$TO|g" "$file"
+done

scripts/start.sh

@@ -1,6 +1,10 @@
 #!/bin/sh
 set -x
 
+# Replace the statically built BUILT_NEXT_PUBLIC_WEBAPP_URL with run-time NEXT_PUBLIC_WEBAPP_URL
+# NOTE: if these values are the same, this will be skipped.
+scripts/replace-placeholder.sh "$BUILT_NEXT_PUBLIC_WEBAPP_URL" "$NEXT_PUBLIC_WEBAPP_URL"
+
 scripts/wait-for-it.sh ${DATABASE_HOST} -- echo "database is up"
 npx prisma migrate deploy --schema /calcom/packages/prisma/schema.prisma
 npx ts-node --transpile-only /calcom/packages/prisma/seed-app-store.ts