From 1466c32259378fb5d6fed61360346bedd0beb19b Mon Sep 17 00:00:00 2001 From: mcm Date: Sun, 30 Oct 2022 11:01:26 -0400 Subject: [PATCH] fix --- .drone.yml | 14 +++--- .env | 139 ----------------------------------------------------- Dockerfile | 2 +- 3 files changed, 9 insertions(+), 146 deletions(-) delete mode 100644 .env diff --git a/.drone.yml b/.drone.yml index 169e018..5a2786e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -7,17 +7,19 @@ steps: image: plugins/download settings: source: https://smcm.xyz/gh/calcom/cal.com/source.tar.gz - # - name: download docker repo - # image: plugins/download - # settings: - # source: https://github.com/calcom/docker/archive/refs/heads/main.tar.gz - # destination: docker.tar.gz + - name: download docker repo + image: plugins/download + settings: + source: https://github.com/calcom/docker/archive/refs/heads/main.tar.gz + destination: docker.tar.gz - name: extract source image: alpine commands: - mkdir calcom - tar --strip-components 1 -C calcom -xzf source.tar.gz - # - tar --strip-components 1 -xzf docker.tar.gz + - mkdir docker + - tar --strip-components 1 -C docker -xzf docker.tar.gz + - mv docker/.dockerignore . - name: git image: alpine/git commands: diff --git a/.env b/.env deleted file mode 100644 index 1ae41ac..0000000 --- a/.env +++ /dev/null @@ -1,139 +0,0 @@ -# ********** INDEX ********** -# -# - LICENSE -# - DATABASE -# - SHARED -# - NEXTAUTH -# - E-MAIL SETTINGS - -# - LICENSE ************************************************************************************************* -# Set this value to 'agree' to accept our license: -# LICENSE: https://github.com/calendso/calendso/blob/main/LICENSE -# -# Summary of terms: -# - The codebase has to stay open source, whether it was modified or not -# - You can not repackage or sell the codebase -# - Acquire a commercial license to remove these terms by visiting: cal.com/sales -NEXT_PUBLIC_LICENSE_CONSENT='agree' -# To enable enterprise-only features, fill your license key in here. -# @see https://console.cal.com -CALCOM_LICENSE_KEY= -# *********************************************************************************************************** - -# - DATABASE ************************************************************************************************ -DATABASE_URL="postgresql://username:password@postgres:5432/database" -# *********************************************************************************************************** - -# - SHARED ************************************************************************************************** -NEXT_PUBLIC_WEBAPP_URL='https://cal.smcm.xyz' -# Change to 'http://localhost:3001' if running the website simultaneously -NEXT_PUBLIC_WEBSITE_URL='https://cal.smcm.xyz' -NEXT_PUBLIC_CONSOLE_URL='http://localhost:3004' -NEXT_PUBLIC_EMBED_LIB_URL='https://cal.smcm.xyz/embed/embed.js' - -# To enable SAML login, set both these variables -# @see https://github.com/calcom/cal.com/tree/main/packages/ee#setting-up-saml-login -# SAML_DATABASE_URL="postgresql://postgres:@localhost:5450/cal-saml" -SAML_DATABASE_URL= -# SAML_ADMINS='pro@example.com' -SAML_ADMINS= -# If you use Heroku to deploy Postgres (or use self-signed certs for Postgres) then uncomment the follow line. -# @see https://devcenter.heroku.com/articles/connecting-heroku-postgres#connecting-in-node-js -# PGSSLMODE='no-verify' -PGSSLMODE= - -# - NEXTAUTH -# @see: https://github.com/calendso/calendso/issues/263 -# @see: https://next-auth.js.org/configuration/options#nextauth_url -# Required for Vercel hosting - set NEXTAUTH_URL to equal your NEXT_PUBLIC_WEBAPP_URL -NEXTAUTH_URL='https://cal.smcm.xyz' -# @see: https://next-auth.js.org/configuration/options#nextauth_secret -# You can use: `openssl rand -base64 32` to generate one -NEXTAUTH_SECRET=lSzudWGm0I9RuB3HU0e2y7RFPh+ET3dLVlUW+NCJGhQ= -# Used for cross-domain cookie authentication -NEXTAUTH_COOKIE_DOMAIN=cal.smcm.xyz - -# Set this to '1' if you don't want Cal to collect anonymous usage -CALCOM_TELEMETRY_DISABLED= - -# ApiKey for cronjobs -CRON_API_KEY='0cc0e6c35519bba620c9360cfe3e68d0' - -# Application Key for symmetric encryption and decryption -# must be 32 bytes for AES256 encryption algorithm -# You can use: `openssl rand -base64 24` to generate one -CALENDSO_ENCRYPTION_KEY=a63a11fe-ddbc-4e3b-8a91-4ce106202bff - -# Intercom Config -NEXT_PUBLIC_INTERCOM_APP_ID= - -# Zendesk Config -NEXT_PUBLIC_ZENDESK_KEY= - -# Help Scout Config -NEXT_PUBLIC_HELPSCOUT_KEY= - -# Inbox to send user feedback -SEND_FEEDBACK_EMAIL= - -# Sengrid -# Used for email reminders in workflows -SENDGRID_API_KEY= -SENDGRID_EMAIL= - -# Twilio -# Used to send SMS reminders in workflows -TWILIO_SID= -TWILIO_TOKEN= -TWILIO_MESSAGING_SID= - -# This is used so we can bypass emails in auth flows for E2E testing -# Set it to "1" if you need to run E2E tests locally -NEXT_PUBLIC_IS_E2E= - -# Used for internal billing system -NEXT_PUBLIC_STRIPE_PRO_PLAN_PRICE= -NEXT_PUBLIC_STRIPE_PREMIUM_PLAN_PRICE= -NEXT_PUBLIC_IS_PREMIUM_NEW_PLAN=0 -NEXT_PUBLIC_STRIPE_PREMIUM_NEW_PLAN_PRICE= -NEXT_PUBLIC_STRIPE_FREE_PLAN_PRICE= -STRIPE_WEBHOOK_SECRET= -STRIPE_PRO_PLAN_PRODUCT_ID= -STRIPE_PREMIUM_PLAN_PRODUCT_ID= -STRIPE_FREE_PLAN_PRODUCT_ID= - -# Use for internal Public API Keys and optional -API_KEY_PREFIX=cal_ -# *********************************************************************************************************** - -# - E-MAIL SETTINGS ***************************************************************************************** -# Cal uses nodemailer (@see https://nodemailer.com/about/) to provide email sending. As such we are trying to -# allow access to the nodemailer transports from the .env file. E-mail templates are accessible within lib/emails/ -# Configures the global From: header whilst sending emails. -EMAIL_FROM='steve@mcmaster.io' - -# Configure SMTP settings (@see https://nodemailer.com/smtp/). -# Note: The below configuration for Office 365 has been verified to work. -EMAIL_SERVER_HOST='smtp.fastmail.com' -EMAIL_SERVER_PORT=587 -EMAIL_SERVER_USER='stevemcmaster@fastmail.com' -# Keep in mind that if you have 2FA enabled, you will need to provision an App Password. -EMAIL_SERVER_PASSWORD='48blvl8eezzlyeww' - -# The following configuration for Gmail has been verified to work. -# EMAIL_SERVER_HOST='smtp.gmail.com' -# EMAIL_SERVER_PORT=465 -# EMAIL_SERVER_USER='' -## You will need to provision an App Password. -## @see https://support.google.com/accounts/answer/185833 -# EMAIL_SERVER_PASSWORD='' -# ********************************************************************************************************** - -# Set the following value to true if you wish to enable Team Impersonation -NEXT_PUBLIC_TEAM_IMPERSONATION=false - -# Close.com internal CRM -CLOSECOM_API_KEY= - -# Sendgrid internal email sender -SENDGRID_API_KEY= \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index d865cff..78623e5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ COPY calcom/node_modules /calcom/node_modules COPY calcom/packages /calcom/packages COPY calcom/apps/web /calcom/apps/web COPY calcom/packages/prisma/schema.prisma /calcom/prisma/schema.prisma -COPY calcom/scripts /calcom/scripts +COPY docker/scripts /calcom/scripts EXPOSE 3000 CMD ["/calcom/scripts/start.sh"] \ No newline at end of file