Compare commits
1 Commits
v4.2.2
...
release-v4
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a952c05c50 |
@@ -13,7 +13,6 @@ LICENSE=
|
|||||||
# NEXT_PUBLIC_APP_URL=http://localhost:3000
|
# NEXT_PUBLIC_APP_URL=http://localhost:3000
|
||||||
|
|
||||||
NEXT_PUBLIC_WEBAPP_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
|
# Configure NEXTAUTH_URL manually if needed, otherwise it will resolve to {NEXT_PUBLIC_WEBAPP_URL}/api/auth
|
||||||
# NEXTAUTH_URL=http://localhost:3000/api/auth
|
# NEXTAUTH_URL=http://localhost:3000/api/auth
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ on:
|
|||||||
# Uncomment below to allow specific version workflow run
|
# Uncomment below to allow specific version workflow run
|
||||||
# inputs:
|
# inputs:
|
||||||
# version:
|
# version:
|
||||||
# description: 'Version to build'
|
# description: 'Version to build'
|
||||||
# required: true
|
# required: true
|
||||||
|
|
||||||
# Leaving in example for releases. Initially we simply push to 'latest'
|
# Leaving in example for releases. Initially we simply push to 'latest'
|
||||||
@@ -37,12 +37,6 @@ 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:
|
||||||
- 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
|
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it, uncomment below
|
||||||
# - name: Checkout code at specified version
|
# - name: Checkout code at specified version
|
||||||
# uses: actions/checkout@v2
|
# uses: actions/checkout@v2
|
||||||
@@ -72,7 +66,7 @@ jobs:
|
|||||||
registry: ghcr.io
|
registry: ghcr.io
|
||||||
username: ${{ github.actor }}
|
username: ${{ github.actor }}
|
||||||
password: ${{ secrets.GITHUB_TOKEN }}
|
password: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
- name: Docker meta
|
- name: Docker meta
|
||||||
id: meta
|
id: meta
|
||||||
uses: docker/metadata-action@v5
|
uses: docker/metadata-action@v5
|
||||||
@@ -99,7 +93,7 @@ jobs:
|
|||||||
- name: Start database
|
- name: Start database
|
||||||
run: |
|
run: |
|
||||||
docker compose up -d database
|
docker compose up -d database
|
||||||
|
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@v3
|
uses: docker/setup-buildx-action@v3
|
||||||
with:
|
with:
|
||||||
@@ -124,7 +118,6 @@ jobs:
|
|||||||
labels: ${{ steps.meta.outputs.labels }}
|
labels: ${{ steps.meta.outputs.labels }}
|
||||||
build-args: |
|
build-args: |
|
||||||
NEXT_PUBLIC_WEBAPP_URL=${{ env.NEXT_PUBLIC_WEBAPP_URL }}
|
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_LICENSE_CONSENT=${{ env.NEXT_PUBLIC_LICENSE_CONSENT }}
|
||||||
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 }}
|
||||||
@@ -135,7 +128,7 @@ jobs:
|
|||||||
tags="${{ steps.meta.outputs.tags }}"
|
tags="${{ steps.meta.outputs.tags }}"
|
||||||
IFS=',' read -ra ADDR <<< "$tags" # Convert string to array using ',' as delimiter
|
IFS=',' read -ra ADDR <<< "$tags" # Convert string to array using ',' as delimiter
|
||||||
tag=${ADDR[0]} # Get the first tag
|
tag=${ADDR[0]} # Get the first tag
|
||||||
|
|
||||||
docker run --rm --network stack \
|
docker run --rm --network stack \
|
||||||
-p 3000:3000 \
|
-p 3000:3000 \
|
||||||
-e DATABASE_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@database/${{ env.POSTGRES_DB }} \
|
-e DATABASE_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@database/${{ env.POSTGRES_DB }} \
|
||||||
@@ -143,7 +136,7 @@ jobs:
|
|||||||
-e NEXTAUTH_SECRET=${{ env.NEXTAUTH_SECRET }} \
|
-e NEXTAUTH_SECRET=${{ env.NEXTAUTH_SECRET }} \
|
||||||
-e CALENDSO_ENCRYPTION_KEY=${{ env.CALENDSO_ENCRYPTION_KEY }} \
|
-e CALENDSO_ENCRYPTION_KEY=${{ env.CALENDSO_ENCRYPTION_KEY }} \
|
||||||
$tag &
|
$tag &
|
||||||
|
|
||||||
server_pid=$!
|
server_pid=$!
|
||||||
|
|
||||||
|
|
||||||
@@ -151,7 +144,7 @@ jobs:
|
|||||||
sleep 120
|
sleep 120
|
||||||
|
|
||||||
echo ${{ env.NEXT_PUBLIC_WEBAPP_URL }}/auth/login
|
echo ${{ env.NEXT_PUBLIC_WEBAPP_URL }}/auth/login
|
||||||
|
|
||||||
for i in {1..60}; do
|
for i in {1..60}; do
|
||||||
echo "Checking server health ($i/60)..."
|
echo "Checking server health ($i/60)..."
|
||||||
response=$(curl -o /dev/null -s -w "%{http_code}" ${{ env.NEXT_PUBLIC_WEBAPP_URL }}/auth/login)
|
response=$(curl -o /dev/null -s -w "%{http_code}" ${{ env.NEXT_PUBLIC_WEBAPP_URL }}/auth/login)
|
||||||
@@ -164,13 +157,22 @@ jobs:
|
|||||||
fi
|
fi
|
||||||
sleep 1
|
sleep 1
|
||||||
done
|
done
|
||||||
|
|
||||||
echo "Server health check failed"
|
echo "Server health check failed"
|
||||||
kill $server_pid
|
kill $server_pid
|
||||||
exit 1
|
exit 1
|
||||||
env:
|
env:
|
||||||
NEXTAUTH_SECRET: 'EI4qqDpcfdvf4A+0aQEEx8JjHxHSy4uWiZw/F32K+pA='
|
NEXTAUTH_SECRET: 'EI4qqDpcfdvf4A+0aQEEx8JjHxHSy4uWiZw/F32K+pA='
|
||||||
CALENDSO_ENCRYPTION_KEY: '0zfLtY99wjeLnsM7qsa8xsT+Q0oSgnOL'
|
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
|
- name: Push image
|
||||||
id: docker_push
|
id: docker_push
|
||||||
@@ -178,22 +180,21 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
context: ./
|
context: ./
|
||||||
file: ./Dockerfile
|
file: ./Dockerfile
|
||||||
push: true
|
push: true
|
||||||
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 }}
|
||||||
build-args: |
|
build-args: |
|
||||||
NEXT_PUBLIC_WEBAPP_URL=${{ env.NEXT_PUBLIC_WEBAPP_URL }}
|
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_LICENSE_CONSENT=${{ env.NEXT_PUBLIC_LICENSE_CONSENT }}
|
||||||
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 }}
|
||||||
DATABASE_DIRECT_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@${{ env.DATABASE_HOST }}/${{ env.POSTGRES_DB }}
|
DATABASE_DIRECT_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@${{ env.DATABASE_HOST }}/${{ env.POSTGRES_DB }}
|
||||||
if: ${{ !github.event.release.prerelease }}
|
if: ${{ !github.event.release.prerelease }}
|
||||||
|
|
||||||
- name: Image digest
|
- name: Image digest
|
||||||
run: echo ${{ steps.docker_build.outputs.digest }}
|
run: echo ${{ steps.docker_build.outputs.digest }}
|
||||||
|
|
||||||
- name: Cleanup
|
- name: Cleanup
|
||||||
run: |
|
run: |
|
||||||
docker compose down
|
docker compose down
|
||||||
|
|||||||
16
Dockerfile
16
Dockerfile
@@ -8,10 +8,8 @@ ARG DATABASE_URL
|
|||||||
ARG NEXTAUTH_SECRET=secret
|
ARG NEXTAUTH_SECRET=secret
|
||||||
ARG CALENDSO_ENCRYPTION_KEY=secret
|
ARG CALENDSO_ENCRYPTION_KEY=secret
|
||||||
ARG MAX_OLD_SPACE_SIZE=4096
|
ARG MAX_OLD_SPACE_SIZE=4096
|
||||||
ARG NEXT_PUBLIC_API_V2_URL
|
|
||||||
|
|
||||||
ENV NEXT_PUBLIC_WEBAPP_URL=http://NEXT_PUBLIC_WEBAPP_URL_PLACEHOLDER \
|
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 \
|
NEXT_PUBLIC_LICENSE_CONSENT=$NEXT_PUBLIC_LICENSE_CONSENT \
|
||||||
CALCOM_TELEMETRY_DISABLED=$CALCOM_TELEMETRY_DISABLED \
|
CALCOM_TELEMETRY_DISABLED=$CALCOM_TELEMETRY_DISABLED \
|
||||||
DATABASE_URL=$DATABASE_URL \
|
DATABASE_URL=$DATABASE_URL \
|
||||||
@@ -23,16 +21,16 @@ ENV NEXT_PUBLIC_WEBAPP_URL=http://NEXT_PUBLIC_WEBAPP_URL_PLACEHOLDER \
|
|||||||
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 ./
|
||||||
COPY calcom/.yarn ./.yarn
|
COPY calcom/.yarn ./.yarn
|
||||||
COPY calcom/apps/web ./apps/web
|
COPY calcom/apps/web ./apps/web
|
||||||
COPY calcom/apps/api/v2 ./apps/api/v2
|
|
||||||
COPY calcom/packages ./packages
|
COPY calcom/packages ./packages
|
||||||
COPY calcom/tests ./tests
|
COPY calcom/tests ./tests
|
||||||
|
|
||||||
RUN yarn config set httpTimeout 1200000
|
RUN yarn config set httpTimeout 1200000 && \
|
||||||
RUN npx turbo prune --scope=@calcom/web --docker
|
npx turbo prune --scope=@calcom/web --docker && \
|
||||||
RUN yarn install
|
yarn install && \
|
||||||
RUN yarn db-deploy
|
yarn db-deploy && \
|
||||||
RUN yarn --cwd packages/prisma seed-app-store
|
yarn --cwd packages/prisma seed-app-store
|
||||||
RUN yarn --cwd apps/web workspace @calcom/web run build
|
|
||||||
|
RUN yarn turbo run build --filter=@calcom/web
|
||||||
|
|
||||||
# RUN yarn plugin import workspace-tools && \
|
# RUN yarn plugin import workspace-tools && \
|
||||||
# yarn workspaces focus --all --production
|
# yarn workspaces focus --all --production
|
||||||
|
|||||||
2
calcom
2
calcom
Submodule calcom updated: d431607125...97b2816897
@@ -27,7 +27,6 @@ services:
|
|||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile
|
||||||
args:
|
args:
|
||||||
NEXT_PUBLIC_WEBAPP_URL: ${NEXT_PUBLIC_WEBAPP_URL}
|
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}
|
NEXT_PUBLIC_LICENSE_CONSENT: ${NEXT_PUBLIC_LICENSE_CONSENT}
|
||||||
CALCOM_TELEMETRY_DISABLED: ${CALCOM_TELEMETRY_DISABLED}
|
CALCOM_TELEMETRY_DISABLED: ${CALCOM_TELEMETRY_DISABLED}
|
||||||
NEXTAUTH_SECRET: ${NEXTAUTH_SECRET}
|
NEXTAUTH_SECRET: ${NEXTAUTH_SECRET}
|
||||||
|
|||||||
Reference in New Issue
Block a user