tag version Cal.com version v4.0.3

.env.example

@@ -13,7 +13,6 @@ 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
@@ -51,7 +50,6 @@ 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/workflows/create-release-from-commit.yaml

@@ -1,64 +0,0 @@
-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

@@ -1,77 +1,60 @@
-name: "Create Gitea Release"
+name: "Create Release"
 
-# This workflow is triggered manually from the Gitea Actions UI
+on: # yamllint disable-line rule:truthy
-on:
   workflow_dispatch:
     inputs:
       RELEASE_TAG:
-        description: 'The release tag to create, formatted as v{Major}.{Minor}.{Patch}'
+        description: 'v{Major}.{Minor}.{Patch}'  
-        required: true
 
 jobs:
   release:
     name: "Release"
+    permissions:
+      contents: write
     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"
+        uses: actions/checkout@v3
         with:
-          token: ${{ secrets.TOKEN_GITEA }}
+          token: ${{ secrets.ACTIONS_ACCESS_TOKEN }}
           submodules: true
 
-      # Step 2: Create a new release branch, update the submodule to the specified tag,
+      - name: Create branch and tag submodule
-      # 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@github.com"
-          git config user.email "actions@gitea.local"
+          git config user.name "actions-user"
-          git config user.name "Gitea Actions"
+          git submodule update --init --remote
-
-          # 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 }}"
+          git commit -m "tag version 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.
+      # note: instead of secrets.GITHUB_TOKEN here, we need to use a PAT 
-      # This uses the same API token to authorize the action.
+      #       so that the release creation triggers the image build workflow
-      - name: "Create Gitea Release"
+      - name: "Create release"
-        env:
+        uses: "actions/github-script@v6"
-          GITEA_TOKEN: ${{ secrets.TOKEN_GITEA }}
+        with:
-          GITEA_API_URL: https://git.nethery.dev/api/v1
+          github-token: "${{ secrets.ACTIONS_ACCESS_TOKEN }}"
-          OWNER: ${{ gitea.repository_owner }}
+          script: |
-          REPO: ${{ gitea.repository_name }}
+            const isPreRelease = '${{ inputs.RELEASE_TAG }}'.includes('-rc'); 
-        run: |
+            try {
-          # Determine if the tag indicates a pre-release
+              const response = await github.rest.repos.createRelease({
-          is_prerelease=false
+                draft: false,
-          if [[ "${{ inputs.RELEASE_TAG }}" == *"-rc"* || "${{ inputs.RELEASE_TAG }}" == *"-beta"* ]]; then
+                generate_release_notes: true,
-            is_prerelease=true
+                body: 'For Cal.com release details, see: https://github.com/calcom/cal.com/releases/tag/${{ inputs.RELEASE_TAG }}',
-          fi
+                name: '${{ inputs.RELEASE_TAG }}',
+                target_commitish: 'release-${{ inputs.RELEASE_TAG }}',
+                owner: context.repo.owner,
+                prerelease: isPreRelease,
+                repo: context.repo.repo,
+                tag_name: '${{ inputs.RELEASE_TAG }}',
+              });
 
-          echo "Creating release ${{ inputs.RELEASE_TAG }}..."
+              core.exportVariable('RELEASE_ID', response.data.id);
-          echo "Is prerelease: $is_prerelease"
+              core.exportVariable('RELEASE_UPLOAD_URL', response.data.upload_url);
-
+            } catch (error) {
-          # Use curl to send a POST request to the Gitea API's 'create release' endpoint
+              core.setFailed(error.message);
-          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

@@ -20,7 +20,7 @@ on:
     # Uncomment below to allow specific version workflow run
     # inputs:
     #   version:
-    #     description: 'Version to build'
+    #     description: 'Version to build'     
     #     required: true
 
 # Leaving in example for releases. Initially we simply push to 'latest'
@@ -37,23 +37,12 @@ jobs:
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      - 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@v4
 
@@ -64,23 +53,29 @@ jobs:
       - name: Log in to the Docker Hub registry
         uses: docker/login-action@v3
         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: Log in to the Github Container registry
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
-          username: nnethery
+          username: ${{ github.actor }}
-          password: ${{ secrets.GHCR_TOKEN }}
+          password: ${{ secrets.GITHUB_TOKEN }}
-
+          
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v5
         with:
           images: |
-            ghcr.io/nnethery/cal.com
+            docker.io/calendso/calendso
-            nnethery/cal.com
+            docker.io/calcom/cal.com
+            ghcr.io/calcom/cal.com
+          # Add flavor latest only on full releases, not on pre-releases
           flavor: |
             latest=${{ !github.event.release.prerelease }}
 
@@ -92,11 +87,13 @@ jobs:
           eval $(sed -e '/^#/d' -e 's/^/export /' -e 's/$/;/' .env) ;
 
       # Temporarily disable ARM build due to runner performance issues
+      # - name: Set up QEMU
+      #   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@v3
         with:
@@ -104,9 +101,9 @@ jobs:
             network=container:database
           buildkitd-flags: |
             --allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host
-#         config-inline: |
+#           config-inline: |
-#           [worker.oci]
+#             [worker.oci]
-#             max-parallelism = 1
+#               max-parallelism = 1
 
       - name: Build image
         id: docker_build
@@ -115,61 +112,67 @@ jobs:
           context: ./
           file: ./Dockerfile
           load: true  # Load the image into the Docker daemon
-          push: false # Do not push the image at this stage
+          push: false  # Do not push the image at this stage
-          platforms: linux/arm64 # Changed from linux/amd64
+          platforms: 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
+      - 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
+        
+            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
       #   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
+      #     for tag in "${ADDR[@]}"; do
-
+      #       docker push $tag
-      #     docker run --rm --network stack \
+      #     done
-      #       -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
@@ -177,22 +180,21 @@ jobs:
         with:
           context: ./
           file: ./Dockerfile
-          push: true
+          push: true 
-          platforms: linux/arm64 # Changed from linux/amd64
+          platforms: 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 }}
         if: ${{ !github.event.release.prerelease }}
-
+        
       - name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}
-
+        
       - name: Cleanup
         run: |
-          docker compose down
+          docker compose down

.github/workflows/scarf-data-export.yml

@@ -0,0 +1,14 @@
+name: Export Scarf data
+on:
+  schedule:
+    - cron: '0 0 * * *'
+
+jobs:
+  export-scarf-data:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: docker://scarf.docker.scarf.sh/scarf-sh/scarf-postgres-exporter:latest
+        env:
+          SCARF_API_TOKEN: ${{ secrets.SCARF_API_TOKEN }}
+          SCARF_ENTITY_NAME: Calcom
+          PSQL_CONN_STRING: ${{ secrets.PSQL_CONN_STRING }}

Dockerfile

@@ -1,87 +1,76 @@
-FROM node:18 AS builder
+FROM node:18 as builder
-
+
-WORKDIR /calcom
+WORKDIR /calcom
-
+
-ARG NEXT_PUBLIC_LICENSE_CONSENT
+ARG NEXT_PUBLIC_LICENSE_CONSENT
-ARG NEXT_PUBLIC_WEBSITE_TERMS_URL
+ARG CALCOM_TELEMETRY_DISABLED
-ARG NEXT_PUBLIC_WEBSITE_PRIVACY_POLICY_URL
+ARG DATABASE_URL
-ARG CALCOM_TELEMETRY_DISABLED
+ARG NEXTAUTH_SECRET=secret
-ARG DATABASE_URL
+ARG CALENDSO_ENCRYPTION_KEY=secret
-ARG NEXTAUTH_SECRET=secret
+ARG MAX_OLD_SPACE_SIZE=4096
-ARG CALENDSO_ENCRYPTION_KEY=secret
+
-ARG MAX_OLD_SPACE_SIZE=4096
+ENV NEXT_PUBLIC_WEBAPP_URL=http://NEXT_PUBLIC_WEBAPP_URL_PLACEHOLDER \
-ARG NEXT_PUBLIC_API_V2_URL
+    NEXT_PUBLIC_LICENSE_CONSENT=$NEXT_PUBLIC_LICENSE_CONSENT \
-
+    CALCOM_TELEMETRY_DISABLED=$CALCOM_TELEMETRY_DISABLED \
-ENV NEXT_PUBLIC_WEBAPP_URL=http://NEXT_PUBLIC_WEBAPP_URL_PLACEHOLDER \
+    DATABASE_URL=$DATABASE_URL \
-    NEXT_PUBLIC_API_V2_URL=$NEXT_PUBLIC_API_V2_URL \
+    DATABASE_DIRECT_URL=$DATABASE_URL \
-    NEXT_PUBLIC_LICENSE_CONSENT=$NEXT_PUBLIC_LICENSE_CONSENT \
+    NEXTAUTH_SECRET=${NEXTAUTH_SECRET} \
-    NEXT_PUBLIC_WEBSITE_TERMS_URL=$NEXT_PUBLIC_WEBSITE_TERMS_URL \
+    CALENDSO_ENCRYPTION_KEY=${CALENDSO_ENCRYPTION_KEY} \
-    NEXT_PUBLIC_WEBSITE_PRIVACY_POLICY_URL=$NEXT_PUBLIC_WEBSITE_PRIVACY_POLICY_URL \
+    NODE_OPTIONS=--max-old-space-size=${MAX_OLD_SPACE_SIZE}
-    CALCOM_TELEMETRY_DISABLED=$CALCOM_TELEMETRY_DISABLED \
+
-    DATABASE_URL=$DATABASE_URL \
+COPY calcom/package.json calcom/yarn.lock calcom/.yarnrc.yml calcom/playwright.config.ts calcom/turbo.json calcom/git-init.sh calcom/git-setup.sh ./
-    DATABASE_DIRECT_URL=$DATABASE_URL \
+COPY calcom/.yarn ./.yarn
-    NEXTAUTH_SECRET=${NEXTAUTH_SECRET} \
+COPY calcom/apps/web ./apps/web
-    CALENDSO_ENCRYPTION_KEY=${CALENDSO_ENCRYPTION_KEY} \
+COPY calcom/packages ./packages
-    NODE_OPTIONS=--max-old-space-size=${MAX_OLD_SPACE_SIZE} \
+COPY calcom/tests ./tests
-    BUILD_STANDALONE=true
+
-
+RUN yarn config set httpTimeout 1200000 && \ 
-COPY calcom/package.json calcom/yarn.lock calcom/.yarnrc.yml calcom/playwright.config.ts calcom/turbo.json calcom/i18n.json ./
+    npx turbo prune --scope=@calcom/web --docker && \
-COPY calcom/.yarn ./.yarn
+    yarn install && \
-COPY calcom/apps/web ./apps/web
+    yarn db-deploy && \
-COPY calcom/apps/api/v2 ./apps/api/v2
+    yarn --cwd packages/prisma seed-app-store
-COPY calcom/packages ./packages
+
-COPY calcom/tests ./tests
+RUN yarn turbo run build --filter=@calcom/web
-
+
-RUN yarn config set httpTimeout 1200000
+# RUN yarn plugin import workspace-tools && \
-RUN npx turbo prune --scope=@calcom/web --scope=@calcom/trpc --docker
+#     yarn workspaces focus --all --production
-RUN yarn install
+RUN rm -rf node_modules/.cache .yarn/cache apps/web/.next/cache
-RUN yarn db-deploy
+
-RUN yarn --cwd packages/prisma seed-app-store
+FROM node:18 as builder-two
-# Build and make embed servable from web/public/embed folder
+
-RUN yarn workspace @calcom/trpc run build
+WORKDIR /calcom
-RUN yarn --cwd packages/embeds/embed-core workspace @calcom/embed-core run build
+ARG NEXT_PUBLIC_WEBAPP_URL=http://localhost:3000
-RUN yarn --cwd apps/web workspace @calcom/web run build
+
-
+ENV NODE_ENV production
-# RUN yarn plugin import workspace-tools && \
+
-#     yarn workspaces focus --all --production
+COPY calcom/package.json calcom/.yarnrc.yml calcom/yarn.lock calcom/turbo.json ./
-RUN rm -rf node_modules/.cache .yarn/cache apps/web/.next/cache
+COPY calcom/.yarn ./.yarn
-
+COPY --from=builder /calcom/node_modules ./node_modules
-FROM node:18 AS builder-two
+COPY --from=builder /calcom/packages ./packages
-
+COPY --from=builder /calcom/apps/web ./apps/web
-WORKDIR /calcom
+COPY --from=builder /calcom/packages/prisma/schema.prisma ./prisma/schema.prisma
-ARG NEXT_PUBLIC_WEBAPP_URL=http://localhost:3000
+COPY scripts scripts
-
+
-ENV NODE_ENV=production
+# 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.
-COPY calcom/package.json calcom/.yarnrc.yml calcom/turbo.json calcom/i18n.json ./
+ENV NEXT_PUBLIC_WEBAPP_URL=$NEXT_PUBLIC_WEBAPP_URL \
-COPY calcom/.yarn ./.yarn
+    BUILT_NEXT_PUBLIC_WEBAPP_URL=$NEXT_PUBLIC_WEBAPP_URL
-COPY --from=builder /calcom/yarn.lock ./yarn.lock
+
-COPY --from=builder /calcom/node_modules ./node_modules
+RUN scripts/replace-placeholder.sh http://NEXT_PUBLIC_WEBAPP_URL_PLACEHOLDER ${NEXT_PUBLIC_WEBAPP_URL}
-COPY --from=builder /calcom/packages ./packages
+
-COPY --from=builder /calcom/apps/web ./apps/web
+FROM node:18 as runner
-COPY --from=builder /calcom/packages/prisma/schema.prisma ./prisma/schema.prisma
+
-COPY scripts scripts
+
-
+WORKDIR /calcom
-# Save value used during this build stage. If NEXT_PUBLIC_WEBAPP_URL and BUILT_NEXT_PUBLIC_WEBAPP_URL differ at
+COPY --from=builder-two /calcom ./
-# run-time, then start.sh will find/replace static values again.
+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
-
+
-RUN scripts/replace-placeholder.sh http://NEXT_PUBLIC_WEBAPP_URL_PLACEHOLDER ${NEXT_PUBLIC_WEBAPP_URL}
+ENV NODE_ENV production
-
+EXPOSE 3000
-FROM node:18 AS runner
+
-
+HEALTHCHECK --interval=30s --timeout=30s --retries=5 \
-
+    CMD wget --spider http://localhost:3000 || exit 1
-WORKDIR /calcom
+
-COPY --from=builder-two /calcom ./
+CMD ["/calcom/scripts/start.sh"]
-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"]

README.md

@@ -52,7 +52,7 @@ If you are evaluating Cal.com or running with minimal to no modifications, this
 1. Clone calcom/docker
 
     ```bash
-    git clone --recursive https://github.com/calcom/docker.git
+    git clone https://github.com/calcom/docker.git
     ```
 
 2. Change into the directory
@@ -219,8 +219,6 @@ 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_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 | |

docker-compose.yaml

@@ -1,4 +1,5 @@
 # Use postgres/example user/password credentials
+version: '3.8'
 
 volumes:
   database-data:
@@ -26,10 +27,7 @@ services:
       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}
-        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}

render.yaml

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

scripts/replace-placeholder.sh

@@ -10,6 +10,7 @@ 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
+find apps/web/.next/ apps/web/public -type f |
-    sed -i -e "s|$FROM|$TO|g" "$file"
+while read file; do
+    sed -i "s|$FROM|$TO|g" "$file"
 done