tag version Cal.com version v4.1.0

* Testing: Separate RUN commands

* Test with no prune

* Copying v2 API app to test

* Added NEXT_PUBLIC_API_V2_URL

* Added default value for NEXT_PUBLIC_API_V2_URL

* add cleanup step in docker-build-push-dockerhub

* move cleanup and add directory list for directory context

* --WIP

* Setting the CWD for building the web app

* Trying a workspace command to run with --cwd

* Use action to free disk space

* combined the jobs

* Bring back app router

* Clean up

* Removed the extra push image step

* clean up

* Made the checkout more flexible

* Just testing the github.ref

* Reverted changes related to the version input

---------

Co-authored-by: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com>

.env.example

@@ -13,6 +13,7 @@ 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
@@ -32,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

.github/workflows/create-release.yaml

@@ -0,0 +1,60 @@
+name: "Create Release"
+
+on: # yamllint disable-line rule:truthy
+  workflow_dispatch:
+    inputs:
+      RELEASE_TAG:
+        description: 'v{Major}.{Minor}.{Patch}'  
+
+jobs:
+  release:
+    name: "Release"
+    permissions:
+      contents: write
+    runs-on: "ubuntu-latest"
+
+    steps:
+      
+      - name: Checkout source
+        uses: actions/checkout@v3
+        with:
+          token: ${{ secrets.ACTIONS_ACCESS_TOKEN }}
+          submodules: true
+
+      - name: Create branch and tag submodule
+        run: |
+          git config user.email "actions@github.com"
+          git config user.name "actions-user"
+          git submodule update --init --remote
+          git checkout -b 'release-${{ inputs.RELEASE_TAG }}'
+          (cd calcom && git fetch --tags origin && git checkout 'refs/tags/${{ inputs.RELEASE_TAG }}')
+          git add calcom
+          git commit -m "tag version Cal.com version ${{ inputs.RELEASE_TAG }}"
+          git push origin 'release-${{ inputs.RELEASE_TAG }}'
+
+      # note: instead of secrets.GITHUB_TOKEN here, we need to use a PAT 
+      #       so that the release creation triggers the image build workflow
+      - name: "Create release"
+        uses: "actions/github-script@v6"
+        with:
+          github-token: "${{ secrets.ACTIONS_ACCESS_TOKEN }}"
+          script: |
+            const isPreRelease = '${{ inputs.RELEASE_TAG }}'.includes('-rc'); 
+            try {
+              const response = await github.rest.repos.createRelease({
+                draft: false,
+                generate_release_notes: true,
+                body: 'For Cal.com release details, see: https://github.com/calcom/cal.com/releases/tag/${{ inputs.RELEASE_TAG }}',
+                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 }}',
+              });
+
+              core.exportVariable('RELEASE_ID', response.data.id);
+              core.exportVariable('RELEASE_UPLOAD_URL', response.data.upload_url);
+            } catch (error) {
+              core.setFailed(error.message);
+            }

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

@@ -17,6 +17,11 @@ 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:
@@ -32,16 +37,27 @@ 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: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Git submodule update
         run: |
           git submodule update --init
 
       - name: Log in to the Docker Hub registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           # Username used to log against the Docker registry
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
@@ -51,20 +67,23 @@ jobs:
           logout: true # optional, default is true
 
       - name: Log in to the Github Container registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-          
+
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: |
             docker.io/calendso/calendso
             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 }}
 
       - name: Copy env
         run: |
@@ -80,9 +99,9 @@ jobs:
       - 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
@@ -91,30 +110,90 @@ jobs:
 #           config-inline: |
 #             [worker.oci]
 #               max-parallelism = 1
-          
-      - name: Build and push image
+
+      - name: Build image
         id: docker_build
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: ./
           file: ./Dockerfile
-          push: ${{ github.event_name != 'pull_request' }}
+          load: true  # Load the image into the Docker daemon
+          push: false  # Do not push the image at this stage
           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 }}
-            
-      # - name: Build with docker compose
-      #   run: |
-      #     DOCKER_BUILDKIT=0 docker compose build --build-arg DATABASE_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@${{ env.DATABASE_HOST }}/${{ env.POSTGRES_DB }} calcom
+            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
+
+            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
+          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
-
-      - name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}

Dockerfile

@@ -8,11 +8,14 @@ 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=http://NEXT_PUBLIC_WEBAPP_URL_PLACEHOLDER \
+    NEXT_PUBLIC_API_V2_URL=$NEXT_PUBLIC_API_V2_URL \
     NEXT_PUBLIC_LICENSE_CONSENT=$NEXT_PUBLIC_LICENSE_CONSENT \
     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}
@@ -20,15 +23,16 @@ ENV NEXT_PUBLIC_WEBAPP_URL=http://NEXT_PUBLIC_WEBAPP_URL_PLACEHOLDER \
 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 ./
 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 httpTimeout 1200000 && \ 
-    npx turbo prune --scope=@calcom/web --docker && \
-    yarn install && \
-    yarn db-deploy && \
-    yarn --cwd packages/prisma seed-app-store
-
-RUN yarn turbo run build --filter=@calcom/web
+RUN yarn config set httpTimeout 1200000
+RUN npx turbo prune --scope=@calcom/web --docker
+RUN yarn install
+RUN yarn db-deploy
+RUN yarn --cwd packages/prisma seed-app-store
+RUN yarn --cwd apps/web workspace @calcom/web run build
 
 # RUN yarn plugin import workspace-tools && \
 #     yarn workspaces focus --all --production
@@ -71,4 +75,4 @@ EXPOSE 3000
 HEALTHCHECK --interval=30s --timeout=30s --retries=5 \
     CMD wget --spider http://localhost:3000 || exit 1
 
-CMD ["/calcom/scripts/start.sh"]
+CMD ["/calcom/scripts/start.sh"]

README.md

@@ -67,24 +67,24 @@ If you are evaluating Cal.com or running with minimal to no modifications, this
     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. 
-    
+    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
     ```
@@ -139,7 +139,7 @@ If you are evaluating Cal.com or running with minimal to no modifications, this
     cd calcom-docker
     ```
 
-3. Update the calcom submodule. 
+3. Update the calcom submodule.
 
     ```bash
     git submodule update --remote --init
@@ -151,7 +151,7 @@ If you are evaluating Cal.com or running with minimal to no modifications, this
 
     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: 
+5. Build the Cal.com docker image:
 
     Note: Due to application configuration requirements, an available database is currently required during the build process.
 
@@ -206,20 +206,22 @@ 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_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. 
+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) 
+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 |  |  |
 | 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` |
 | CALENDSO_ENCRYPTION_KEY | Authentication encryption key | required | `secret` |
 
@@ -249,7 +251,7 @@ Certain versions may have trouble creating a user if the field `metadata` is emp
 
 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: [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-compose.yaml

@@ -27,11 +27,13 @@ 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}
         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:
@@ -41,6 +43,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
 
@@ -55,6 +58,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: