From 08a3caeb358fb5ca6c5ae05f949f78a5ce102d81 Mon Sep 17 00:00:00 2001 From: Chase Bolt Date: Fri, 13 May 2022 23:17:25 -0700 Subject: [PATCH 1/5] overhaul dockerfile to include missing files required to build successfully --- Dockerfile | 72 +++++++++--------------------------------------------- 1 file changed, 12 insertions(+), 60 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0ae13cb..2cc9741 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,87 +1,39 @@ -FROM node:14 as deps - -WORKDIR /calcom - -# Copy rootand all workspace package.json files -COPY calcom/package.json calcom/yarn.lock calcom/turbo.json ./ -COPY calcom/apps/web/package.json calcom/apps/web/yarn.lock ./apps/web/ -COPY calcom/packages/ui/package.json ./packages/ui/package.json -COPY calcom/packages/types/package.json ./packages/types/package.json -COPY calcom/packages/core/package.json ./packages/core/package.json -COPY calcom/packages/config/package.json ./packages/config/package.json -COPY calcom/packages/ee/package.json ./packages/ee/package.json -COPY calcom/packages/tsconfig/package.json ./packages/tsconfig/package.json -COPY calcom/packages/prisma/package.json ./packages/prisma/package.json -COPY calcom/packages/app-store/googlevideo/package.json ./packages/app-store/googlevideo/package.json -COPY calcom/packages/app-store/caldavcalendar/package.json ./packages/app-store/caldavcalendar/package.json -COPY calcom/packages/app-store/zoomvideo/package.json ./packages/app-store/zoomvideo/package.json -COPY calcom/packages/app-store/huddle01video/package.json ./packages/app-store/huddle01video/package.json -COPY calcom/packages/app-store/jitsivideo/package.json ./packages/app-store/jitsivideo/package.json -COPY calcom/packages/app-store/stripepayment/package.json ./packages/app-store/stripepayment/package.json -COPY calcom/packages/app-store/office365video/package.json ./packages/app-store/office365video/package.json -COPY calcom/packages/app-store/office365calendar/package.json ./packages/app-store/office365calendar/package.json -COPY calcom/packages/app-store/slackmessaging/package.json ./packages/app-store/slackmessaging/package.json -COPY calcom/packages/app-store/tandemvideo/package.json ./packages/app-store/tandemvideo/package.json -COPY calcom/packages/app-store/wipemycalother/package.json ./packages/app-store/wipemycalother/package.json -COPY calcom/packages/app-store/package.json ./packages/app-store/package.json -COPY calcom/packages/app-store/_example/package.json ./packages/app-store/_example/package.json -COPY calcom/packages/app-store/googlecalendar/package.json ./packages/app-store/googlecalendar/package.json -COPY calcom/packages/app-store/dailyvideo/package.json ./packages/app-store/dailyvideo/package.json -COPY calcom/packages/app-store/applecalendar/package.json ./packages/app-store/applecalendar/package.json -COPY calcom/packages/app-store/hubspotothercalendar/package.json ./packages/app-store/hubspotothercalendar/package.json -COPY calcom/packages/lib/package.json ./packages/lib/package.json -COPY calcom/packages/embeds/embed-snippet/package.json ./packages/embeds/embed-snippet/package.json -COPY calcom/packages/embeds/embed-react/package.json ./packages/embeds/embed-react/package.json -COPY calcom/packages/embeds/embed-core/package.json ./packages/embeds/embed-core/package.json -COPY calcom/packages/stripe/package.json ./packages/stripe/package.json - -# Prisma schema is required by a post-install script -COPY calcom/packages/prisma/schema.prisma ./packages/prisma/schema.prisma - -# Install dependencies -RUN yarn install --frozen-lockfile - FROM node:14 as builder WORKDIR /calcom ARG NEXT_PUBLIC_WEBAPP_URL +ARG NEXT_PUBLIC_APP_URL ARG NEXT_PUBLIC_LICENSE_CONSENT ARG NEXT_PUBLIC_TELEMETRY_KEY -# DEPRECATED -ARG BASE_URL -ARG NEXT_PUBLIC_APP_URL +ARG DATABASE_URL ENV NEXT_PUBLIC_WEBAPP_URL=$NEXT_PUBLIC_WEBAPP_URL \ - BASE_URL=$BASE_URL \ NEXT_PUBLIC_APP_URL=$NEXT_PUBLIC_APP_URL \ NEXT_PUBLIC_LICENSE_CONSENT=$NEXT_PUBLIC_LICENSE_CONSENT \ - NEXT_PUBLIC_TELEMETRY_KEY=$NEXT_PUBLIC_TELEMETRY_KEY + NEXT_PUBLIC_TELEMETRY_KEY=$NEXT_PUBLIC_TELEMETRY_KEY \ + DATABASE_URL=$DATABASE_URL COPY calcom/package.json calcom/yarn.lock calcom/turbo.json ./ COPY calcom/apps/web ./apps/web -COPY --from=deps calcom/packages ./packages -COPY --from=deps /calcom/node_modules ./node_modules +COPY calcom/packages ./packages + +RUN yarn install --frozen-lockfile + RUN yarn build FROM node:14 as runner + WORKDIR /calcom ENV NODE_ENV production + RUN apt-get update && \ apt-get -y install netcat && \ rm -rf /var/lib/apt/lists/* && \ npm install --global prisma -COPY calcom/package.json calcom/yarn.lock calcom/turbo.json ./ -COPY --from=deps /calcom/node_modules ./node_modules +COPY --from=builder /calcom/node_modules ./node_modules COPY --from=builder /calcom/packages ./packages -COPY --from=deps /calcom/apps/web/node_modules ./apps/web/node_modules -COPY --from=builder /calcom/apps/web/scripts ./apps/web/scripts -COPY --from=builder /calcom/apps/web/next.config.js ./apps/web/next.config.js -COPY --from=builder /calcom/apps/web/next-i18next.config.js ./apps/web/next-i18next.config.js -COPY --from=builder /calcom/apps/web/public ./apps/web/public -COPY --from=builder /calcom/apps/web/.next ./apps/web/.next -COPY --from=builder /calcom/apps/web/package.json ./apps/web/package.json -COPY --from=builder calcom/packages/prisma/schema.prisma ./prisma/schema.prisma +COPY --from=builder /calcom/apps/web ./apps/web COPY scripts scripts EXPOSE 3000 From 51f0c2c287fc812172a34894b226df4da9d8639a Mon Sep 17 00:00:00 2001 From: Chase Bolt Date: Mon, 16 May 2022 13:56:56 -0700 Subject: [PATCH 2/5] adding back required files --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 2cc9741..4480761 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,6 +31,7 @@ RUN apt-get update && \ rm -rf /var/lib/apt/lists/* && \ npm install --global prisma +COPY calcom/package.json calcom/yarn.lock calcom/turbo.json ./ COPY --from=builder /calcom/node_modules ./node_modules COPY --from=builder /calcom/packages ./packages COPY --from=builder /calcom/apps/web ./apps/web From 5a813f86831894993406ca0766837875b64694e3 Mon Sep 17 00:00:00 2001 From: actions-user Date: Wed, 18 May 2022 04:30:47 +0000 Subject: [PATCH 3/5] Auto updated submodule references --- calcom | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/calcom b/calcom index 6e2cb4f..5a124ce 160000 --- a/calcom +++ b/calcom @@ -1 +1 @@ -Subproject commit 6e2cb4f90da303eab3122dce316e55ebb3a924a4 +Subproject commit 5a124cec72223d35879f56a8715d9151d1826d29 From 20535e8b0472452ada388af57cb8a0fea692a4d2 Mon Sep 17 00:00:00 2001 From: actions-user Date: Thu, 19 May 2022 04:32:57 +0000 Subject: [PATCH 4/5] Auto updated submodule references --- calcom | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/calcom b/calcom index 5a124ce..1c296fb 160000 --- a/calcom +++ b/calcom @@ -1 +1 @@ -Subproject commit 5a124cec72223d35879f56a8715d9151d1826d29 +Subproject commit 1c296fb2d52b5d33e6664b63f8219c2ab7d2fa49 From ea9bb0c0cfb8fd1afc930e7e97dec2b90e710c4b Mon Sep 17 00:00:00 2001 From: actions-user Date: Fri, 20 May 2022 04:27:13 +0000 Subject: [PATCH 5/5] Auto updated submodule references --- calcom | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/calcom b/calcom index 1c296fb..e72ccef 160000 --- a/calcom +++ b/calcom @@ -1 +1 @@ -Subproject commit 1c296fb2d52b5d33e6664b63f8219c2ab7d2fa49 +Subproject commit e72cceff817d80c3fd26536801ed9bac58415a3e