From c652cac1bdf970db7ac1b811cbb1cfadfe3235e8 Mon Sep 17 00:00:00 2001 From: Colin Griffin Date: Sat, 3 Jun 2023 13:54:13 -0400 Subject: [PATCH 01/15] update arm64 --- .github/workflows/docker-build-push-dockerhub.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docker-build-push-dockerhub.yml b/.github/workflows/docker-build-push-dockerhub.yml index d43bfac..fa6e0f5 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -23,9 +23,6 @@ on: # release: # 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 jobs: # This workflow contains a single job called "build" @@ -77,8 +74,8 @@ jobs: eval $(sed -e '/^#/d' -e 's/^/export /' -e 's/$/;/' .env) ; # Temporarily disable ARM build due to runner performance issues -# - name: Set up QEMU -# uses: docker/setup-qemu-action@v2 + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 - name: Start database run: | @@ -99,7 +96,7 @@ jobs: context: ./ file: ./Dockerfile push: ${{ github.event_name != 'pull_request' }} - platforms: linux/amd64 + platforms: linux/amd64,linux/arm64 tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} build-args: | From d4d7fdbae6373dee7278581d8566dcb80e0f1544 Mon Sep 17 00:00:00 2001 From: Colin Griffin Date: Thu, 22 Dec 2022 16:45:18 -0500 Subject: [PATCH 02/15] move to self-hosted --- .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 fa6e0f5..a7a9cde 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -28,7 +28,7 @@ jobs: # This workflow contains a single job called "build" build: # The type of runner that the job will run on - runs-on: ubuntu-latest + runs-on: self-hosted # Steps represent a sequence of tasks that will be executed as part of the job steps: From d0fb4247e5db8ca80999d1e6d2dd2bbd66c389b0 Mon Sep 17 00:00:00 2001 From: Colin Griffin Date: Thu, 22 Dec 2022 16:50:00 -0500 Subject: [PATCH 03/15] test local runner --- .github/workflows/docker-build-push-dockerhub.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-build-push-dockerhub.yml b/.github/workflows/docker-build-push-dockerhub.yml index a7a9cde..f7cf66f 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -74,8 +74,8 @@ jobs: eval $(sed -e '/^#/d' -e 's/^/export /' -e 's/$/;/' .env) ; # Temporarily disable ARM build due to runner performance issues - - 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 c4ec75c4aff7d49076f0b208173fc36624a1aa3a Mon Sep 17 00:00:00 2001 From: Colin Griffin Date: Thu, 30 Mar 2023 18:28:35 -0400 Subject: [PATCH 04/15] Update docker-build-push-dockerhub.yml use legacy docker-compose temporarily --- .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 f7cf66f..ae7f6ef 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -79,7 +79,7 @@ jobs: - name: Start database run: | - docker compose up -d database + docker-compose up -d database - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 From 9315c39cdcf39032b0df7c70a6def8d333cc3db4 Mon Sep 17 00:00:00 2001 From: Colin Griffin Date: Thu, 30 Mar 2023 18:49:14 -0400 Subject: [PATCH 05/15] enable push --- .github/workflows/docker-build-push-dockerhub.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/docker-build-push-dockerhub.yml b/.github/workflows/docker-build-push-dockerhub.yml index ae7f6ef..d45fe23 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -95,7 +95,11 @@ jobs: with: context: ./ file: ./Dockerfile +<<<<<<< HEAD push: ${{ github.event_name != 'pull_request' }} +======= + push: true +>>>>>>> f652dce (enable push) platforms: linux/amd64,linux/arm64 tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} From 69721634abc54d5a601663a1c505891a6f18e040 Mon Sep 17 00:00:00 2001 From: Colin Griffin Date: Fri, 31 Mar 2023 09:59:12 -0400 Subject: [PATCH 06/15] temporarily remove amd64 --- .github/workflows/docker-build-push-dockerhub.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/docker-build-push-dockerhub.yml b/.github/workflows/docker-build-push-dockerhub.yml index d45fe23..9c642c5 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -99,10 +99,18 @@ jobs: push: ${{ github.event_name != 'pull_request' }} ======= push: true +<<<<<<< HEAD >>>>>>> f652dce (enable push) platforms: linux/amd64,linux/arm64 tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} +======= + platforms: linux/arm64 + tags: | + docker.io/${{ secrets.DOCKER_HUB_USERNAME }}/calendso:canary + docker.io/calcom/cal.com:canary + ghcr.io/calcom/web:canary +>>>>>>> 2dfa73c (temporarily remove amd64) build-args: | NEXT_PUBLIC_WEBAPP_URL=${{ env.NEXT_PUBLIC_WEBAPP_URL }} NEXT_PUBLIC_LICENSE_CONSENT=${{ env.NEXT_PUBLIC_LICENSE_CONSENT }} From cd8c09260093aedd974e84c9b3b60e3d54afc7c6 Mon Sep 17 00:00:00 2001 From: Colin Griffin Date: Fri, 31 Mar 2023 12:18:00 -0400 Subject: [PATCH 07/15] add context for builder --- .github/workflows/docker-build-push-dockerhub.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/docker-build-push-dockerhub.yml b/.github/workflows/docker-build-push-dockerhub.yml index 9c642c5..2303ad5 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -81,9 +81,20 @@ jobs: run: | docker-compose up -d database + - name: Start database + run: | + docker-compose up -d database + + - name: Create builder + run: docker context create builders + + - name: Use builder + run: docker context use builders + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 with: + endpoint: builders driver-opts: | network=container:database buildkitd-flags: | From 59f7b813c20f10e303bd059499b5f70b90568b39 Mon Sep 17 00:00:00 2001 From: Colin Griffin Date: Thu, 1 Jun 2023 15:38:36 -0400 Subject: [PATCH 08/15] fix docker compose command syntax --- .github/workflows/docker-build-push-dockerhub.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/docker-build-push-dockerhub.yml b/.github/workflows/docker-build-push-dockerhub.yml index 2303ad5..62f5ef7 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -79,11 +79,7 @@ jobs: - name: Start database run: | - docker-compose up -d database - - - name: Start database - run: | - docker-compose up -d database + docker compose up -d database - name: Create builder run: docker context create builders From ea9679f32c4f31d1912a7c262f18de5e2143fef7 Mon Sep 17 00:00:00 2001 From: Colin Griffin Date: Sat, 3 Jun 2023 21:03:47 -0400 Subject: [PATCH 09/15] update calcom --- calcom | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/calcom b/calcom index b4eff25..2640040 160000 --- a/calcom +++ b/calcom @@ -1 +1 @@ -Subproject commit b4eff256360c07c532339526d47d1fced01d55ca +Subproject commit 26400403593382056d45650cee3c62abd4e4e1d8 From b93882f36f2170f2520ae7e6046785074e286428 Mon Sep 17 00:00:00 2001 From: Colin Griffin Date: Sat, 3 Jun 2023 21:35:15 -0400 Subject: [PATCH 10/15] resolve conflicts --- .../workflows/docker-build-push-dockerhub.yml | 21 +------------------ 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/.github/workflows/docker-build-push-dockerhub.yml b/.github/workflows/docker-build-push-dockerhub.yml index 62f5ef7..ae7f6ef 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -79,18 +79,11 @@ jobs: - name: Start database run: | - docker compose up -d database - - - name: Create builder - run: docker context create builders - - - name: Use builder - run: docker context use builders + docker-compose up -d database - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 with: - endpoint: builders driver-opts: | network=container:database buildkitd-flags: | @@ -102,22 +95,10 @@ jobs: with: context: ./ file: ./Dockerfile -<<<<<<< HEAD push: ${{ github.event_name != 'pull_request' }} -======= - push: true -<<<<<<< HEAD ->>>>>>> f652dce (enable push) platforms: linux/amd64,linux/arm64 tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} -======= - platforms: linux/arm64 - tags: | - docker.io/${{ secrets.DOCKER_HUB_USERNAME }}/calendso:canary - docker.io/calcom/cal.com:canary - ghcr.io/calcom/web:canary ->>>>>>> 2dfa73c (temporarily remove amd64) build-args: | NEXT_PUBLIC_WEBAPP_URL=${{ env.NEXT_PUBLIC_WEBAPP_URL }} NEXT_PUBLIC_LICENSE_CONSENT=${{ env.NEXT_PUBLIC_LICENSE_CONSENT }} From 377964da7105913cbe15b280f9ca051ed794e11d Mon Sep 17 00:00:00 2001 From: Colin Griffin Date: Sat, 3 Jun 2023 22:22:31 -0400 Subject: [PATCH 11/15] fix docker-compose command (remove hyphen) --- .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 ae7f6ef..f7cf66f 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -79,7 +79,7 @@ jobs: - name: Start database run: | - docker-compose up -d database + docker compose up -d database - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 From 62310b0207a502d00e2c1c583dee424bb6eb8fa0 Mon Sep 17 00:00:00 2001 From: Colin Griffin Date: Sat, 3 Jun 2023 23:04:46 -0400 Subject: [PATCH 12/15] remove amd64 --- .github/workflows/docker-build-push-dockerhub.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-build-push-dockerhub.yml b/.github/workflows/docker-build-push-dockerhub.yml index f7cf66f..82c07f8 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -95,8 +95,8 @@ jobs: with: context: ./ file: ./Dockerfile - push: ${{ github.event_name != 'pull_request' }} - platforms: linux/amd64,linux/arm64 + push: false + platforms: linux/arm64 tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} build-args: | From 8892507e29d19a05115b759e8f441e47bdf44e36 Mon Sep 17 00:00:00 2001 From: Colin Griffin Date: Sun, 4 Jun 2023 00:10:32 -0400 Subject: [PATCH 13/15] add dependabot and update actions deps --- .github/dependabot.yml | 7 +++++++ .github/workflows/docker-build-push-dockerhub.yml | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..583decf --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,7 @@ +version: 2 +updates: + # Maintain dependencies for GitHub Actions + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "daily" \ No newline at end of file diff --git a/.github/workflows/docker-build-push-dockerhub.yml b/.github/workflows/docker-build-push-dockerhub.yml index 82c07f8..e9569c2 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -34,14 +34,14 @@ jobs: steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - name: checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Git submodule update run: | git submodule update --init - name: Log in to the Docker Hub registry - uses: docker/login-action@v1.10.0 + uses: docker/login-action@v2 with: # Username used to log against the Docker registry username: ${{ secrets.DOCKER_HUB_USERNAME }} @@ -51,7 +51,7 @@ jobs: logout: true # optional, default is true - name: Log in to the Github Container registry - uses: docker/login-action@v1.10.0 + uses: docker/login-action@v2 with: registry: ghcr.io username: ${{ github.actor }} From deaadc84ac30a1d4e9a6c79939ff373e612a4fd7 Mon Sep 17 00:00:00 2001 From: Colin Griffin Date: Sun, 4 Jun 2023 02:09:07 -0400 Subject: [PATCH 14/15] limit to 1 concurrent docker runner --- .github/workflows/docker-build-push-dockerhub.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-build-push-dockerhub.yml b/.github/workflows/docker-build-push-dockerhub.yml index e9569c2..dd48cfd 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -88,15 +88,18 @@ jobs: network=container:database buildkitd-flags: | --allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host + config-inline: | + [worker.oci] + max-parallelism = 1 - name: Build and push image id: docker_build - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v4 with: context: ./ file: ./Dockerfile push: false - platforms: linux/arm64 + platforms: linux/amd64,linux/arm64 tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} build-args: | From ed9f386e220ec23fd3fb219ce6effd6d6dab62ff Mon Sep 17 00:00:00 2001 From: Colin Griffin Date: Sun, 4 Jun 2023 02:11:16 -0400 Subject: [PATCH 15/15] re-enable image push --- .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 dd48cfd..264b698 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -98,7 +98,7 @@ jobs: with: context: ./ file: ./Dockerfile - push: false + push: ${{ github.event_name != 'pull_request' }} platforms: linux/amd64,linux/arm64 tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }}