Compare commits

..

147 Commits

Author SHA1 Message Date
Colin Griffin
ba305eafc1 tag version 3.0.7 2023-06-26 18:02:17 -04:00
actions-user
c8abf7a184 Auto updated submodule references 2023-06-26 04:04:36 +00:00
actions-user
f5ca95e8a8 Auto updated submodule references 2023-06-24 04:04:28 +00:00
actions-user
6f6a258db1 Auto updated submodule references 2023-06-23 04:04:32 +00:00
actions-user
91b9623260 Auto updated submodule references 2023-06-22 04:04:23 +00:00
actions-user
594b253883 Auto updated submodule references 2023-06-21 04:04:31 +00:00
actions-user
465216f223 Auto updated submodule references 2023-06-20 04:04:20 +00:00
Colin Griffin
45ecfb1332 Merge pull request #263 from calcom/dependabot/github_actions/actions/checkout-3
Bump actions/checkout from 2 to 3
2023-06-19 08:11:45 +01:00
dependabot[bot]
b05bf66a98 Bump actions/checkout from 2 to 3
Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-06-19 07:09:29 +00:00
actions-user
d6e52074fc Auto updated submodule references 2023-06-19 04:04:18 +00:00
actions-user
f8b0f22dd6 Auto updated submodule references 2023-06-18 04:04:06 +00:00
actions-user
cd18541a77 Auto updated submodule references 2023-06-17 04:04:08 +00:00
actions-user
36bc2a5e98 Auto updated submodule references 2023-06-16 04:04:31 +00:00
actions-user
84223fd3c2 Auto updated submodule references 2023-06-15 04:04:16 +00:00
Colin Griffin
a4d313ef8b Merge pull request #259 from jokay/feature/add-health-check
Add health check
2023-06-14 10:12:00 +01:00
D. Domig
4ea7fc4db6 Add health check 2023-06-14 09:51:22 +02:00
Colin Griffin
0aca750ab4 remove arm and restore ubuntu-latest to resume publishing without ARM 2023-06-14 08:37:40 +01:00
actions-user
4f011445a0 Auto updated submodule references 2023-06-14 04:04:28 +00:00
actions-user
030eecf235 Auto updated submodule references 2023-06-13 04:04:41 +00:00
actions-user
0e63623d06 Auto updated submodule references 2023-06-12 04:04:31 +00:00
actions-user
4526b07644 Auto updated submodule references 2023-06-11 04:04:23 +00:00
actions-user
15043e209b Auto updated submodule references 2023-06-10 04:04:18 +00:00
actions-user
a99a2d791a Auto updated submodule references 2023-06-09 04:04:41 +00:00
actions-user
c812c07076 Auto updated submodule references 2023-06-08 04:04:27 +00:00
actions-user
659c4a3dd0 Auto updated submodule references 2023-06-07 04:04:32 +00:00
actions-user
e7d50ea0e8 Auto updated submodule references 2023-06-06 04:04:17 +00:00
actions-user
d1841b2287 Auto updated submodule references 2023-06-05 04:04:04 +00:00
Colin Griffin
a24104bbc7 Merge pull request #248 from calcom/fix/max-parallelism
Update docker-build-push-dockerhub.yml
2023-06-04 13:04:53 -04:00
Colin Griffin
eb5ac7b4be Update docker-build-push-dockerhub.yml 2023-06-04 13:04:39 -04:00
Colin Griffin
9cda60d822 Merge pull request #193 from calcom/fix/enable-arm
Re-introduce ARM build
2023-06-04 02:15:41 -04:00
Colin Griffin
ed9f386e22 re-enable image push 2023-06-04 02:11:16 -04:00
Colin Griffin
deaadc84ac limit to 1 concurrent docker runner 2023-06-04 02:09:07 -04:00
Colin Griffin
8892507e29 add dependabot and update actions deps 2023-06-04 00:10:32 -04:00
actions-user
1e6ef72a1c Auto updated submodule references 2023-06-04 04:04:01 +00:00
Colin Griffin
62310b0207 remove amd64 2023-06-03 23:04:46 -04:00
Colin Griffin
377964da71 fix docker-compose command (remove hyphen) 2023-06-03 22:22:31 -04:00
Colin Griffin
b93882f36f resolve conflicts 2023-06-03 21:35:15 -04:00
Colin Griffin
ea9679f32c update calcom 2023-06-03 21:03:47 -04:00
Colin Griffin
59f7b813c2 fix docker compose command syntax 2023-06-03 13:56:30 -04:00
Colin Griffin
cd8c092600 add context for builder 2023-06-03 13:56:30 -04:00
Colin Griffin
69721634ab temporarily remove amd64 2023-06-03 13:56:28 -04:00
Colin Griffin
9315c39cdc enable push 2023-06-03 13:56:09 -04:00
Colin Griffin
c4ec75c4af Update docker-build-push-dockerhub.yml
use legacy docker-compose temporarily
2023-06-03 13:55:42 -04:00
Colin Griffin
d0fb4247e5 test local runner 2023-06-03 13:55:26 -04:00
Colin Griffin
d4d7fdbae6 move to self-hosted 2023-06-03 13:55:26 -04:00
Colin Griffin
c652cac1bd update arm64 2023-06-03 13:54:13 -04:00
actions-user
6a143526da Auto updated submodule references 2023-06-03 04:04:23 +00:00
actions-user
98e87102a4 Auto updated submodule references 2023-06-02 04:04:17 +00:00
actions-user
2c1575a47a Auto updated submodule references 2023-06-01 04:05:18 +00:00
actions-user
c027380ecb Auto updated submodule references 2023-05-31 04:04:14 +00:00
actions-user
720639b2ea Auto updated submodule references 2023-05-30 04:04:28 +00:00
actions-user
db2d9dc08e Auto updated submodule references 2023-05-27 04:04:23 +00:00
actions-user
5d0489bf13 Auto updated submodule references 2023-05-26 04:04:22 +00:00
actions-user
6c54c87dfc Auto updated submodule references 2023-05-25 04:04:09 +00:00
actions-user
7fbffa6094 Auto updated submodule references 2023-05-24 04:04:18 +00:00
actions-user
7528e9d0f0 Auto updated submodule references 2023-05-23 04:04:32 +00:00
actions-user
09839f367f Auto updated submodule references 2023-05-22 04:04:11 +00:00
actions-user
21ac156d00 Auto updated submodule references 2023-05-21 04:04:19 +00:00
actions-user
15d7c1cf09 Auto updated submodule references 2023-05-20 04:04:18 +00:00
actions-user
5636ea9001 Auto updated submodule references 2023-05-19 04:04:29 +00:00
actions-user
d7933ece19 Auto updated submodule references 2023-05-18 04:04:23 +00:00
actions-user
b329667c8a Auto updated submodule references 2023-05-17 04:04:09 +00:00
actions-user
730bdd0faf Auto updated submodule references 2023-05-16 04:04:14 +00:00
actions-user
0aaa480367 Auto updated submodule references 2023-05-15 04:04:28 +00:00
actions-user
0dab29dfed Auto updated submodule references 2023-05-14 04:04:24 +00:00
actions-user
9486648e4e Auto updated submodule references 2023-05-13 04:04:17 +00:00
actions-user
e2b95b8f61 Auto updated submodule references 2023-05-12 04:04:42 +00:00
actions-user
5d74a43453 Auto updated submodule references 2023-05-11 04:04:23 +00:00
actions-user
47966b5c26 Auto updated submodule references 2023-05-10 04:04:12 +00:00
actions-user
9359793032 Auto updated submodule references 2023-05-09 04:04:24 +00:00
actions-user
59ad397832 Auto updated submodule references 2023-05-07 04:04:25 +00:00
actions-user
18cfe50f5f Auto updated submodule references 2023-05-06 04:04:17 +00:00
actions-user
e9ede520ba Auto updated submodule references 2023-05-05 04:04:18 +00:00
actions-user
6a03392316 Auto updated submodule references 2023-05-04 04:04:22 +00:00
actions-user
3325e52b64 Auto updated submodule references 2023-05-03 04:04:13 +00:00
actions-user
88bee2ec45 Auto updated submodule references 2023-05-01 04:04:25 +00:00
actions-user
bc3decdd21 Auto updated submodule references 2023-04-29 04:04:23 +00:00
actions-user
bb0aabaf12 Auto updated submodule references 2023-04-28 04:04:20 +00:00
actions-user
9a8058bd92 Auto updated submodule references 2023-04-27 04:04:15 +00:00
actions-user
bd4fc5b877 Auto updated submodule references 2023-04-26 04:04:20 +00:00
actions-user
994b791bcd Auto updated submodule references 2023-04-25 04:04:27 +00:00
actions-user
c442968a13 Auto updated submodule references 2023-04-23 04:04:45 +00:00
actions-user
9c602da764 Auto updated submodule references 2023-04-22 04:04:10 +00:00
actions-user
ee4d60a854 Auto updated submodule references 2023-04-21 04:04:25 +00:00
actions-user
9d50b994da Auto updated submodule references 2023-04-20 04:04:22 +00:00
actions-user
d75d82de2b Auto updated submodule references 2023-04-19 04:04:24 +00:00
actions-user
b4e1788f38 Auto updated submodule references 2023-04-18 04:04:27 +00:00
actions-user
84d89058c8 Auto updated submodule references 2023-04-17 04:04:33 +00:00
actions-user
9d59034af8 Auto updated submodule references 2023-04-16 04:04:18 +00:00
actions-user
ccffeb1842 Auto updated submodule references 2023-04-15 04:04:24 +00:00
actions-user
76b0c8ab73 Auto updated submodule references 2023-04-14 04:04:21 +00:00
actions-user
7f2a0844a6 Auto updated submodule references 2023-04-13 04:04:20 +00:00
actions-user
04fadaf4df Auto updated submodule references 2023-04-12 04:04:22 +00:00
actions-user
3d3eb7097a Auto updated submodule references 2023-04-11 21:06:11 +00:00
actions-user
81dba2d53c Auto updated submodule references 2023-04-11 04:04:12 +00:00
actions-user
da04c4ec7e Auto updated submodule references 2023-04-10 19:51:37 +00:00
actions-user
6fb7bd8712 Auto updated submodule references 2023-04-10 04:04:35 +00:00
actions-user
ca82c6c218 Auto updated submodule references 2023-04-09 04:04:15 +00:00
actions-user
cb9db89ab1 Auto updated submodule references 2023-04-08 04:04:21 +00:00
actions-user
20137bb1e3 Auto updated submodule references 2023-04-07 04:04:31 +00:00
actions-user
78ec934aa5 Auto updated submodule references 2023-04-06 04:04:10 +00:00
actions-user
438bfddbf4 Auto updated submodule references 2023-04-05 04:04:26 +00:00
actions-user
3674dd770f Auto updated submodule references 2023-04-04 04:04:14 +00:00
actions-user
7c445ff49d Auto updated submodule references 2023-04-03 04:04:28 +00:00
actions-user
5233f097b8 Auto updated submodule references 2023-04-02 04:04:15 +00:00
actions-user
091e64a6ed Auto updated submodule references 2023-04-01 04:04:29 +00:00
actions-user
373571e4d5 Auto updated submodule references 2023-03-31 04:04:13 +00:00
actions-user
c77ccdfc4f Auto updated submodule references 2023-03-30 04:04:21 +00:00
actions-user
a81056818d Auto updated submodule references 2023-03-29 04:04:29 +00:00
actions-user
bda88300c6 Auto updated submodule references 2023-03-28 04:04:23 +00:00
actions-user
ccf2c517c3 Auto updated submodule references 2023-03-27 04:04:32 +00:00
actions-user
97a5a9b7a9 Auto updated submodule references 2023-03-26 04:04:25 +00:00
actions-user
0ae8574f10 Auto updated submodule references 2023-03-25 04:04:23 +00:00
actions-user
8e5ee518b8 Auto updated submodule references 2023-03-24 04:04:23 +00:00
actions-user
be0f84b532 Auto updated submodule references 2023-03-23 04:04:20 +00:00
Colin Griffin
75d7a8b290 remove 'yarn global add turbo' 2023-03-22 16:58:50 -04:00
actions-user
e5b7a307eb Auto updated submodule references 2023-03-22 04:04:28 +00:00
Colin Griffin
722ac1fedd Merge pull request #231 from calcom/feature/size-reduction
Reduce image size significantly
2023-03-21 16:00:07 -04:00
Colin Griffin
d4fc846117 add a third stage and remove cached files, to reduce overall size substantially 2023-03-21 04:21:31 -04:00
actions-user
4a4fb0cc4b Auto updated submodule references 2023-03-21 04:04:39 +00:00
Colin Griffin
66b448b21d add yarnrc to runner 2023-03-20 02:33:39 -04:00
Colin Griffin
3f284777d9 Merge pull request #228 from calcom/temp19fix
Update base image to node:18
2023-03-20 10:12:19 -04:00
Colin Griffin
556765e31c add db-deploy and seed 2023-03-20 00:09:22 -04:00
actions-user
e378263b9a Auto updated submodule references 2023-03-20 04:04:35 +00:00
actions-user
da0d8c72ba Auto updated submodule references 2023-03-19 04:04:31 +00:00
actions-user
265da863a7 Auto updated submodule references 2023-03-18 04:04:15 +00:00
actions-user
7c3368827d Auto updated submodule references 2023-03-17 04:04:15 +00:00
actions-user
aafe4659d5 Auto updated submodule references 2023-03-16 04:04:19 +00:00
actions-user
90bb564700 Auto updated submodule references 2023-03-15 04:04:28 +00:00
actions-user
0b4ddc1557 Auto updated submodule references 2023-03-14 04:04:24 +00:00
actions-user
83a978defc Auto updated submodule references 2023-03-13 04:04:22 +00:00
actions-user
ef94a405ec Auto updated submodule references 2023-03-12 04:04:13 +00:00
actions-user
0cea741e8d Auto updated submodule references 2023-03-11 04:04:12 +00:00
actions-user
54aa682759 Auto updated submodule references 2023-03-10 04:04:21 +00:00
actions-user
c1d515648c Auto updated submodule references 2023-03-09 04:04:20 +00:00
actions-user
ef52a6bdec Auto updated submodule references 2023-03-08 04:04:17 +00:00
actions-user
a46637ebf5 Auto updated submodule references 2023-03-07 04:04:30 +00:00
actions-user
fe7e381e74 Auto updated submodule references 2023-03-06 04:04:16 +00:00
actions-user
646127b78b Auto updated submodule references 2023-03-05 04:04:09 +00:00
actions-user
2f73753547 Auto updated submodule references 2023-03-04 04:04:30 +00:00
actions-user
c20e4c0e2c Auto updated submodule references 2023-03-03 04:31:12 +00:00
actions-user
052c73319b Auto updated submodule references 2023-03-02 04:04:29 +00:00
actions-user
648719a893 Auto updated submodule references 2023-03-01 04:04:20 +00:00
actions-user
ed3d7db115 Auto updated submodule references 2023-02-28 04:04:17 +00:00
actions-user
ac51207cf2 Auto updated submodule references 2023-02-26 04:04:18 +00:00
actions-user
5d73aa98ae Auto updated submodule references 2023-02-25 04:04:26 +00:00
actions-user
f513207635 Auto updated submodule references 2023-02-24 04:04:23 +00:00
5 changed files with 49 additions and 25 deletions

7
.github/dependabot.yml vendored Normal file
View File

@@ -0,0 +1,7 @@
version: 2
updates:
# Maintain dependencies for GitHub Actions
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"

View File

@@ -23,9 +23,6 @@ on:
# release: # release:
# types: [ created ] # types: [ created ]
# # Allows you to run this workflow manually from the Actions tab
# workflow_dispatch:
# A workflow run is made up of one or more jobs that can run sequentially or in parallel # A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs: jobs:
# This workflow contains a single job called "build" # This workflow contains a single job called "build"
@@ -37,14 +34,14 @@ jobs:
steps: steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- name: checkout - name: checkout
uses: actions/checkout@v2 uses: actions/checkout@v3
- name: Git submodule update - name: Git submodule update
run: | run: |
git submodule update --init git submodule update --init
- name: Log in to the Docker Hub registry - name: Log in to the Docker Hub registry
uses: docker/login-action@v1.10.0 uses: docker/login-action@v2
with: with:
# Username used to log against the Docker registry # Username used to log against the Docker registry
username: ${{ secrets.DOCKER_HUB_USERNAME }} username: ${{ secrets.DOCKER_HUB_USERNAME }}
@@ -54,7 +51,7 @@ jobs:
logout: true # optional, default is true logout: true # optional, default is true
- name: Log in to the Github Container registry - name: Log in to the Github Container registry
uses: docker/login-action@v1.10.0 uses: docker/login-action@v2
with: with:
registry: ghcr.io registry: ghcr.io
username: ${{ github.actor }} username: ${{ github.actor }}
@@ -77,8 +74,8 @@ jobs:
eval $(sed -e '/^#/d' -e 's/^/export /' -e 's/$/;/' .env) ; eval $(sed -e '/^#/d' -e 's/^/export /' -e 's/$/;/' .env) ;
# Temporarily disable ARM build due to runner performance issues # Temporarily disable ARM build due to runner performance issues
# - name: Set up QEMU # - name: Set up QEMU
# uses: docker/setup-qemu-action@v2 # uses: docker/setup-qemu-action@v2
- name: Start database - name: Start database
run: | run: |
@@ -91,10 +88,13 @@ jobs:
network=container:database network=container:database
buildkitd-flags: | buildkitd-flags: |
--allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host --allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host
# config-inline: |
# [worker.oci]
# max-parallelism = 1
- name: Build and push image - name: Build and push image
id: docker_build id: docker_build
uses: docker/build-push-action@v3 uses: docker/build-push-action@v4
with: with:
context: ./ context: ./
file: ./Dockerfile file: ./Dockerfile

View File

@@ -13,7 +13,7 @@ jobs:
shell: bash shell: bash
steps: steps:
- name: checkout - name: checkout
uses: actions/checkout@v2 uses: actions/checkout@v3
- name: Git submodule update - name: Git submodule update
run: | run: |

View File

@@ -1,6 +1,7 @@
FROM node:16 as builder FROM node:18 as builder
WORKDIR /calcom WORKDIR /calcom
ARG NEXT_PUBLIC_LICENSE_CONSENT ARG NEXT_PUBLIC_LICENSE_CONSENT
ARG CALCOM_TELEMETRY_DISABLED ARG CALCOM_TELEMETRY_DISABLED
ARG DATABASE_URL ARG DATABASE_URL
@@ -16,30 +17,32 @@ ENV NEXT_PUBLIC_WEBAPP_URL=http://NEXT_PUBLIC_WEBAPP_URL_PLACEHOLDER \
CALENDSO_ENCRYPTION_KEY=${CALENDSO_ENCRYPTION_KEY} \ 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}
COPY calcom/package.json calcom/yarn.lock 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 ./
COPY calcom/.yarn ./.yarn
COPY calcom/apps/web ./apps/web COPY calcom/apps/web ./apps/web
COPY calcom/packages ./packages COPY calcom/packages ./packages
RUN yarn global add turbo && \ RUN yarn config set httpTimeout 1200000 && \
yarn config set network-timeout 1000000000 -g && \ npx turbo prune --scope=@calcom/web --docker && \
turbo prune --scope=@calcom/web --docker && \ yarn install && \
yarn install yarn db-deploy && \
yarn --cwd packages/prisma seed-app-store
RUN yarn turbo run build --filter=@calcom/web RUN yarn turbo run build --filter=@calcom/web
FROM node:16 as runner # RUN yarn plugin import workspace-tools && \
# yarn workspaces focus --all --production
RUN rm -rf node_modules/.cache .yarn/cache apps/web/.next/cache
FROM node:18 as builder-two
WORKDIR /calcom WORKDIR /calcom
ARG NEXT_PUBLIC_WEBAPP_URL=http://localhost:3000 ARG NEXT_PUBLIC_WEBAPP_URL=http://localhost:3000
ENV NODE_ENV production ENV NODE_ENV production
RUN apt-get update && \ COPY calcom/package.json calcom/.yarnrc.yml calcom/yarn.lock calcom/turbo.json ./
apt-get -y install netcat && \ COPY calcom/.yarn ./.yarn
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/node_modules ./node_modules
COPY --from=builder /calcom/packages ./packages COPY --from=builder /calcom/packages ./packages
COPY --from=builder /calcom/apps/web ./apps/web COPY --from=builder /calcom/apps/web ./apps/web
@@ -53,5 +56,19 @@ ENV NEXT_PUBLIC_WEBAPP_URL=$NEXT_PUBLIC_WEBAPP_URL \
RUN scripts/replace-placeholder.sh http://NEXT_PUBLIC_WEBAPP_URL_PLACEHOLDER ${NEXT_PUBLIC_WEBAPP_URL} RUN scripts/replace-placeholder.sh http://NEXT_PUBLIC_WEBAPP_URL_PLACEHOLDER ${NEXT_PUBLIC_WEBAPP_URL}
FROM node:18 as runner
WORKDIR /calcom
COPY --from=builder-two /calcom ./
ARG NEXT_PUBLIC_WEBAPP_URL=http://localhost:3000
ENV NEXT_PUBLIC_WEBAPP_URL=$NEXT_PUBLIC_WEBAPP_URL \
BUILT_NEXT_PUBLIC_WEBAPP_URL=$NEXT_PUBLIC_WEBAPP_URL
ENV NODE_ENV production
EXPOSE 3000 EXPOSE 3000
CMD ["/calcom/scripts/start.sh"]
HEALTHCHECK --interval=30s --timeout=30s --retries=5 \
CMD wget --spider http://localhost:3000 || exit 1
CMD ["/calcom/scripts/start.sh"]

2
calcom

Submodule calcom updated: 87dbfba5df...9441da9d4e