From 8da9ae1b1ba1cdeb379a13f8701f95fdfcbf2858 Mon Sep 17 00:00:00 2001 From: Colin Griffin Date: Thu, 21 Jul 2022 09:52:00 -0400 Subject: [PATCH 1/6] Update docker-build-push-dockerhub.yml --- .github/workflows/docker-build-push-dockerhub.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-build-push-dockerhub.yml b/.github/workflows/docker-build-push-dockerhub.yml index 0d58278..807a935 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -92,6 +92,8 @@ jobs: # DATABASE_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@${{ env.DATABASE_HOST }}/${{ env.POSTGRES_DB }} - name: Build with docker compose + env: + NODE_OPTIONS: '--max_old_space_size=4096' 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 @@ -105,4 +107,4 @@ jobs: docker compose down - name: Image digest - run: echo ${{ steps.docker_build.outputs.digest }} \ No newline at end of file + run: echo ${{ steps.docker_build.outputs.digest }} From 2449ae51504bb8d7c0a77c45fc779434a927bc1b Mon Sep 17 00:00:00 2001 From: Colin Griffin Date: Thu, 21 Jul 2022 10:11:04 -0400 Subject: [PATCH 2/6] Update docker-build-push-dockerhub.yml --- .github/workflows/docker-build-push-dockerhub.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-build-push-dockerhub.yml b/.github/workflows/docker-build-push-dockerhub.yml index 807a935..fc57931 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -93,7 +93,7 @@ jobs: - name: Build with docker compose env: - NODE_OPTIONS: '--max_old_space_size=4096' + NODE_OPTIONS: --max_old_space_size=4096 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 From 25dbb33e925c277f5682e77859562750edd437d1 Mon Sep 17 00:00:00 2001 From: Colin Griffin Date: Thu, 21 Jul 2022 10:29:20 -0400 Subject: [PATCH 3/6] add node memory options --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 95d149e..30a51ae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,6 +8,7 @@ ARG CALCOM_TELEMETRY_DISABLED ARG DATABASE_URL ARG NEXTAUTH_SECRET=secret ARG CALENDSO_ENCRYPTION_KEY=secret +ARG MAX_OLD_SPACE_SIZE=4096 ENV NEXT_PUBLIC_WEBAPP_URL=$NEXT_PUBLIC_WEBAPP_URL \ NEXT_PUBLIC_APP_URL=$NEXT_PUBLIC_APP_URL \ @@ -15,7 +16,8 @@ ENV NEXT_PUBLIC_WEBAPP_URL=$NEXT_PUBLIC_WEBAPP_URL \ CALCOM_TELEMETRY_DISABLED=$CALCOM_TELEMETRY_DISABLED \ DATABASE_URL=$DATABASE_URL \ NEXTAUTH_SECRET=${NEXTAUTH_SECRET} \ - CALENDSO_ENCRYPTION_KEY=${CALENDSO_ENCRYPTION_KEY} + CALENDSO_ENCRYPTION_KEY=${CALENDSO_ENCRYPTION_KEY} \ + NODE_OPTIONS=--max-old-space-size=${MAX_OLD_SPACE_SIZE} COPY calcom/package.json calcom/yarn.lock calcom/turbo.json ./ COPY calcom/apps/web ./apps/web From 294d8e31f729e813e2d32787cd64d570a2b5dda4 Mon Sep 17 00:00:00 2001 From: Colin Griffin Date: Thu, 21 Jul 2022 10:31:29 -0400 Subject: [PATCH 4/6] temporarily disable image push during testing --- .github/workflows/docker-build-push-dockerhub.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker-build-push-dockerhub.yml b/.github/workflows/docker-build-push-dockerhub.yml index fc57931..59a10bd 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -97,10 +97,10 @@ jobs: 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 - - name: Push docker image - run: | - docker tag docker_calcom:latest calendso/calendso:latest - docker push calendso/calendso:latest +# - name: Push docker image +# run: | +# docker tag docker_calcom:latest calendso/calendso:latest +# docker push calendso/calendso:latest - name: Cleanup run: | From 1933beb5da0d218a44700bd5fdce62e312f4d3cd Mon Sep 17 00:00:00 2001 From: Colin Griffin Date: Thu, 21 Jul 2022 10:42:19 -0400 Subject: [PATCH 5/6] cleanup node envs --- .github/workflows/docker-build-push-dockerhub.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/docker-build-push-dockerhub.yml b/.github/workflows/docker-build-push-dockerhub.yml index 59a10bd..a188b42 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -15,9 +15,6 @@ on: # Allow running workflow manually from the Actions tab workflow_dispatch: -env: - NODE_OPTIONS: '--max_old_space_size=4096' - # Leaving in example for releases. Initially we simply push to 'latest' # on: # release: @@ -92,8 +89,6 @@ jobs: # DATABASE_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@${{ env.DATABASE_HOST }}/${{ env.POSTGRES_DB }} - name: Build with docker compose - env: - NODE_OPTIONS: --max_old_space_size=4096 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 From 0109dbba14cffa7ae96829e075cfe49bc3c4a049 Mon Sep 17 00:00:00 2001 From: Colin Griffin Date: Thu, 21 Jul 2022 10:56:31 -0400 Subject: [PATCH 6/6] Re-enable image push --- .github/workflows/docker-build-push-dockerhub.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker-build-push-dockerhub.yml b/.github/workflows/docker-build-push-dockerhub.yml index a188b42..4f4e6bd 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -92,10 +92,10 @@ jobs: 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 -# - name: Push docker image -# run: | -# docker tag docker_calcom:latest calendso/calendso:latest -# docker push calendso/calendso:latest + - name: Push docker image + run: | + docker tag docker_calcom:latest calendso/calendso:latest + docker push calendso/calendso:latest - name: Cleanup run: |