Auto updated submodule references

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

@@ -49,6 +49,11 @@ jobs:
       #   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
 
@@ -56,31 +61,29 @@ jobs:
         run: |
           git submodule update --init
 
-      - name: Log in to the Docker Hub registry
+      # - name: Log in to the Docker Hub registry
-        uses: docker/login-action@v3
+      #   uses: docker/login-action@v3
-        with:
+      #   with:
-          # Username used to log against the Docker registry
+      #     # Username used to log against the Docker registry
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+      #     username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          # Password or personal access token used to log against the Docker registry
+      #     # Password or personal access token used to log against the Docker registry
-          password: ${{ secrets.DOCKER_HUB_TOKEN }}
+      #     password: ${{ secrets.DOCKER_HUB_TOKEN }}
-          # Log out from the Docker registry at the end of a job
+      #     # Log out from the Docker registry at the end of a job
-          logout: true # optional, default is true
+      #     logout: true # optional, default is true
 
       - name: Log in to the Github Container registry
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
-          username: ${{ github.actor }}
+          username: nnethery
-          password: ${{ secrets.GITHUB_TOKEN }}
+          password: ${{ secrets.GHCR_TOKEN }}
 
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v5
         with:
           images: |
-            docker.io/calendso/calendso
+            ghcr.io/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 }}
@@ -93,8 +96,6 @@ 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: |
@@ -107,9 +108,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
@@ -118,8 +119,8 @@ 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/amd64
+          platforms: linux/arm64 # Changed from linux/amd64
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
@@ -130,47 +131,49 @@ jobs:
             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: |
+      #   run: |
-          tags="${{ steps.meta.outputs.tags }}"
+      #     tags="${{ steps.meta.outputs.tags }}"
-          IFS=',' read -ra ADDR <<< "$tags"  # Convert string to array using ',' as delimiter
+      #     IFS=',' read -ra ADDR <<< "$tags"  # Convert string to array using ',' as delimiter
-          tag=${ADDR[0]}  # Get the first tag
+      #     tag=${ADDR[0]}  # Get the first tag
 
-          docker run --rm --network stack \
+      #     docker run --rm --network stack \
-            -p 3000:3000 \
+      #       -p 3000:3000 \
-            -e DATABASE_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@database/${{ env.POSTGRES_DB }} \
+      #       -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 DATABASE_DIRECT_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@database/${{ env.POSTGRES_DB }} \
-            -e NEXTAUTH_SECRET=${{ env.NEXTAUTH_SECRET }} \
+      #       -e NEXTAUTH_SECRET=${{ env.NEXTAUTH_SECRET }} \
-            -e CALENDSO_ENCRYPTION_KEY=${{ env.CALENDSO_ENCRYPTION_KEY }} \
+      #       -e CALENDSO_ENCRYPTION_KEY=${{ env.CALENDSO_ENCRYPTION_KEY }} \
-            $tag &
+      #       $tag &
 
-            server_pid=$!
+      #       server_pid=$!
 
 
-            echo "Waiting for the server to start..."
+      #       echo "Waiting for the server to start..."
-            sleep 120
+      #       sleep 120
 
-            echo ${{ env.NEXT_PUBLIC_WEBAPP_URL }}/auth/login
+      #       echo ${{ env.NEXT_PUBLIC_WEBAPP_URL }}/auth/login
 
-            for i in {1..60}; do
+      #       apk add curl
-              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"
+      #       for i in {1..60}; do
-            kill $server_pid
+      #         echo "Checking server health ($i/60)..."
-            exit 1
+      #         response=$(curl -o /dev/null -s -w "%{http_code}" ${{ env.NEXT_PUBLIC_WEBAPP_URL }}/auth/login)
-        env:
+      #         echo "HTTP Status Code: $response"
-          NEXTAUTH_SECRET: 'EI4qqDpcfdvf4A+0aQEEx8JjHxHSy4uWiZw/F32K+pA='
+      #         if [[ "$response" == "200" ]] || [[ "$response" == "307" ]]; then
-          CALENDSO_ENCRYPTION_KEY: '0zfLtY99wjeLnsM7qsa8xsT+Q0oSgnOL'
+      #           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
@@ -179,7 +182,7 @@ jobs:
           context: ./
           file: ./Dockerfile
           push: true
-          platforms: linux/amd64
+          platforms: linux/arm64 # Changed from linux/amd64
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
@@ -196,4 +199,4 @@ jobs:
 
       - name: Cleanup
         run: |
-          docker compose down
+          docker compose down

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

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

README.md

@@ -219,6 +219,8 @@ 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

@@ -28,6 +28,8 @@ services:
         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}