From 1d58527a404a16453fcf626b103dd9c5b23b095c Mon Sep 17 00:00:00 2001 From: Colin Griffin Date: Tue, 8 Nov 2022 15:10:01 -0500 Subject: [PATCH 1/9] temporarily disable qemu --- .github/workflows/docker-build-push-dockerhub.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docker-build-push-dockerhub.yml b/.github/workflows/docker-build-push-dockerhub.yml index 4a9be4a..6b74413 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -51,10 +51,6 @@ jobs: password: ${{ secrets.DOCKER_HUB_TOKEN }} # Log out from the Docker registry at the end of a job logout: true # optional, default is true - - - name: Set up Docker builder - id: buildx - uses: docker/setup-buildx-action@v1.6.0 - name: Copy env run: | @@ -63,8 +59,8 @@ jobs: echo "DATABASE_HOST=localhost:5432" >> $GITHUB_ENV eval $(sed -e '/^#/d' -e 's/^/export /' -e 's/$/;/' .env) ; - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 +# - name: Set up QEMU +# uses: docker/setup-qemu-action@v2 - name: Start database run: | From 41f31325269e5ee9f1ffa0aa16f5d189ca743542 Mon Sep 17 00:00:00 2001 From: Colin Griffin Date: Tue, 8 Nov 2022 15:12:25 -0500 Subject: [PATCH 2/9] update options --- .github/workflows/docker-build-push-dockerhub.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker-build-push-dockerhub.yml b/.github/workflows/docker-build-push-dockerhub.yml index 6b74413..bef5b3b 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -5,7 +5,7 @@ name: Build and push image to DockerHub # Controls when the workflow will run on: push: - branches: [main] + # branches: [main] # update on run of Update Calendso nightly submodule update workflow_run: workflows: ["Update Calendso"] @@ -41,8 +41,6 @@ jobs: git submodule update --init - name: Docker Login - # You may pin to the exact commit or the version. - # uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 uses: docker/login-action@v1.10.0 with: # Username used to log against the Docker registry @@ -80,8 +78,8 @@ jobs: with: context: ./ file: ./Dockerfile - push: true - platforms: linux/amd64,linux/arm64 + push: false + platforms: linux/amd64 tags: docker.io/${{ secrets.DOCKER_HUB_USERNAME }}/calendso:latest build-args: | NEXT_PUBLIC_WEBAPP_URL=${{ env.NEXT_PUBLIC_WEBAPP_URL }} From 8e0f97489ddc5450f61b13f86c60b35ad734364d Mon Sep 17 00:00:00 2001 From: Colin Griffin Date: Fri, 11 Nov 2022 17:49:03 -0500 Subject: [PATCH 3/9] prune packages to resolve storybook conflict --- Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index fa5b57e..3f5196f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,8 +20,10 @@ COPY calcom/package.json calcom/yarn.lock calcom/turbo.json ./ COPY calcom/apps/web ./apps/web COPY calcom/packages ./packages -RUN yarn config set network-timeout 1000000000 -g && \ - yarn install --frozen-lockfile +RUN yarn global add turbo && \ + yarn config set network-timeout 1000000000 -g && \ + turbo prune --scope=web --docker && \ + yarn install RUN yarn build From 97c6997c949f574b0ae3112fbd1e9fdc3820a6a9 Mon Sep 17 00:00:00 2001 From: Colin Griffin Date: Fri, 11 Nov 2022 17:51:06 -0500 Subject: [PATCH 4/9] correct package scope --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3f5196f..40c9a4a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ COPY calcom/packages ./packages RUN yarn global add turbo && \ yarn config set network-timeout 1000000000 -g && \ - turbo prune --scope=web --docker && \ + turbo prune --scope=@calcom/web --docker && \ yarn install RUN yarn build From bbd5c3018ea287db773f7ff83840cbc8e4f65f2e Mon Sep 17 00:00:00 2001 From: Colin Griffin Date: Fri, 11 Nov 2022 17:58:54 -0500 Subject: [PATCH 5/9] add build filter --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 40c9a4a..a403b81 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,7 +25,7 @@ RUN yarn global add turbo && \ turbo prune --scope=@calcom/web --docker && \ yarn install -RUN yarn build +RUN yarn turbo run build --filter=@calcom/web FROM node:16 as runner From 7d8f885e58d586dd8804cf52ce21469403b5c733 Mon Sep 17 00:00:00 2001 From: Colin Griffin Date: Thu, 17 Nov 2022 12:58:34 -0500 Subject: [PATCH 6/9] test speed on only arm64 --- .github/workflows/docker-build-push-dockerhub.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-build-push-dockerhub.yml b/.github/workflows/docker-build-push-dockerhub.yml index bef5b3b..075b4c7 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -57,8 +57,10 @@ jobs: echo "DATABASE_HOST=localhost:5432" >> $GITHUB_ENV eval $(sed -e '/^#/d' -e 's/^/export /' -e 's/$/;/' .env) ; -# - name: Set up QEMU -# uses: docker/setup-qemu-action@v2 + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + with: + platforms: linux/arm64 - name: Start database run: | From 1f1f27e9236ecf4bf9a7fab106dde1c4e114fa25 Mon Sep 17 00:00:00 2001 From: Colin Griffin Date: Thu, 17 Nov 2022 12:59:59 -0500 Subject: [PATCH 7/9] test speed on only arm64 --- .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 075b4c7..6ab1b32 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -81,7 +81,7 @@ jobs: context: ./ file: ./Dockerfile push: false - platforms: linux/amd64 + platforms: linux/arm64 tags: docker.io/${{ secrets.DOCKER_HUB_USERNAME }}/calendso:latest build-args: | NEXT_PUBLIC_WEBAPP_URL=${{ env.NEXT_PUBLIC_WEBAPP_URL }} From 793aa88ba036a673103048b4a981c8a7f910e82e Mon Sep 17 00:00:00 2001 From: Colin Griffin Date: Thu, 17 Nov 2022 15:27:55 -0500 Subject: [PATCH 8/9] update runner to remove ARM temporarily --- .github/workflows/docker-build-push-dockerhub.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/docker-build-push-dockerhub.yml b/.github/workflows/docker-build-push-dockerhub.yml index 6ab1b32..a74d4e8 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -56,11 +56,9 @@ jobs: cat .env >> $GITHUB_ENV echo "DATABASE_HOST=localhost:5432" >> $GITHUB_ENV eval $(sed -e '/^#/d' -e 's/^/export /' -e 's/$/;/' .env) ; - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - with: - platforms: linux/arm64 + # Temporarily disable ARM build due to runner performance issues +# - name: Set up QEMU +# uses: docker/setup-qemu-action@v2 - name: Start database run: | @@ -80,8 +78,8 @@ jobs: with: context: ./ file: ./Dockerfile - push: false - platforms: linux/arm64 + push: true + platforms: linux/amd64 tags: docker.io/${{ secrets.DOCKER_HUB_USERNAME }}/calendso:latest build-args: | NEXT_PUBLIC_WEBAPP_URL=${{ env.NEXT_PUBLIC_WEBAPP_URL }} From ad8727b79357879cafb8dd4db785fd9de426d5aa Mon Sep 17 00:00:00 2001 From: Colin Griffin Date: Thu, 17 Nov 2022 16:08:50 -0500 Subject: [PATCH 9/9] re-add branch selector --- .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 a74d4e8..02b513f 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -5,7 +5,7 @@ name: Build and push image to DockerHub # Controls when the workflow will run on: push: - # branches: [main] + branches: [main] # update on run of Update Calendso nightly submodule update workflow_run: workflows: ["Update Calendso"]