Compare commits
277 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c56667d01c | ||
|
|
df60908bbc | ||
|
|
383975f0f9 | ||
|
|
93c6871975 | ||
|
|
22001a8878 | ||
|
|
c364a64e63 | ||
|
|
2f632b3119 | ||
|
|
710d46cef8 | ||
|
|
f0d01cd8da | ||
|
|
19c9adbd76 | ||
|
|
0213dc2a22 | ||
|
|
2fb435fd2d | ||
|
|
6ae787e22b | ||
|
|
c54e21192d | ||
|
|
029500340e | ||
|
|
9e3ffd5de8 | ||
|
|
aba5401b61 | ||
|
|
1e9274f0f9 | ||
|
|
3f5d7ba849 | ||
|
|
345a39b7bd | ||
|
|
a2c59acdc4 | ||
|
|
e924ae54e1 | ||
|
|
5378ec41d2 | ||
|
|
5476bd9a4a | ||
|
|
78e0ba9b5f | ||
|
|
6168c7f9d6 | ||
|
|
6ed38b5372 | ||
|
|
dfedb0eec4 | ||
|
|
271a4d801c | ||
|
|
9379603c43 | ||
|
|
28941265b8 | ||
|
|
5a0f173451 | ||
|
|
8eede75e05 | ||
|
|
3b41e46763 | ||
|
|
83f34dee27 | ||
|
|
08afc65949 | ||
|
|
2de4e8aa48 | ||
|
|
b7b98b5d3e | ||
|
|
9c32c08ef6 | ||
|
|
aabd75f7a6 | ||
|
|
9032cf8f75 | ||
|
|
d30254748e | ||
|
|
0fd7de2ea3 | ||
|
|
8359a7cba2 | ||
|
|
8d4ecf49da | ||
|
|
fbb2904534 | ||
|
|
616f05d4fa | ||
|
|
0c1958899c | ||
|
|
eca2d66723 | ||
|
|
6bfb6d167b | ||
|
|
ccef2a34f5 | ||
|
|
bf8f079587 | ||
|
|
6c580d5e1f | ||
|
|
731706be97 | ||
|
|
60248077e8 | ||
|
|
8c0161787d | ||
|
|
8547540643 | ||
|
|
7ae3ca461d | ||
|
|
18bd01cd6e | ||
|
|
dcd94c7c5e | ||
|
|
978afc99a5 | ||
|
|
b4042f9b60 | ||
|
|
4ab0a256b8 | ||
|
|
050efebde5 | ||
|
|
c82644b2ef | ||
|
|
bc0884bf60 | ||
|
|
fca4383ab7 | ||
|
|
4f6371959a | ||
|
|
ab5921510c | ||
|
|
614d4c42af | ||
|
|
bb85805103 | ||
|
|
44cde6509e | ||
|
|
1c059447c6 | ||
|
|
817138162f | ||
|
|
b832e198dd | ||
|
|
ae6080d0d9 | ||
|
|
3e3e05ca8c | ||
|
|
bcdada5a84 | ||
|
|
83bfa2bb05 | ||
|
|
158a79e007 | ||
|
|
98e0b11663 | ||
|
|
2015012a95 | ||
|
|
3b86e41c24 | ||
|
|
7259d54016 | ||
|
|
e3d7f5f52e | ||
|
|
4f99cb80fb | ||
|
|
a6740e010f | ||
|
|
11baf7e709 | ||
|
|
8a1ecee894 | ||
|
|
47ebce517b | ||
|
|
285035de75 | ||
|
|
e8ecebfcc6 | ||
|
|
765b10bafa | ||
|
|
25fc86715d | ||
|
|
b40ab1a5af | ||
|
|
75aa7b1a27 | ||
|
|
c2a9ec833c | ||
|
|
024eb7bbe2 | ||
|
|
1d1b5f8b3e | ||
|
|
bd8535e37d | ||
|
|
5b2f1169bd | ||
|
|
aebdf0223b | ||
|
|
0735b6636d | ||
|
|
9c7b2a95d6 | ||
|
|
9d1472d0dd | ||
|
|
e33e49c4c6 | ||
|
|
bf32a230bb | ||
|
|
38b24fcba0 | ||
|
|
6f727ddb1d | ||
|
|
aee4eca2e7 | ||
|
|
246e3d8558 | ||
|
|
58ea9f16f3 | ||
|
|
889464ecd8 | ||
|
|
e1f725a1c2 | ||
|
|
d062bfe075 | ||
|
|
67e42a3007 | ||
|
|
d29bfdd58b | ||
|
|
3e78018356 | ||
|
|
498d1795cf | ||
|
|
14d69d1041 | ||
|
|
7be9f6d8bd | ||
|
|
4a5f0761d8 | ||
|
|
32b614cb14 | ||
|
|
96669f496f | ||
|
|
d7f26cbf62 | ||
|
|
d7da108ba5 | ||
|
|
77b04098b7 | ||
|
|
2e91bf6774 | ||
|
|
a0afcfe8ec | ||
|
|
a1e5b3a496 | ||
|
|
36ef264504 | ||
|
|
5f3e5c0e2a | ||
|
|
8481e84b85 | ||
|
|
140912f09d | ||
|
|
a6055fa580 | ||
|
|
1582093c4d | ||
|
|
b1c9108c1d | ||
|
|
0fbf6bde1c | ||
|
|
db0804657a | ||
|
|
7d4b90f9ec | ||
|
|
0b97030fa6 | ||
|
|
29b6946011 | ||
|
|
f784c0c71d | ||
|
|
643aec299c | ||
|
|
375efda479 | ||
|
|
15595f3651 | ||
|
|
dd861996dc | ||
|
|
27781fa8e6 | ||
|
|
79d057ffdf | ||
|
|
51d193fdbc | ||
|
|
fbaa9a856d | ||
|
|
47ea747f52 | ||
|
|
284e29dea1 | ||
|
|
8aed4cc990 | ||
|
|
d51a1de290 | ||
|
|
94d87ee172 | ||
|
|
c06b0312ba | ||
|
|
1c4b5c702d | ||
|
|
81c05450e6 | ||
|
|
72833a2e89 | ||
|
|
a5a0b0b24b | ||
|
|
61dcde88d1 | ||
|
|
3984ad2e77 | ||
|
|
8861afc779 | ||
|
|
7cb2d3466f | ||
|
|
4116868c49 | ||
|
|
77f5909110 | ||
|
|
e6c1248cf2 | ||
|
|
2799a905e5 | ||
|
|
56f0713de5 | ||
|
|
ac34dc3640 | ||
|
|
36c6771396 | ||
|
|
8922bf00d7 | ||
|
|
8373b9ae91 | ||
|
|
0871d0ee0a | ||
|
|
5f99883b5c | ||
|
|
ff467bee61 | ||
|
|
cf53a4b6d9 | ||
|
|
493990078f | ||
|
|
2e50ade5aa | ||
|
|
64a378b828 | ||
|
|
dc129e1e13 | ||
|
|
fdf7333e07 | ||
|
|
401a1ab394 | ||
|
|
291c45e9a1 | ||
|
|
4a61ff3192 | ||
|
|
c3bf683b73 | ||
|
|
f708e35105 | ||
|
|
ebb19089cf | ||
|
|
6855f71257 | ||
|
|
e7e86db9a8 | ||
|
|
c6d49491ad | ||
|
|
851679e338 | ||
|
|
95749e3fb3 | ||
|
|
9ef03e7ecd | ||
|
|
0e97ed155c | ||
|
|
bf01ed29cc | ||
|
|
c7b142c091 | ||
|
|
531ad65adb | ||
|
|
d5fb0a66f9 | ||
|
|
d68c1ee112 | ||
|
|
6df597e14c | ||
|
|
fe11380291 | ||
|
|
266b8bc42e | ||
|
|
7218b23e5c | ||
|
|
491a6af9f3 | ||
|
|
84dd6ce88e | ||
|
|
aa58fe8084 | ||
|
|
e4d6a0cec2 | ||
|
|
5399db9668 | ||
|
|
d93ae71ff4 | ||
|
|
5352ff10d6 | ||
|
|
e305599235 | ||
|
|
345b4bddcd | ||
|
|
c366daffb2 | ||
|
|
6ee87e323f | ||
|
|
acb4345ad6 | ||
|
|
7ce00f2ee7 | ||
|
|
d4ecf6d533 | ||
|
|
98dda480c1 | ||
|
|
7ce2f43840 | ||
|
|
1d5dca4aa8 | ||
|
|
8586bfa0ce | ||
|
|
fe40ddf340 | ||
|
|
1737cfa437 | ||
|
|
948d17d16c | ||
|
|
45ece65de0 | ||
|
|
baba2f18b5 | ||
|
|
4fbd954613 | ||
|
|
4ca8ede165 | ||
|
|
ac5b3dc557 | ||
|
|
7552e8687d | ||
|
|
b40faca993 | ||
|
|
815255f03d | ||
|
|
18e84ac5c8 | ||
|
|
a24351b736 | ||
|
|
9cf289a930 | ||
|
|
8ea2f3fb36 | ||
|
|
deef0e1097 | ||
|
|
a8dbdd4399 | ||
|
|
5b7359b5e0 | ||
|
|
81c520559d | ||
|
|
19311509d0 | ||
|
|
522c8cc5f2 | ||
|
|
5e6cb3aa8d | ||
|
|
0564afcec4 | ||
|
|
3df9cdcacb | ||
|
|
c30d0efe1d | ||
|
|
b8d7b7eb29 | ||
|
|
135a22bf5b | ||
|
|
b9d7538819 | ||
|
|
897c399a22 | ||
|
|
7fd6e8118b | ||
|
|
5ba19ae91e | ||
|
|
2c6a90f78e | ||
|
|
4a64514d70 | ||
|
|
59105f87cb | ||
|
|
7924c2051a | ||
|
|
c279c189bc | ||
|
|
8845a7ab38 | ||
|
|
fd330b9914 | ||
|
|
0945517ebc | ||
|
|
72c221a0c8 | ||
|
|
64b139d1bc | ||
|
|
e69f114b45 | ||
|
|
d5e24a6daa | ||
|
|
2c1a6395e4 | ||
|
|
43cce1ba4a | ||
|
|
3cfe800a24 | ||
|
|
a8f96a04d1 | ||
|
|
b0b55b3741 | ||
|
|
16b3606572 | ||
|
|
0067efe9a3 | ||
|
|
1e0e1015c1 | ||
|
|
9ec138bee0 | ||
|
|
174dcddada | ||
|
|
06b8d1f521 |
@@ -13,6 +13,7 @@ LICENSE=
|
||||
# NEXT_PUBLIC_APP_URL=http://localhost:3000
|
||||
|
||||
NEXT_PUBLIC_WEBAPP_URL=http://localhost:3000
|
||||
NEXT_PUBLIC_API_V2_URL=http://localhost:5555/api/v2
|
||||
|
||||
# Configure NEXTAUTH_URL manually if needed, otherwise it will resolve to {NEXT_PUBLIC_WEBAPP_URL}/api/auth
|
||||
# NEXTAUTH_URL=http://localhost:3000/api/auth
|
||||
|
||||
@@ -37,6 +37,12 @@ jobs:
|
||||
|
||||
# Steps represent a sequence of tasks that will be executed as part of the job
|
||||
steps:
|
||||
- name: Free Disk Space (Ubuntu)
|
||||
uses: jlumbroso/free-disk-space@main
|
||||
with:
|
||||
# Free about 4.5 GB, elminating our disk space issues
|
||||
tool-cache: true
|
||||
|
||||
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it, uncomment below
|
||||
# - name: Checkout code at specified version
|
||||
# uses: actions/checkout@v2
|
||||
@@ -118,6 +124,7 @@ jobs:
|
||||
labels: ${{ steps.meta.outputs.labels }}
|
||||
build-args: |
|
||||
NEXT_PUBLIC_WEBAPP_URL=${{ env.NEXT_PUBLIC_WEBAPP_URL }}
|
||||
NEXT_PUBLIC_API_V2_URL=${{ env.NEXT_PUBLIC_API_V2_URL }}
|
||||
NEXT_PUBLIC_LICENSE_CONSENT=${{ env.NEXT_PUBLIC_LICENSE_CONSENT }}
|
||||
NEXT_PUBLIC_TELEMETRY_KEY=${{ env.NEXT_PUBLIC_TELEMETRY_KEY }}
|
||||
DATABASE_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@${{ env.DATABASE_HOST }}/${{ env.POSTGRES_DB }}
|
||||
@@ -165,15 +172,6 @@ jobs:
|
||||
NEXTAUTH_SECRET: 'EI4qqDpcfdvf4A+0aQEEx8JjHxHSy4uWiZw/F32K+pA='
|
||||
CALENDSO_ENCRYPTION_KEY: '0zfLtY99wjeLnsM7qsa8xsT+Q0oSgnOL'
|
||||
|
||||
|
||||
# - name: Push image
|
||||
# run: |
|
||||
# tags="${{ steps.meta.outputs.tags }}"
|
||||
# IFS=',' read -ra ADDR <<< "$tags" # Convert string to array using ',' as delimiter
|
||||
# for tag in "${ADDR[@]}"; do
|
||||
# docker push $tag
|
||||
# done
|
||||
|
||||
- name: Push image
|
||||
id: docker_push
|
||||
uses: docker/build-push-action@v5
|
||||
@@ -186,6 +184,7 @@ jobs:
|
||||
labels: ${{ steps.meta.outputs.labels }}
|
||||
build-args: |
|
||||
NEXT_PUBLIC_WEBAPP_URL=${{ env.NEXT_PUBLIC_WEBAPP_URL }}
|
||||
NEXT_PUBLIC_API_V2_URL=${{ env.NEXT_PUBLIC_API_V2_URL }}
|
||||
NEXT_PUBLIC_LICENSE_CONSENT=${{ env.NEXT_PUBLIC_LICENSE_CONSENT }}
|
||||
NEXT_PUBLIC_TELEMETRY_KEY=${{ env.NEXT_PUBLIC_TELEMETRY_KEY }}
|
||||
DATABASE_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@${{ env.DATABASE_HOST }}/${{ env.POSTGRES_DB }}
|
||||
|
||||
26
Dockerfile
26
Dockerfile
@@ -8,29 +8,34 @@ ARG DATABASE_URL
|
||||
ARG NEXTAUTH_SECRET=secret
|
||||
ARG CALENDSO_ENCRYPTION_KEY=secret
|
||||
ARG MAX_OLD_SPACE_SIZE=4096
|
||||
ARG NEXT_PUBLIC_API_V2_URL
|
||||
|
||||
ENV NEXT_PUBLIC_WEBAPP_URL=http://NEXT_PUBLIC_WEBAPP_URL_PLACEHOLDER \
|
||||
NEXT_PUBLIC_API_V2_URL=$NEXT_PUBLIC_API_V2_URL \
|
||||
NEXT_PUBLIC_LICENSE_CONSENT=$NEXT_PUBLIC_LICENSE_CONSENT \
|
||||
CALCOM_TELEMETRY_DISABLED=$CALCOM_TELEMETRY_DISABLED \
|
||||
DATABASE_URL=$DATABASE_URL \
|
||||
DATABASE_DIRECT_URL=$DATABASE_URL \
|
||||
NEXTAUTH_SECRET=${NEXTAUTH_SECRET} \
|
||||
CALENDSO_ENCRYPTION_KEY=${CALENDSO_ENCRYPTION_KEY} \
|
||||
NODE_OPTIONS=--max-old-space-size=${MAX_OLD_SPACE_SIZE}
|
||||
NODE_OPTIONS=--max-old-space-size=${MAX_OLD_SPACE_SIZE} \
|
||||
BUILD_STANDALONE=true
|
||||
|
||||
COPY calcom/package.json calcom/yarn.lock calcom/.yarnrc.yml calcom/playwright.config.ts calcom/turbo.json calcom/git-init.sh calcom/git-setup.sh ./
|
||||
COPY calcom/package.json calcom/yarn.lock calcom/.yarnrc.yml calcom/playwright.config.ts calcom/turbo.json calcom/git-init.sh calcom/git-setup.sh calcom/i18n.json ./
|
||||
COPY calcom/.yarn ./.yarn
|
||||
COPY calcom/apps/web ./apps/web
|
||||
COPY calcom/apps/api/v2 ./apps/api/v2
|
||||
COPY calcom/packages ./packages
|
||||
COPY calcom/tests ./tests
|
||||
|
||||
RUN yarn config set httpTimeout 1200000 && \
|
||||
npx turbo prune --scope=@calcom/web --docker && \
|
||||
yarn install && \
|
||||
yarn db-deploy && \
|
||||
yarn --cwd packages/prisma seed-app-store
|
||||
|
||||
RUN yarn turbo run build --filter=@calcom/web
|
||||
RUN yarn config set httpTimeout 1200000
|
||||
RUN npx turbo prune --scope=@calcom/web --docker
|
||||
RUN yarn install
|
||||
RUN yarn db-deploy
|
||||
RUN yarn --cwd packages/prisma seed-app-store
|
||||
# Build and make embed servable from web/public/embed folder
|
||||
RUN yarn --cwd packages/embeds/embed-core workspace @calcom/embed-core run build
|
||||
RUN yarn --cwd apps/web workspace @calcom/web run build
|
||||
|
||||
# RUN yarn plugin import workspace-tools && \
|
||||
# yarn workspaces focus --all --production
|
||||
@@ -43,8 +48,9 @@ ARG NEXT_PUBLIC_WEBAPP_URL=http://localhost:3000
|
||||
|
||||
ENV NODE_ENV production
|
||||
|
||||
COPY calcom/package.json calcom/.yarnrc.yml calcom/yarn.lock calcom/turbo.json ./
|
||||
COPY calcom/package.json calcom/.yarnrc.yml calcom/turbo.json calcom/i18n.json ./
|
||||
COPY calcom/.yarn ./.yarn
|
||||
COPY --from=builder /calcom/yarn.lock ./yarn.lock
|
||||
COPY --from=builder /calcom/node_modules ./node_modules
|
||||
COPY --from=builder /calcom/packages ./packages
|
||||
COPY --from=builder /calcom/apps/web ./apps/web
|
||||
|
||||
2
calcom
2
calcom
Submodule calcom updated: 1606272850...4481b232cc
@@ -27,6 +27,7 @@ services:
|
||||
dockerfile: Dockerfile
|
||||
args:
|
||||
NEXT_PUBLIC_WEBAPP_URL: ${NEXT_PUBLIC_WEBAPP_URL}
|
||||
NEXT_PUBLIC_API_V2_URL: ${NEXT_PUBLIC_API_V2_URL}
|
||||
NEXT_PUBLIC_LICENSE_CONSENT: ${NEXT_PUBLIC_LICENSE_CONSENT}
|
||||
CALCOM_TELEMETRY_DISABLED: ${CALCOM_TELEMETRY_DISABLED}
|
||||
NEXTAUTH_SECRET: ${NEXTAUTH_SECRET}
|
||||
|
||||
Reference in New Issue
Block a user