From e9b9ce423ca5fcdc651cbcc8bc56c7af702cf95e Mon Sep 17 00:00:00 2001 From: actions-user Date: Fri, 22 Apr 2022 04:45:58 +0000 Subject: [PATCH 01/10] Auto updated submodule references --- calendso | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/calendso b/calendso index 6e82d38..69ef309 160000 --- a/calendso +++ b/calendso @@ -1 +1 @@ -Subproject commit 6e82d38249058427fa065c50ceaf4a324aeb1b9b +Subproject commit 69ef309cb54f073bf9c0758a6bddb232af7dcc2b From 09220c21348cdc61b118ded00cd4b897c05d5f40 Mon Sep 17 00:00:00 2001 From: actions-user Date: Sat, 23 Apr 2022 04:20:20 +0000 Subject: [PATCH 02/10] Auto updated submodule references --- calendso | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/calendso b/calendso index 69ef309..8e0c775 160000 --- a/calendso +++ b/calendso @@ -1 +1 @@ -Subproject commit 69ef309cb54f073bf9c0758a6bddb232af7dcc2b +Subproject commit 8e0c7759be314eaeaf3c2185f5003182dfc99e5e From 0bd59bf2ac50672efd9eecd5f31864304057d388 Mon Sep 17 00:00:00 2001 From: actions-user Date: Sun, 24 Apr 2022 04:20:57 +0000 Subject: [PATCH 03/10] Auto updated submodule references --- calendso | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/calendso b/calendso index 8e0c775..2c4a891 160000 --- a/calendso +++ b/calendso @@ -1 +1 @@ -Subproject commit 8e0c7759be314eaeaf3c2185f5003182dfc99e5e +Subproject commit 2c4a891a89c6866c84eed147a1d52c6a0efbe371 From 97f7b356cf3b437e0a8f15b20ac108670c5969bf Mon Sep 17 00:00:00 2001 From: actions-user Date: Mon, 25 Apr 2022 04:25:01 +0000 Subject: [PATCH 04/10] Auto updated submodule references --- calendso | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/calendso b/calendso index 2c4a891..53d7e57 160000 --- a/calendso +++ b/calendso @@ -1 +1 @@ -Subproject commit 2c4a891a89c6866c84eed147a1d52c6a0efbe371 +Subproject commit 53d7e5714280d5bb5c6c14a10a3efaa8fb775fd5 From 5c5ef9ba0be896ff871ba0c4b54047c809ab6efe Mon Sep 17 00:00:00 2001 From: actions-user Date: Tue, 26 Apr 2022 04:29:32 +0000 Subject: [PATCH 05/10] Auto updated submodule references --- calendso | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/calendso b/calendso index 53d7e57..9fffaa2 160000 --- a/calendso +++ b/calendso @@ -1 +1 @@ -Subproject commit 53d7e5714280d5bb5c6c14a10a3efaa8fb775fd5 +Subproject commit 9fffaa20a2d446fbbb555c74759db51e32b90171 From f72731aa620750f9e20df0ffc78c39eada210217 Mon Sep 17 00:00:00 2001 From: Gabe Date: Tue, 26 Apr 2022 09:03:23 -0400 Subject: [PATCH 06/10] Update README.md Fixed URL for Docker Hub --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fd1ba26..31ceb78 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ # Docker -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. Cal.com, Inc. does not provide official support for Docker, but we will accept fixes and documentation. Use at your own risk. From 994d5e1ba10332d471e35c7f9137c54c46e10588 Mon Sep 17 00:00:00 2001 From: Philip Niedertscheider Date: Mon, 4 Apr 2022 21:48:42 +0200 Subject: [PATCH 07/10] 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 08/10] 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 09/10] 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 From 2c38c97501d4e59ecf6b511c7eaa114cb105e17d Mon Sep 17 00:00:00 2001 From: actions-user Date: Tue, 26 Apr 2022 18:55:04 +0000 Subject: [PATCH 10/10] Auto updated submodule references --- calendso | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/calendso b/calendso index 9fffaa2..c22b6ca 160000 --- a/calendso +++ b/calendso @@ -1 +1 @@ -Subproject commit 9fffaa20a2d446fbbb555c74759db51e32b90171 +Subproject commit c22b6ca6703cb3b300ccff57c55b6c744ac3e49d