Compare commits

..

101 Commits

Author SHA1 Message Date
actions-user
680d1c3314 tag version Cal.com version v3.4.6 2023-11-02 11:34:58 +00:00
actions-user
b456c44861 Auto updated submodule references 2023-11-02 04:04:20 +00:00
actions-user
caf2d93632 Auto updated submodule references 2023-11-01 04:04:25 +00:00
actions-user
a5eed610aa Auto updated submodule references 2023-10-31 04:04:19 +00:00
actions-user
905a2832f2 Auto updated submodule references 2023-10-29 04:04:27 +00:00
actions-user
592ac2fb0e Auto updated submodule references 2023-10-28 04:04:10 +00:00
actions-user
0f1cf770cc Auto updated submodule references 2023-10-27 04:04:18 +00:00
actions-user
8d8b18e5bd Auto updated submodule references 2023-10-26 04:04:15 +00:00
actions-user
736dfecc0c Auto updated submodule references 2023-10-25 04:04:34 +00:00
actions-user
4679fc0ddf Auto updated submodule references 2023-10-24 04:04:20 +00:00
actions-user
5956e7f1a0 Auto updated submodule references 2023-10-23 04:04:20 +00:00
actions-user
d8cb522055 Auto updated submodule references 2023-10-21 04:04:32 +00:00
actions-user
a728ac7339 Auto updated submodule references 2023-10-20 04:04:24 +00:00
actions-user
fcf45975df Auto updated submodule references 2023-10-19 04:04:23 +00:00
actions-user
2a5375f4ea Auto updated submodule references 2023-10-18 04:04:20 +00:00
actions-user
b3a3679a6b Auto updated submodule references 2023-10-17 04:04:23 +00:00
Colin Griffin
9fdfca486a move cleanup to last 2023-10-15 12:56:35 -04:00
Colin Griffin
54400a2161 Merge pull request #298 from calcom/fix/multi-image-push
Reuse docker-build-push action to push multiple images
2023-10-15 10:09:03 -04:00
Colin Griffin
e0521c140d cleanup comments 2023-10-15 09:54:19 -04:00
Colin Griffin
dcb66ee989 Reuse docker-build-push action to push multiple images 2023-10-15 09:52:06 -04:00
Colin Griffin
c0f7cf77cb Merge pull request #297 from calcom/fix/push-all-tags-to-dockerhub
Push all tags not just first one in build & push workflow
2023-10-15 09:18:23 -04:00
Syed Ali Shahbaz
c4d6e766fa push all tags not just first one 2023-10-15 17:07:54 +04:00
actions-user
dbbda43758 Auto updated submodule references 2023-10-15 04:04:21 +00:00
actions-user
054b49abde Auto updated submodule references 2023-10-14 04:04:23 +00:00
actions-user
1fdd941c0a Auto updated submodule references 2023-10-13 04:04:31 +00:00
actions-user
cba7f20546 Auto updated submodule references 2023-10-12 04:04:23 +00:00
actions-user
8d58343954 Auto updated submodule references 2023-10-11 04:04:24 +00:00
actions-user
8543c18079 Auto updated submodule references 2023-10-10 04:04:34 +00:00
actions-user
47d0b7e9bf Auto updated submodule references 2023-10-09 04:04:23 +00:00
actions-user
db874ff8b1 Auto updated submodule references 2023-10-07 04:04:27 +00:00
actions-user
b49cf5cd28 Auto updated submodule references 2023-10-06 04:04:22 +00:00
actions-user
0acdb4b98a Auto updated submodule references 2023-10-05 04:04:24 +00:00
actions-user
d282ff71d1 Auto updated submodule references 2023-10-04 04:04:35 +00:00
Colin Griffin
f89ea705e2 Merge pull request #293 from calcom/add-runtime-check
Add runtime check, runtime logs and build logs
2023-10-03 14:57:09 -07:00
actions-user
fca3070045 Auto updated submodule references 2023-10-03 04:04:26 +00:00
actions-user
f32bf8b6da Auto updated submodule references 2023-10-02 04:04:30 +00:00
actions-user
5d58199abc Auto updated submodule references 2023-10-01 04:04:13 +00:00
actions-user
7cc495d54e Auto updated submodule references 2023-09-30 04:04:24 +00:00
Syed Ali Shahbaz
87379fea88 remove unnecessary remnant 2023-09-29 13:58:38 +04:00
Syed Ali Shahbaz
34c213f56a Ready 2023-09-29 13:46:44 +04:00
Syed Ali Shahbaz
04e4c64efe comment push to dockerhub for testing 2023-09-29 12:58:39 +04:00
Syed Ali Shahbaz
a23fd8b12a checkout spcific version 2023-09-29 12:58:02 +04:00
Syed Ali Shahbaz
4be3f45228 fix push step 2023-09-29 12:23:21 +04:00
Syed Ali Shahbaz
d17064f67f split build and push image and test in between 2023-09-29 11:55:30 +04:00
actions-user
aad1382418 Auto updated submodule references 2023-09-29 04:04:35 +00:00
Syed Ali Shahbaz
f7885eed69 Allow pushing to Dockerhub 2023-09-28 23:45:24 +04:00
Syed Ali Shahbaz
008ddd57f3 Remove redundant steps of logging 2023-09-28 22:01:49 +04:00
Syed Ali Shahbaz
0048a58b26 Reduce number of attempts for server health check 2023-09-28 21:40:34 +04:00
Syed Ali Shahbaz
89bd10bd84 debug response 2023-09-28 21:40:09 +04:00
Syed Ali Shahbaz
ff0db3a97c Redirect is also representative of healthy 2023-09-28 20:40:02 +04:00
Syed Ali Shahbaz
bd8a941f50 Publish on port 3000 for accessibility by health check 2023-09-28 19:32:36 +04:00
Syed Ali Shahbaz
8353418232 verbose curl req 2023-09-28 19:08:39 +04:00
Syed Ali Shahbaz
26784d6969 debug curl call endpoint 2023-09-28 18:48:16 +04:00
Syed Ali Shahbaz
a1d56a1f17 Add server startup wait time~2mins 2023-09-28 18:22:49 +04:00
Syed Ali Shahbaz
92512fd052 use next-webapp-url for curl req domain 2023-09-28 18:02:44 +04:00
Syed Ali Shahbaz
933f4722e9 Increase timeout for testing 2023-09-28 17:20:02 +04:00
Syed Ali Shahbaz
4870434673 Increase health check time limit to allow boot 2023-09-28 16:48:04 +04:00
Syed Ali Shahbaz
bcdff6eeb0 add health check 2023-09-28 16:29:35 +04:00
Syed Ali Shahbaz
1cb1dec45b duh 2023-09-28 14:42:34 +04:00
Syed Ali Shahbaz
316124258f Add nextauth and calendso encryption to test runtime 2023-09-28 14:20:21 +04:00
actions-user
44997263f1 Auto updated submodule references 2023-09-28 04:04:21 +00:00
Syed Ali Shahbaz
83d34f8df5 specify 'database' 2023-09-27 20:32:48 +04:00
Syed Ali Shahbaz
42e1b7260a Remove WIP 2023-09-27 20:09:01 +04:00
Syed Ali Shahbaz
d4e0fcecb9 Specify stack as network, as per docker-compose file 2023-09-27 20:06:18 +04:00
Syed Ali Shahbaz
5dbfc57d3c Revert prev 2023-09-27 20:02:20 +04:00
Syed Ali Shahbaz
5f2a14bc63 Add a network to specify where the DB is 2023-09-27 19:58:41 +04:00
Syed Ali Shahbaz
a049989155 revert prev commit 2023-09-27 19:51:07 +04:00
Syed Ali Shahbaz
ff56a03fb6 specify db container in test runtime 2023-09-27 19:37:29 +04:00
Syed Ali Shahbaz
9a74219dfd Update image name in test runtime as digest isn't found/recognized 2023-09-27 18:55:07 +04:00
Syed Ali Shahbaz
2b54576f05 Add load true to load image to local docker env 2023-09-27 18:28:43 +04:00
Syed Ali Shahbaz
fe5c310556 temporary block push to dockerhub for local testing purposes 2023-09-27 18:06:32 +04:00
Syed Ali Shahbaz
d299d9ae5e Add logging to build and runtime steps 2023-09-27 14:55:01 +04:00
Syed Ali Shahbaz
fa788cf600 Adds test runtime check 2023-09-27 14:45:08 +04:00
actions-user
7aea26c8a6 Auto updated submodule references 2023-09-27 04:04:34 +00:00
actions-user
0d690c922a Auto updated submodule references 2023-09-26 04:04:26 +00:00
actions-user
3c74585d48 Auto updated submodule references 2023-09-23 04:04:20 +00:00
actions-user
083867dc77 Auto updated submodule references 2023-09-22 04:04:20 +00:00
actions-user
06dd7f0821 Auto updated submodule references 2023-09-21 04:04:16 +00:00
actions-user
74fadbc4cc Auto updated submodule references 2023-09-20 04:04:14 +00:00
actions-user
838ffae9a6 Auto updated submodule references 2023-09-19 04:04:34 +00:00
actions-user
5b159a7fb4 Auto updated submodule references 2023-09-16 04:04:12 +00:00
actions-user
3ab1d7055e Auto updated submodule references 2023-09-15 04:04:27 +00:00
actions-user
5c57c20d20 Auto updated submodule references 2023-09-14 04:04:24 +00:00
actions-user
98fd99bced Auto updated submodule references 2023-09-13 04:04:30 +00:00
Colin Griffin
c17606cc0a Merge pull request #283 from marcmontu/fix/build-missing-files
fix: add missing tests folder required for build
2023-09-12 09:37:28 -04:00
actions-user
064b31a641 Auto updated submodule references 2023-09-12 04:04:24 +00:00
Marc Rubio
769c1d91ee fix: add missing tests folder required for build
cal.com v3.2.9 has a new tests folder. The Docker image build fails without it.
2023-09-11 16:25:26 +10:00
actions-user
dffaae7cce Auto updated submodule references 2023-09-11 04:04:10 +00:00
actions-user
44c0ba5eaf Auto updated submodule references 2023-09-09 04:04:11 +00:00
actions-user
e6586b196b Auto updated submodule references 2023-09-08 04:04:31 +00:00
actions-user
abcbf1a5de Auto updated submodule references 2023-09-07 04:04:32 +00:00
actions-user
51ad2ea126 Auto updated submodule references 2023-09-06 04:04:06 +00:00
actions-user
12caf3f4bf Auto updated submodule references 2023-09-05 04:04:36 +00:00
actions-user
2265cf05f3 Auto updated submodule references 2023-09-02 04:04:32 +00:00
actions-user
d8b94d4335 Auto updated submodule references 2023-09-01 04:04:26 +00:00
actions-user
8db8b631da Auto updated submodule references 2023-08-31 04:04:14 +00:00
actions-user
0e6fab7bf7 Auto updated submodule references 2023-08-30 04:04:14 +00:00
actions-user
2b0bd7896e Auto updated submodule references 2023-08-29 04:04:32 +00:00
actions-user
a2a9d0aca1 Auto updated submodule references 2023-08-26 04:04:22 +00:00
actions-user
59bed07eca Auto updated submodule references 2023-08-25 04:04:40 +00:00
actions-user
e9673bd1a4 Auto updated submodule references 2023-08-24 04:04:24 +00:00
3 changed files with 85 additions and 11 deletions

View File

@@ -17,6 +17,11 @@ on:
- completed - completed
# Allow running workflow manually from the Actions tab # Allow running workflow manually from the Actions tab
workflow_dispatch: workflow_dispatch:
# Uncomment below to allow specific version workflow run
# inputs:
# version:
# description: 'Version to build'
# required: true
# Leaving in example for releases. Initially we simply push to 'latest' # Leaving in example for releases. Initially we simply push to 'latest'
# on: # on:
@@ -32,7 +37,12 @@ jobs:
# Steps represent a sequence of tasks that will be executed as part of the job # Steps represent a sequence of tasks that will be executed as part of the job
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, uncomment below
# - name: Checkout code at specified version
# uses: actions/checkout@v2
# with:
# ref: ${{ github.event.inputs.version }}
- name: checkout - name: checkout
uses: actions/checkout@v3 uses: actions/checkout@v3
@@ -92,13 +102,14 @@ jobs:
# [worker.oci] # [worker.oci]
# max-parallelism = 1 # max-parallelism = 1
- name: Build and push image - name: Build image
id: docker_build id: docker_build
uses: docker/build-push-action@v4 uses: docker/build-push-action@v4
with: with:
context: ./ context: ./
file: ./Dockerfile file: ./Dockerfile
push: ${{ github.event_name != 'pull_request' }} load: true # Load the image into the Docker daemon
push: false # Do not push the image at this stage
platforms: linux/amd64 platforms: linux/amd64
tags: ${{ steps.meta.outputs.tags }} tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }} labels: ${{ steps.meta.outputs.labels }}
@@ -108,13 +119,75 @@ jobs:
NEXT_PUBLIC_TELEMETRY_KEY=${{ env.NEXT_PUBLIC_TELEMETRY_KEY }} NEXT_PUBLIC_TELEMETRY_KEY=${{ env.NEXT_PUBLIC_TELEMETRY_KEY }}
DATABASE_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@${{ env.DATABASE_HOST }}/${{ env.POSTGRES_DB }} DATABASE_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@${{ env.DATABASE_HOST }}/${{ env.POSTGRES_DB }}
# - name: Build with docker compose - name: Test runtime
run: |
tags="${{ steps.meta.outputs.tags }}"
IFS=',' read -ra ADDR <<< "$tags" # Convert string to array using ',' as delimiter
tag=${ADDR[0]} # Get the first tag
docker run --rm --network stack \
-p 3000:3000 \
-e DATABASE_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@database/${{ env.POSTGRES_DB }} \
-e NEXTAUTH_SECRET=${{ env.NEXTAUTH_SECRET }} \
-e CALENDSO_ENCRYPTION_KEY=${{ env.CALENDSO_ENCRYPTION_KEY }} \
$tag &
server_pid=$!
echo "Waiting for the server to start..."
sleep 120
echo ${{ env.NEXT_PUBLIC_WEBAPP_URL }}/auth/login
for i in {1..60}; do
echo "Checking server health ($i/60)..."
response=$(curl -o /dev/null -s -w "%{http_code}" ${{ env.NEXT_PUBLIC_WEBAPP_URL }}/auth/login)
echo "HTTP Status Code: $response"
if [[ "$response" == "200" ]] || [[ "$response" == "307" ]]; then
echo "Server is healthy"
# Now, shutdown the server
kill $server_pid
exit 0
fi
sleep 1
done
echo "Server health check failed"
kill $server_pid
exit 1
env:
NEXTAUTH_SECRET: 'EI4qqDpcfdvf4A+0aQEEx8JjHxHSy4uWiZw/F32K+pA='
CALENDSO_ENCRYPTION_KEY: '0zfLtY99wjeLnsM7qsa8xsT+Q0oSgnOL'
# - name: Push image
# run: | # run: |
# DOCKER_BUILDKIT=0 docker compose build --build-arg DATABASE_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@${{ env.DATABASE_HOST }}/${{ env.POSTGRES_DB }} calcom # 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@v4
with:
context: ./
file: ./Dockerfile
push: true
platforms: linux/amd64
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
build-args: |
NEXT_PUBLIC_WEBAPP_URL=${{ env.NEXT_PUBLIC_WEBAPP_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 }}
- name: Image digest
run: echo ${{ steps.docker_build.outputs.digest }}
- name: Cleanup - name: Cleanup
run: | run: |
docker compose down docker compose down
- name: Image digest
run: echo ${{ steps.docker_build.outputs.digest }}

View File

@@ -21,6 +21,7 @@ COPY calcom/package.json calcom/yarn.lock calcom/.yarnrc.yml calcom/playwright.c
COPY calcom/.yarn ./.yarn COPY calcom/.yarn ./.yarn
COPY calcom/apps/web ./apps/web COPY calcom/apps/web ./apps/web
COPY calcom/packages ./packages COPY calcom/packages ./packages
COPY calcom/tests ./tests
RUN yarn config set httpTimeout 1200000 && \ RUN yarn config set httpTimeout 1200000 && \
npx turbo prune --scope=@calcom/web --docker && \ npx turbo prune --scope=@calcom/web --docker && \

2
calcom

Submodule calcom updated: 5a6e5ce427...51fd4102ae