add script changes and docker-compose configuration for local development

.dockerignore

@@ -1,3 +0,0 @@
-.git
-.github
-.env.example

.env.example

@@ -8,21 +8,8 @@
 NEXT_PUBLIC_LICENSE_CONSENT=
 LICENSE=
 
-# BASE_URL and NEXT_PUBLIC_APP_URL are both deprecated. Both are replaced with one variable, NEXT_PUBLIC_WEBAPP_URL
+BASE_URL=http://localhost:3000
-# BASE_URL=http://localhost:3000
+NEXT_PUBLIC_APP_URL=http://localhost:3000
-# NEXT_PUBLIC_APP_URL=http://localhost:3000
-
-NEXT_PUBLIC_WEBAPP_URL=http://localhost:3000
-
-# It is highly recommended that the NEXTAUTH_SECRET must be overridden and very unique
-# Use `openssl rand -base64 32` to generate a key
-NEXTAUTH_SECRET=secret
-
-# Encryption key that will be used to encrypt CalDAV credentials, choose a random string, for example with `dd if=/dev/urandom bs=1K count=1 | md5sum`
-CALENDSO_ENCRYPTION_KEY=secret
-
-# Deprecation note: JWT_SECRET is no longer used
-# JWT_SECRET=secret
 
 POSTGRES_USER=unicorn_user
 POSTGRES_PASSWORD=magical_password
@@ -31,8 +18,8 @@ DATABASE_HOST=database:5432
 DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${DATABASE_HOST}/${POSTGRES_DB}
 GOOGLE_API_CREDENTIALS={}
 
-# Set this to '1' if you don't want Cal to collect anonymous usage
+# Remove this var if you don't want Calendso to collect anonymous usage
-CALCOM_TELEMETRY_DISABLED=
+NEXT_PUBLIC_TELEMETRY_KEY=js.2pvs2bbpqq1zxna97wcml.oi2jzirnbj1ev4tc57c5r
 
 # Used for the Office 365 / Outlook.com Calendar integration
 MS_GRAPH_CLIENT_ID=
@@ -52,4 +39,10 @@ EMAIL_SERVER_PORT=587
 EMAIL_SERVER_USER=email_user
 EMAIL_SERVER_PASSWORD=email_password
 
+# Encryption key that will be used to encrypt CalDAV credentials, choose a random string, for example with `dd if=/dev/urandom bs=1K count=1 | md5sum`
+CALENDSO_ENCRYPTION_KEY=
+
+# It is highly recommended that the JWT secret must be overridden and very unique
+JWT_SECRET=secret
+
 NODE_ENV=production

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

@@ -33,12 +33,9 @@ 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: checkout
+      - uses: actions/checkout@v2
-        uses: actions/checkout@v2
+        with:
-
+          submodules: true
-      - name: Git submodule update
-        run: |
-          git submodule update --init
 
       - name: Docker Login
       # You may pin to the exact commit or the version.
@@ -56,50 +53,18 @@ jobs:
         id: buildx
         uses: docker/setup-buildx-action@v1.6.0
         
-      - name: Copy env
-        run: |
-          grep -o '^[^#]*' .env.example > .env
-          cat .env >> $GITHUB_ENV
-          echo "DATABASE_HOST=localhost:5432" >> $GITHUB_ENV
-          eval $(sed -e '/^#/d' -e 's/^/export /' -e 's/$/;/' .env) ;
-      
-      - 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@v2
-        with:
-          driver-opts: |
-            network=container:database
-          buildkitd-flags: |
-            --allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host
-          
       - name: Build and push image
         id: docker_build
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v2
         with:
           context: ./
           file: ./Dockerfile
           push: true
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          # The test image is /docker and is private. final image will be /calendso and public
-          tags: docker.io/${{ secrets.DOCKER_HUB_USERNAME }}/calendso:canary
+          tags: docker.io/${{ secrets.DOCKER_HUB_USERNAME }}/calendso:latest
           build-args: |
-            NEXT_PUBLIC_WEBAPP_URL=${{ env.NEXT_PUBLIC_WEBAPP_URL }}
+            BASE_URL=http://localhost:3000
-            NEXT_PUBLIC_LICENSE_CONSENT=${{ env.NEXT_PUBLIC_LICENSE_CONSENT }}
+            NEXT_PUBLIC_APP_URL=http://localhost:3000
-            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
-
-      - name: Cleanup
-        run: |
-          docker compose down
 
       - name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}

.github/workflows/update-submodules.yml

@@ -17,7 +17,7 @@ jobs:
 
       - name: Git submodule update
         run: |
-          git submodule update --remote --init
+          git submodule update --recursive --remote --init
 
       - name: Commit
         run: |

.gitmodules

@@ -1,4 +1,4 @@
-[submodule "calcom"]
+[submodule "calendso"]
-	path = calcom
+	path = calendso
-	url = https://github.com/calcom/cal.com.git
+	url = https://github.com/calendso/calendso.git
 	branch = main

Dockerfile

@@ -1,49 +1,40 @@
-FROM node:16 as builder
+FROM node:14 as deps
 
-WORKDIR /calcom
+WORKDIR /app
-ARG NEXT_PUBLIC_WEBAPP_URL=http://localhost:3000
+COPY calendso/package.json calendso/yarn.lock ./
+COPY calendso/prisma prisma
+RUN yarn install --frozen-lockfile
+
+FROM node:14 as builder
+
+WORKDIR /app
+ARG BASE_URL
 ARG NEXT_PUBLIC_APP_URL
 ARG NEXT_PUBLIC_LICENSE_CONSENT
-ARG CALCOM_TELEMETRY_DISABLED
+ARG NEXT_PUBLIC_TELEMETRY_KEY 
-ARG DATABASE_URL
+ENV BASE_URL=$BASE_URL \
-ARG NEXTAUTH_SECRET=secret
-ARG CALENDSO_ENCRYPTION_KEY=secret
-ARG MAX_OLD_SPACE_SIZE=4096
-
-ENV NEXT_PUBLIC_WEBAPP_URL=$NEXT_PUBLIC_WEBAPP_URL \
     NEXT_PUBLIC_APP_URL=$NEXT_PUBLIC_APP_URL \
     NEXT_PUBLIC_LICENSE_CONSENT=$NEXT_PUBLIC_LICENSE_CONSENT \
-    CALCOM_TELEMETRY_DISABLED=$CALCOM_TELEMETRY_DISABLED \
+    NEXT_PUBLIC_TELEMETRY_KEY=$NEXT_PUBLIC_TELEMETRY_KEY
-    DATABASE_URL=$DATABASE_URL \
-    NEXTAUTH_SECRET=${NEXTAUTH_SECRET} \
-    CALENDSO_ENCRYPTION_KEY=${CALENDSO_ENCRYPTION_KEY} \
-    NODE_OPTIONS=--max-old-space-size=${MAX_OLD_SPACE_SIZE}
     
-COPY calcom/package.json calcom/yarn.lock calcom/turbo.json ./
+COPY calendso .
-COPY calcom/apps/web ./apps/web
-COPY calcom/packages ./packages
 
-RUN yarn config set network-timeout 1000000000 -g && \ 
+COPY --from=deps /app/node_modules ./node_modules
-    yarn install --frozen-lockfile
+RUN yarn build && yarn install --production --ignore-scripts --prefer-offline
 
-RUN yarn build
+FROM node:14 as runner
-
+WORKDIR /app
-FROM node:16 as runner
-
-WORKDIR /calcom
 ENV NODE_ENV production
 
-RUN apt-get update && \
+COPY --from=builder /app/node_modules ./node_modules
-    apt-get -y install netcat && \
+COPY --from=builder /app/prisma ./prisma
-    rm -rf /var/lib/apt/lists/* && \
+COPY --from=builder /app/scripts ./scripts
-    npm install --global prisma
+COPY --from=builder /app/next.config.js ./
-
+COPY --from=builder /app/next-i18next.config.js ./
-COPY calcom/package.json calcom/yarn.lock calcom/turbo.json ./
+COPY --from=builder /app/public ./public
-COPY --from=builder /calcom/node_modules ./node_modules
+COPY --from=builder /app/.next ./.next
-COPY --from=builder /calcom/packages ./packages
+COPY --from=builder /app/package.json ./package.json
-COPY --from=builder /calcom/apps/web ./apps/web
-COPY --from=builder /calcom/packages/prisma/schema.prisma ./prisma/schema.prisma
 COPY  scripts scripts
 
 EXPOSE 3000
-CMD ["/calcom/scripts/start.sh"]
+CMD ["/app/scripts/start.sh"]

README.md

@@ -1,24 +1,22 @@
 <!-- PROJECT LOGO -->
 <div align="right">
-  <a href="https://github.com/calcom/cal.com">
+  <a href="https://github.com/calendso/calendso">
     <img src="https://cal.com/logo.svg" alt="Logo" width="160" height="65">
   </a><br/>
   <a href="https://cal.com">Website</a>
   ·
-  <a href="https://github.com/calcom/docker/issues">Community Support</a>
+  <a href="https://github.com/calendso/calendso-docker/issues">Community Support</a>
 </div>
 
 # Docker
 
-NOTE: DockerHub organization has not yet been renamed.
+This image can be found on DockerHub at [https://hub.docker.com/repository/docker/calendso/calendso](https://hub.docker.com/repository/docker/calendso/calendso)
 
-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 Calendso is an effort powered by people within the community. Calendso does not provide official support for Docker, but we will accept fixes and documentation. Use at your own risk.
-
-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.
 
 ## Important Notes
 
-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)
+This Docker Image is managed by the Calendso Community. Support for this image can be found via the repository, located at [https://github.com/calendso/docker](https://github.com/calendso/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.
 
@@ -26,123 +24,64 @@ For Production, for the time being, please checkout the repository and build/pus
 
 ## Requirements
 
-Make sure you have `docker` & `docker compose` installed on the server / system. Both are installed by most docker utilities, including Docker Desktop and Rancher Desktop.
+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
 
-1. Clone calcom-docker
+1. Clone calendso-docker
 
     ```bash
-    git clone https://github.com/calcom/docker.git calcom-docker
+    git clone --recursive https://github.com/calendso/docker.git calendso-docker
     ```
 
 2. Change into the directory
 
     ```bash
-    cd calcom-docker
+    cd calendso-docker
     ```
 
-3. Update the calcom submodule. 
+3. Rename `.env.example` to `.env` and update `.env` if needed.
+
+4. Build and start calendso
 
     ```bash
-    git submodule update --remote --init
+    docker-compose up --build
     ```
 
-    Note: DO NOT use recursive submodule update, otherwise you will receive a git authentication error.
+5. Start prisma studio
-
-4. Rename `.env.example` to `.env` and then update `.env`
-
-5. Build the Cal.com docker image: 
-
-    Note: Due to application configuration requirements, an available database is currently required during the build process.
-
-    a) If hosting elsewhere, configure the `DATABASE_URL` in the .env file, and skip the next step
-
-    b) If a local or temporary database is required, start a local database via docker compose.
 
     ```bash
-    docker compose up -d database
+    docker-compose exec calendso npx prisma studio
     ```
 
-6. Build Cal.com via docker compose (DOCKER_BUILDKIT=0 must be provided to allow a network bridge to be used at build time. This requirement will be removed in the future)
+6. Open a browser to [http://localhost:5555](http://localhost:5555) to look at or modify the database content.
 
-    ```bash
+7. Click on the `User` model to add a new user record.
-    DOCKER_BUILDKIT=0 docker compose build calcom
-    ```
 
-7. Start Cal.com via docker compose
+8. 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.
 
-    (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:
+9. Open a browser to [http://localhost:3000](http://localhost:3000) and login with your just created, first user.
-
-    ```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.**
-
-8. (First Run) Open a browser to [http://localhost:5555](http://localhost:5555) to look at or modify the database content.
-
-    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 |  |  |
-| 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` |
 
 ## Git Submodules
 
 This repository uses a git submodule.
 
-To update the calcom submodule, use the following command:
+If you cloned the repository without using `--recursive`, then you can initialize and clone the submodule with the following steps.
 
-```bash
+1. Init the submodule
-git submodule update --remote --init
+
-```
+    ```bash
+    git submodule init
+    ```
+
+2. Update the submodule
+
+    ```bash
+    git submodule update --remote
+    ```
 
 For more advanced usage, please refer to the git documentation: [https://git-scm.com/book/en/v2/Git-Tools-Submodules](https://git-scm.com/book/en/v2/Git-Tools-Submodules)
 
 ## 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.
-* 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.

SECURITY.md

@@ -1,38 +0,0 @@
-# Security
-Contact: security@cal.com
-
-Based on [https://supabase.com/.well-known/security.txt](https://supabase.com/.well-known/security.txt)
-
-At Cal.com, we consider the security of our systems a top priority. But no matter how much effort we put into system security, there can still be vulnerabilities present.
-
-If you discover a vulnerability, we would like to know about it so we can take steps to address it as quickly as possible. We would like to ask you to help us better protect our clients and our systems.
-
-## Out of scope vulnerabilities:
-
-*   Clickjacking on pages with no sensitive actions.
-*   Unauthenticated/logout/login CSRF.
-*   Attacks requiring MITM or physical access to a user's device.
-*   Any activity that could lead to the disruption of our service (DoS).
-*   Content spoofing and text injection issues without showing an attack vector/without being able to modify HTML/CSS.
-*   Email spoofing
-*   Missing DNSSEC, CAA, CSP headers
-*   Lack of Secure or HTTP only flag on non-sensitive cookies
-*   Deadlinks
-
-## Please do the following:
-
-*   E-mail your findings to [security@cal.com](mailto:security@cal.com).
-*   Do not run automated scanners on our infrastructure or dashboard. If you wish to do this, contact us and we will set up a sandbox for you.
-*   Do not take advantage of the vulnerability or problem you have discovered, for example by downloading more data than necessary to demonstrate the vulnerability or deleting or modifying other people's data,
-*   Do not reveal the problem to others until it has been resolved,
-*   Do not use attacks on physical security, social engineering, distributed denial of service, spam or applications of third parties,
-*   Do provide sufficient information to reproduce the problem, so we will be able to resolve it as quickly as possible. Usually, the IP address or the URL of the affected system and a description of the vulnerability will be sufficient, but complex vulnerabilities may require further explanation.
-
-## What we promise:
-
-*   We will respond to your report within 3 business days with our evaluation of the report and an expected resolution date,
-*   If you have followed the instructions above, we will not take any legal action against you in regard to the report,
-*   We will handle your report with strict confidentiality, and not pass on your personal details to third parties without your permission,
-*   We will keep you informed of the progress towards resolving the problem,
-*   In the public information concerning the problem reported, we will give your name as the discoverer of the problem (unless you desire otherwise), and
-*   We strive to resolve all problems as quickly as possible, and we would like to play an active role in the ultimate publication on the problem after it is resolved.

docker-compose.yaml

@@ -1,17 +1,15 @@
 # Use postgres/example user/password credentials
-version: '3.8'
+version: '3.1'
 
 volumes:
   database-data:
 
 networks:
   stack:
-    name: stack
     external: false
 
 services:
   database:
-    container_name: database
     image: postgres
     restart: always
     volumes:
@@ -20,18 +18,16 @@ services:
     networks:
       - stack
 
-  calcom:
+  calendso:
     build:
       context: .
       dockerfile: Dockerfile
       args:
-        NEXT_PUBLIC_WEBAPP_URL: ${NEXT_PUBLIC_WEBAPP_URL}
+        - BASE_URL=${BASE_URL}
-        NEXT_PUBLIC_LICENSE_CONSENT: ${NEXT_PUBLIC_LICENSE_CONSENT}
+        - NEXT_PUBLIC_APP_URL=${NEXT_PUBLIC_APP_URL}
-        CALCOM_TELEMETRY_DISABLE: ${CALCOM_TELEMETRY_DISABLED}
+        - NEXT_PUBLIC_LICENSE_CONSENT=${NEXT_PUBLIC_LICENSE_CONSENT}
-        NEXTAUTH_SECRET: ${NEXTAUTH_SECRET}
+        - NEXT_PUBLIC_TELEMETRY_KEY=${NEXT_PUBLIC_TELEMETRY_KEY}
-        CALENDSO_ENCRYPTION_KEY: ${CALENDSO_ENCRYPTION_KEY}
+    image: calendso/calendso:latest
-        DATABASE_URL: ${DATABASE_URL}
-      network: stack
     restart: always
     networks:
       - stack
@@ -40,8 +36,12 @@ services:
     env_file: .env
     environment:
       - DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${DATABASE_HOST}/${POSTGRES_DB}
+      - NODE_ENV=development
     depends_on:
       - database
+    volumes:
+      - "./calendso:/app/"
+      - "./scripts:/app/scripts"
 
 # Optional use of Prisma Studio. In production, comment out or remove the section below to prevent unwanted access to your database.
   studio:

scripts/start.sh

@@ -1,7 +1,14 @@
-#!/bin/sh
+#!/bin/bash
 set -x
 
-scripts/wait-for-it.sh ${DATABASE_HOST} -- echo "database is up"
+# # Set environment variables
-npx prisma migrate deploy --schema /calcom/packages/prisma/schema.prisma
+# echo NEXT_PUBLIC_APP_URL $NEXT_PUBLIC_APP_URL
-npx ts-node --transpile-only /calcom/packages/prisma/seed-app-store.ts
+# find \( -type d -name .git -prune \) -o -type f -print0 | xargs -0 sed -i "s#$NEXT_PUBLIC_APP_URL#$NEXT_PUBLIC_APP_URL_SUBSTITUTE#g"
-yarn start
+
+/app/scripts/wait-for-it.sh ${DATABASE_HOST} -- echo "database is up"
+npx prisma migrate deploy
+if [[ $NODE_ENV == "development" ]]; then
+    yarn dev
+else
+    yarn start
+fi

scripts/wait-for-it.sh

@@ -54,7 +54,7 @@ wait_for() {
       ;;
     wget)
       if ! command -v wget >/dev/null; then
-        echoerr 'wget command is missing!'
+        echoerr 'nc command is missing!'
         exit 1
       fi
       ;;