From 994d5e1ba10332d471e35c7f9137c54c46e10588 Mon Sep 17 00:00:00 2001 From: Philip Niedertscheider Date: Mon, 4 Apr 2022 21:48:42 +0200 Subject: [PATCH 1/3] Fixed dockerfile --- Dockerfile | 41 +++++++++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1bef144..3ca915d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,42 @@ FROM node:14 as deps WORKDIR /calcom + +# Copy rootand all workspace package.json files COPY calendso/package.json calendso/yarn.lock ./ COPY calendso/apps/web/package.json calendso/apps/web/yarn.lock ./apps/web/ -COPY calendso/packages/prisma/package.json ./packages/prisma/package.json -COPY calendso/packages/lib/package.json ./packages/lib/package.json +COPY calendso/packages/ui/package.json ./packages/ui/package.json +COPY calendso/packages/types/package.json ./packages/types/package.json +COPY calendso/packages/core/package.json ./packages/core/package.json +COPY calendso/packages/config/package.json ./packages/config/package.json +COPY calendso/packages/ee/package.json ./packages/ee/package.json COPY calendso/packages/tsconfig/package.json ./packages/tsconfig/package.json -# RUN yarn install --frozen-lockfile -RUN yarn install +COPY calendso/packages/prisma/package.json ./packages/prisma/package.json +COPY calendso/packages/app-store/googlevideo/package.json ./packages/app-store/googlevideo/package.json +COPY calendso/packages/app-store/caldavcalendar/package.json ./packages/app-store/caldavcalendar/package.json +COPY calendso/packages/app-store/zoomvideo/package.json ./packages/app-store/zoomvideo/package.json +COPY calendso/packages/app-store/huddle01video/package.json ./packages/app-store/huddle01video/package.json +COPY calendso/packages/app-store/jitsivideo/package.json ./packages/app-store/jitsivideo/package.json +COPY calendso/packages/app-store/stripepayment/package.json ./packages/app-store/stripepayment/package.json +COPY calendso/packages/app-store/office365video/package.json ./packages/app-store/office365video/package.json +COPY calendso/packages/app-store/office365calendar/package.json ./packages/app-store/office365calendar/package.json +COPY calendso/packages/app-store/tandemvideo/package.json ./packages/app-store/tandemvideo/package.json +COPY calendso/packages/app-store/package.json ./packages/app-store/package.json +COPY calendso/packages/app-store/_example/package.json ./packages/app-store/_example/package.json +COPY calendso/packages/app-store/googlecalendar/package.json ./packages/app-store/googlecalendar/package.json +COPY calendso/packages/app-store/dailyvideo/package.json ./packages/app-store/dailyvideo/package.json +COPY calendso/packages/app-store/applecalendar/package.json ./packages/app-store/applecalendar/package.json +COPY calendso/packages/lib/package.json ./packages/lib/package.json +COPY calendso/packages/embeds/embed-snippet/package.json ./packages/embeds/embed-snippet/package.json +COPY calendso/packages/embeds/embed-react/package.json ./packages/embeds/embed-react/package.json +COPY calendso/packages/embeds/embed-core/package.json ./packages/embeds/embed-core/package.json +COPY calendso/packages/stripe/package.json ./packages/stripe/package.json + +# Prisma schema is required by a post-install script +COPY calendso/packages/prisma/schema.prisma ./packages/prisma/schema.prisma + +# Install dependencies +RUN yarn install --frozen-lockfile FROM node:14 as builder @@ -25,7 +54,7 @@ COPY calendso/package.json calendso/yarn.lock calendso/turbo.json ./ COPY calendso/apps/web ./apps/web COPY calendso/packages ./packages COPY --from=deps /calcom/node_modules ./node_modules -RUN yarn build && yarn install --production --ignore-scripts --prefer-offline +RUN yarn build && yarn install --ignore-scripts --prefer-offline FROM node:14 as runner WORKDIR /calcom @@ -45,7 +74,7 @@ COPY --from=builder /calcom/apps/web/next-i18next.config.js ./apps/web/next-i18n 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 scripts scripts +COPY scripts scripts EXPOSE 3000 CMD ["/calcom/scripts/start.sh"] From 5959bc1fd30faad7412a011f7060369d3450777a Mon Sep 17 00:00:00 2001 From: Philip Niedertscheider Date: Mon, 11 Apr 2022 08:21:38 +0200 Subject: [PATCH 2/3] Updated package.json copies --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 3ca915d..549f024 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,6 +20,7 @@ COPY calendso/packages/app-store/jitsivideo/package.json ./packages/app-store/ji COPY calendso/packages/app-store/stripepayment/package.json ./packages/app-store/stripepayment/package.json COPY calendso/packages/app-store/office365video/package.json ./packages/app-store/office365video/package.json COPY calendso/packages/app-store/office365calendar/package.json ./packages/app-store/office365calendar/package.json +COPY calendso/packages/app-store/slackmessaging/package.json ./packages/app-store/slackmessaging/package.json COPY calendso/packages/app-store/tandemvideo/package.json ./packages/app-store/tandemvideo/package.json COPY calendso/packages/app-store/package.json ./packages/app-store/package.json COPY calendso/packages/app-store/_example/package.json ./packages/app-store/_example/package.json From 7d174536d4a6b8464f68205fd1747ce7c3f8e8ad Mon Sep 17 00:00:00 2001 From: Philip Niedertscheider Date: Tue, 26 Apr 2022 19:54:30 +0200 Subject: [PATCH 3/3] Updated Dockerfile --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 549f024..2c63469 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM node:14 as deps WORKDIR /calcom # Copy rootand all workspace package.json files -COPY calendso/package.json calendso/yarn.lock ./ +COPY calendso/package.json calendso/yarn.lock calendso/turbo.json ./ COPY calendso/apps/web/package.json calendso/apps/web/yarn.lock ./apps/web/ COPY calendso/packages/ui/package.json ./packages/ui/package.json COPY calendso/packages/types/package.json ./packages/types/package.json @@ -22,11 +22,13 @@ COPY calendso/packages/app-store/office365video/package.json ./packages/app-stor COPY calendso/packages/app-store/office365calendar/package.json ./packages/app-store/office365calendar/package.json COPY calendso/packages/app-store/slackmessaging/package.json ./packages/app-store/slackmessaging/package.json COPY calendso/packages/app-store/tandemvideo/package.json ./packages/app-store/tandemvideo/package.json +COPY calendso/packages/app-store/wipemycalother/package.json ./packages/app-store/wipemycalother/package.json COPY calendso/packages/app-store/package.json ./packages/app-store/package.json COPY calendso/packages/app-store/_example/package.json ./packages/app-store/_example/package.json COPY calendso/packages/app-store/googlecalendar/package.json ./packages/app-store/googlecalendar/package.json COPY calendso/packages/app-store/dailyvideo/package.json ./packages/app-store/dailyvideo/package.json COPY calendso/packages/app-store/applecalendar/package.json ./packages/app-store/applecalendar/package.json +COPY calendso/packages/app-store/hubspotothercalendar/package.json ./packages/app-store/hubspotothercalendar/package.json COPY calendso/packages/lib/package.json ./packages/lib/package.json COPY calendso/packages/embeds/embed-snippet/package.json ./packages/embeds/embed-snippet/package.json COPY calendso/packages/embeds/embed-react/package.json ./packages/embeds/embed-react/package.json