From fa788cf600affa7164b54e52070f246f1d26b352 Mon Sep 17 00:00:00 2001 From: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com> Date: Wed, 27 Sep 2023 14:45:08 +0400 Subject: [PATCH 01/33] Adds test runtime check --- .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 03c3c3a84..77702933a 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -112,6 +112,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: Test runtime + run: | + docker run --rm -e DATABASE_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@${{ env.DATABASE_HOST }}/${{ env.POSTGRES_DB }} ${{ steps.docker_build.outputs.digest }} + - name: Cleanup run: | docker compose down From d299d9ae5e331c2d5e007c15333f68f53a465e16 Mon Sep 17 00:00:00 2001 From: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com> Date: Wed, 27 Sep 2023 14:55:01 +0400 Subject: [PATCH 02/33] Add logging to build and runtime steps --- .github/workflows/docker-build-push-dockerhub.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/workflows/docker-build-push-dockerhub.yml b/.github/workflows/docker-build-push-dockerhub.yml index 77702933a..fb0a5e389 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -107,6 +107,13 @@ jobs: 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: Upload build log on failure + if: steps.docker_build.outputs.exit_code != '0' + uses: actions/upload-artifact@v2 + with: + name: build.log + path: build.log # - name: Build with docker compose # run: | @@ -115,6 +122,13 @@ jobs: - name: Test runtime run: | docker run --rm -e DATABASE_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@${{ env.DATABASE_HOST }}/${{ env.POSTGRES_DB }} ${{ steps.docker_build.outputs.digest }} + + - name: Upload runtime log on failure + if: steps.test_runtime.outputs.exit_code != '0' + uses: actions/upload-artifact@v2 + with: + name: runtime.log + path: runtime.log - name: Cleanup run: | From fe5c310556c1f79a92a4dc7af4aa89864098c55e Mon Sep 17 00:00:00 2001 From: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com> Date: Wed, 27 Sep 2023 18:06:32 +0400 Subject: [PATCH 03/33] temporary block push to dockerhub for local testing purposes --- .github/workflows/docker-build-push-dockerhub.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-build-push-dockerhub.yml b/.github/workflows/docker-build-push-dockerhub.yml index fb0a5e389..107029635 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -98,7 +98,8 @@ jobs: with: context: ./ file: ./Dockerfile - push: ${{ github.event_name != 'pull_request' }} + push: false + # push: ${{ github.event_name != 'pull_request' }} platforms: linux/amd64 tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} From 2b54576f05faebdbdbaca296cacdd8d9e38b0c85 Mon Sep 17 00:00:00 2001 From: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com> Date: Wed, 27 Sep 2023 18:28:43 +0400 Subject: [PATCH 04/33] Add load true to load image to local docker env --- .github/workflows/docker-build-push-dockerhub.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker-build-push-dockerhub.yml b/.github/workflows/docker-build-push-dockerhub.yml index 107029635..438209ba0 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -98,6 +98,7 @@ jobs: with: context: ./ file: ./Dockerfile + load: true push: false # push: ${{ github.event_name != 'pull_request' }} platforms: linux/amd64 From 9a74219dfd956582ec2166ff359a9db2489fae79 Mon Sep 17 00:00:00 2001 From: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com> Date: Wed, 27 Sep 2023 18:55:07 +0400 Subject: [PATCH 05/33] Update image name in test runtime as digest isn't found/recognized --- .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 438209ba0..224106c19 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -123,7 +123,7 @@ jobs: - name: Test runtime run: | - docker run --rm -e DATABASE_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@${{ env.DATABASE_HOST }}/${{ env.POSTGRES_DB }} ${{ steps.docker_build.outputs.digest }} + docker run --rm -e DATABASE_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@${{ env.DATABASE_HOST }}/${{ env.POSTGRES_DB }} docker.io/calcom/cal.com:add-runtime-check - name: Upload runtime log on failure if: steps.test_runtime.outputs.exit_code != '0' From ff56a03fb6394b057672c9ac391489630f52d1e2 Mon Sep 17 00:00:00 2001 From: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com> Date: Wed, 27 Sep 2023 19:37:29 +0400 Subject: [PATCH 06/33] specify db container in test runtime --- .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 224106c19..f29dd1ca2 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -123,7 +123,7 @@ jobs: - name: Test runtime run: | - docker run --rm -e DATABASE_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@${{ env.DATABASE_HOST }}/${{ env.POSTGRES_DB }} docker.io/calcom/cal.com:add-runtime-check + docker run --network container:database --rm -e DATABASE_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@${{ env.DATABASE_HOST }}/${{ env.POSTGRES_DB }} docker.io/calcom/cal.com:add-runtime-check - name: Upload runtime log on failure if: steps.test_runtime.outputs.exit_code != '0' From a049989155e53d4b76d093a61e29524922f8c0cf Mon Sep 17 00:00:00 2001 From: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com> Date: Wed, 27 Sep 2023 19:51:07 +0400 Subject: [PATCH 07/33] revert prev commit --- .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 f29dd1ca2..224106c19 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -123,7 +123,7 @@ jobs: - name: Test runtime run: | - docker run --network container:database --rm -e DATABASE_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@${{ env.DATABASE_HOST }}/${{ env.POSTGRES_DB }} docker.io/calcom/cal.com:add-runtime-check + docker run --rm -e DATABASE_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@${{ env.DATABASE_HOST }}/${{ env.POSTGRES_DB }} docker.io/calcom/cal.com:add-runtime-check - name: Upload runtime log on failure if: steps.test_runtime.outputs.exit_code != '0' From 5f2a14bc63ccf22967489fbcabe724fc80dbbbcb Mon Sep 17 00:00:00 2001 From: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com> Date: Wed, 27 Sep 2023 19:58:41 +0400 Subject: [PATCH 08/33] Add a network to specify where the DB is --- .github/workflows/docker-build-push-dockerhub.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-build-push-dockerhub.yml b/.github/workflows/docker-build-push-dockerhub.yml index 224106c19..929251b41 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -76,10 +76,14 @@ jobs: # Temporarily disable ARM build due to runner performance issues # - name: Set up QEMU # uses: docker/setup-qemu-action@v2 + - name: Create Docker network + run: | + docker network create common_network + - name: Start database run: | - docker compose up -d database + docker compose up -d database --network common_network - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 @@ -109,6 +113,7 @@ jobs: 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 }} + network: common_network - name: Upload build log on failure if: steps.docker_build.outputs.exit_code != '0' @@ -123,7 +128,7 @@ jobs: - name: Test runtime run: | - docker run --rm -e DATABASE_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@${{ env.DATABASE_HOST }}/${{ env.POSTGRES_DB }} docker.io/calcom/cal.com:add-runtime-check + docker run --rm --network common_network -e DATABASE_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@${{ env.DATABASE_HOST }}/${{ env.POSTGRES_DB }} docker.io/calcom/cal.com:add-runtime-check - name: Upload runtime log on failure if: steps.test_runtime.outputs.exit_code != '0' From 5dbfc57d3c8e4c967bd19b77272b8be148a063b6 Mon Sep 17 00:00:00 2001 From: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com> Date: Wed, 27 Sep 2023 20:02:20 +0400 Subject: [PATCH 09/33] Revert prev --- .github/workflows/docker-build-push-dockerhub.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker-build-push-dockerhub.yml b/.github/workflows/docker-build-push-dockerhub.yml index 929251b41..361e44bd5 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -78,12 +78,12 @@ jobs: # uses: docker/setup-qemu-action@v2 - name: Create Docker network run: | - docker network create common_network + docker network create - name: Start database run: | - docker compose up -d database --network common_network + docker compose up -d database - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 @@ -113,7 +113,6 @@ jobs: 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 }} - network: common_network - name: Upload build log on failure if: steps.docker_build.outputs.exit_code != '0' @@ -128,7 +127,7 @@ jobs: - name: Test runtime run: | - docker run --rm --network common_network -e DATABASE_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@${{ env.DATABASE_HOST }}/${{ env.POSTGRES_DB }} docker.io/calcom/cal.com:add-runtime-check + docker run --rm -e DATABASE_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@${{ env.DATABASE_HOST }}/${{ env.POSTGRES_DB }} docker.io/calcom/cal.com:add-runtime-check - name: Upload runtime log on failure if: steps.test_runtime.outputs.exit_code != '0' From d4e0fcecb9015d0741daa95cc7213e394d3549da Mon Sep 17 00:00:00 2001 From: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com> Date: Wed, 27 Sep 2023 20:06:18 +0400 Subject: [PATCH 10/33] Specify stack as network, as per docker-compose file --- .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 361e44bd5..42511b26b 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -127,7 +127,7 @@ jobs: - name: Test runtime run: | - docker run --rm -e DATABASE_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@${{ env.DATABASE_HOST }}/${{ env.POSTGRES_DB }} docker.io/calcom/cal.com:add-runtime-check + docker run --rm --network stack -e DATABASE_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@${{ env.DATABASE_HOST }}/${{ env.POSTGRES_DB }} docker.io/calcom/cal.com:add-runtime-check - name: Upload runtime log on failure if: steps.test_runtime.outputs.exit_code != '0' From 42e1b7260a34d7fa377379e1a7cdf3dc44c012ec Mon Sep 17 00:00:00 2001 From: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com> Date: Wed, 27 Sep 2023 20:09:01 +0400 Subject: [PATCH 11/33] Remove WIP --- .github/workflows/docker-build-push-dockerhub.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/docker-build-push-dockerhub.yml b/.github/workflows/docker-build-push-dockerhub.yml index 42511b26b..0c42876ff 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -76,10 +76,6 @@ jobs: # Temporarily disable ARM build due to runner performance issues # - name: Set up QEMU # uses: docker/setup-qemu-action@v2 - - name: Create Docker network - run: | - docker network create - - name: Start database run: | From 83d34f8df577cb60adeec946a5711f44292f6f8b Mon Sep 17 00:00:00 2001 From: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com> Date: Wed, 27 Sep 2023 20:32:48 +0400 Subject: [PATCH 12/33] specify 'database' --- .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 0c42876ff..c7f1d8244 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -123,7 +123,7 @@ jobs: - name: Test runtime run: | - docker run --rm --network stack -e DATABASE_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@${{ env.DATABASE_HOST }}/${{ env.POSTGRES_DB }} docker.io/calcom/cal.com:add-runtime-check + docker run --rm --network stack -e DATABASE_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@database/${{ env.POSTGRES_DB }} docker.io/calcom/cal.com:add-runtime-check - name: Upload runtime log on failure if: steps.test_runtime.outputs.exit_code != '0' From 316124258f0b84ed1ac015a62f23d593474e1fcd Mon Sep 17 00:00:00 2001 From: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com> Date: Thu, 28 Sep 2023 14:20:21 +0400 Subject: [PATCH 13/33] Add nextauth and calendso encryption to test runtime --- .github/workflows/docker-build-push-dockerhub.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-build-push-dockerhub.yml b/.github/workflows/docker-build-push-dockerhub.yml index c7f1d8244..7b2db9313 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -123,7 +123,14 @@ jobs: - name: Test runtime run: | - docker run --rm --network stack -e DATABASE_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@database/${{ env.POSTGRES_DB }} docker.io/calcom/cal.com:add-runtime-check + docker run --rm --network stack \ + -e DATABASE_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@database/${{ env.POSTGRES_DB }} \ + -e NEXTAUTH_URL=${{ env.NEXTAUTH_URL }} \ + -e CALENDSO_ENCRYPTION_KEY=${{ env.CALENDSO_ENCRYPTION_KEY }} \ + docker.io/calcom/cal.com:add-runtime-check + env: + NEXTAUTH_URL: 'EI4qqDpcfdvf4A+0aQEEx8JjHxHSy4uWiZw/F32K+pA=' + CALENDSO_ENCRYPTION_KEY: '0zfLtY99wjeLnsM7qsa8xsT+Q0oSgnOL' - name: Upload runtime log on failure if: steps.test_runtime.outputs.exit_code != '0' From 1cb1dec45b1c33217fd19c2c17204a1426e274e7 Mon Sep 17 00:00:00 2001 From: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com> Date: Thu, 28 Sep 2023 14:42:34 +0400 Subject: [PATCH 14/33] duh --- .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 7b2db9313..804c659ed 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -125,11 +125,11 @@ jobs: run: | docker run --rm --network stack \ -e DATABASE_URL=postgresql://${{ env.POSTGRES_USER }}:${{ env.POSTGRES_PASSWORD }}@database/${{ env.POSTGRES_DB }} \ - -e NEXTAUTH_URL=${{ env.NEXTAUTH_URL }} \ + -e NEXTAUTH_SECRET=${{ env.NEXTAUTH_SECRET }} \ -e CALENDSO_ENCRYPTION_KEY=${{ env.CALENDSO_ENCRYPTION_KEY }} \ docker.io/calcom/cal.com:add-runtime-check env: - NEXTAUTH_URL: 'EI4qqDpcfdvf4A+0aQEEx8JjHxHSy4uWiZw/F32K+pA=' + NEXTAUTH_SECRET: 'EI4qqDpcfdvf4A+0aQEEx8JjHxHSy4uWiZw/F32K+pA=' CALENDSO_ENCRYPTION_KEY: '0zfLtY99wjeLnsM7qsa8xsT+Q0oSgnOL' - name: Upload runtime log on failure From bcdff6eeb0d0e092a45adfa8c11affd49b5a93b0 Mon Sep 17 00:00:00 2001 From: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com> Date: Thu, 28 Sep 2023 16:29:35 +0400 Subject: [PATCH 15/33] add health check --- .../workflows/docker-build-push-dockerhub.yml | 28 +++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker-build-push-dockerhub.yml b/.github/workflows/docker-build-push-dockerhub.yml index 804c659ed..18f45c04b 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -123,11 +123,29 @@ jobs: - name: Test runtime run: | - docker run --rm --network stack \ - -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 }} \ - docker.io/calcom/cal.com:add-runtime-check + docker run --rm --network stack \ + -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 }} \ + docker.io/calcom/cal.com:add-runtime-check & + + server_pid=$! + + for i in {1..60}; do + echo "Checking server health ($i/60)..." + response=$(curl --silent --fail --write-out "%{http_code}" http://localhost:3000/auth/login) + if [[ "$response" == "200" ]]; 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' From 4870434673debb6348ddda928168b9e272683a7e Mon Sep 17 00:00:00 2001 From: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com> Date: Thu, 28 Sep 2023 16:48:04 +0400 Subject: [PATCH 16/33] Increase health check time limit to allow boot --- .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 18f45c04b..d15e95977 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -131,7 +131,7 @@ jobs: server_pid=$! - for i in {1..60}; do + for i in {1..600}; do echo "Checking server health ($i/60)..." response=$(curl --silent --fail --write-out "%{http_code}" http://localhost:3000/auth/login) if [[ "$response" == "200" ]]; then From 933f4722e9fe0e84287f0633306b3c09fc2b2084 Mon Sep 17 00:00:00 2001 From: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com> Date: Thu, 28 Sep 2023 17:20:02 +0400 Subject: [PATCH 17/33] Increase timeout for testing --- .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 d15e95977..5f7d15bca 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -131,8 +131,8 @@ jobs: server_pid=$! - for i in {1..600}; do - echo "Checking server health ($i/60)..." + for i in {1..1200}; do + echo "Checking server health ($i/1200)..." response=$(curl --silent --fail --write-out "%{http_code}" http://localhost:3000/auth/login) if [[ "$response" == "200" ]]; then echo "Server is healthy" From 92512fd05248e1f5f84bef5354493078545ef599 Mon Sep 17 00:00:00 2001 From: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com> Date: Thu, 28 Sep 2023 18:02:44 +0400 Subject: [PATCH 18/33] use next-webapp-url for curl req domain --- .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 5f7d15bca..2a9d4d151 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -133,7 +133,7 @@ jobs: for i in {1..1200}; do echo "Checking server health ($i/1200)..." - response=$(curl --silent --fail --write-out "%{http_code}" http://localhost:3000/auth/login) + response=$(curl --silent --fail --write-out "%{http_code}" ${{ env.NEXT_PUBLIC_WEBAPP_URL }}/auth/login) if [[ "$response" == "200" ]]; then echo "Server is healthy" # Now, shutdown the server From a1d56a1f179af992e4795db68873c1ef06181bb3 Mon Sep 17 00:00:00 2001 From: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com> Date: Thu, 28 Sep 2023 18:22:49 +0400 Subject: [PATCH 19/33] Add server startup wait time~2mins --- .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 2a9d4d151..b682e5e6e 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -130,6 +130,10 @@ jobs: docker.io/calcom/cal.com:add-runtime-check & server_pid=$! + + + echo "Waiting for the server to start..." + sleep 120 for i in {1..1200}; do echo "Checking server health ($i/1200)..." From 26784d69690c3264a29beb059ca4dd382a729a9f Mon Sep 17 00:00:00 2001 From: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com> Date: Thu, 28 Sep 2023 18:48:16 +0400 Subject: [PATCH 20/33] debug curl call endpoint --- .github/workflows/docker-build-push-dockerhub.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/docker-build-push-dockerhub.yml b/.github/workflows/docker-build-push-dockerhub.yml index b682e5e6e..d67dd0600 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -134,6 +134,8 @@ jobs: echo "Waiting for the server to start..." sleep 120 + + echo ${{ env.NEXT_PUBLIC_WEBAPP_URL }}/auth/login for i in {1..1200}; do echo "Checking server health ($i/1200)..." From 835341823295b8a251be60338cc9df1529e65645 Mon Sep 17 00:00:00 2001 From: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com> Date: Thu, 28 Sep 2023 19:08:39 +0400 Subject: [PATCH 21/33] verbose curl req --- .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 d67dd0600..172b5f447 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -139,7 +139,7 @@ jobs: for i in {1..1200}; do echo "Checking server health ($i/1200)..." - response=$(curl --silent --fail --write-out "%{http_code}" ${{ env.NEXT_PUBLIC_WEBAPP_URL }}/auth/login) + response=$(curl --silent --fail --write-out "%{http_code}" -v ${{ env.NEXT_PUBLIC_WEBAPP_URL }}/auth/login) if [[ "$response" == "200" ]]; then echo "Server is healthy" # Now, shutdown the server From bd8a941f50ed2779ba7d245d8308831f5016fc25 Mon Sep 17 00:00:00 2001 From: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com> Date: Thu, 28 Sep 2023 19:32:36 +0400 Subject: [PATCH 22/33] Publish on port 3000 for accessibility by health check --- .github/workflows/docker-build-push-dockerhub.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker-build-push-dockerhub.yml b/.github/workflows/docker-build-push-dockerhub.yml index 172b5f447..a0154b8f9 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -124,6 +124,7 @@ jobs: - name: Test runtime run: | 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 }} \ From ff0db3a97ce23249c25e34090281094afcb93dd9 Mon Sep 17 00:00:00 2001 From: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com> Date: Thu, 28 Sep 2023 20:40:02 +0400 Subject: [PATCH 23/33] Redirect is also representative of healthy --- .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 a0154b8f9..16990a52d 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -141,7 +141,7 @@ jobs: for i in {1..1200}; do echo "Checking server health ($i/1200)..." response=$(curl --silent --fail --write-out "%{http_code}" -v ${{ env.NEXT_PUBLIC_WEBAPP_URL }}/auth/login) - if [[ "$response" == "200" ]]; then + if [[ "$response" == "200" ]] || [[ "$response" == "307" ]]; then echo "Server is healthy" # Now, shutdown the server kill $server_pid From 89bd10bd8419c1dd1fd860980fc1c680991ab1dd Mon Sep 17 00:00:00 2001 From: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com> Date: Thu, 28 Sep 2023 21:40:09 +0400 Subject: [PATCH 24/33] debug response --- .github/workflows/docker-build-push-dockerhub.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-build-push-dockerhub.yml b/.github/workflows/docker-build-push-dockerhub.yml index 16990a52d..31dce83b4 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -140,7 +140,8 @@ jobs: for i in {1..1200}; do echo "Checking server health ($i/1200)..." - response=$(curl --silent --fail --write-out "%{http_code}" -v ${{ env.NEXT_PUBLIC_WEBAPP_URL }}/auth/login) + 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 From 0048a58b2677e3f29a37a7b31dd6b9b6a5b74b8a Mon Sep 17 00:00:00 2001 From: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com> Date: Thu, 28 Sep 2023 21:40:34 +0400 Subject: [PATCH 25/33] Reduce number of attempts for server health check --- .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 31dce83b4..9942b7187 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -138,8 +138,8 @@ jobs: echo ${{ env.NEXT_PUBLIC_WEBAPP_URL }}/auth/login - for i in {1..1200}; do - echo "Checking server health ($i/1200)..." + 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 From 008ddd57f33ba8bc8f7a70da2eb02bec242a595f Mon Sep 17 00:00:00 2001 From: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com> Date: Thu, 28 Sep 2023 22:01:49 +0400 Subject: [PATCH 26/33] Remove redundant steps of logging --- .github/workflows/docker-build-push-dockerhub.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.github/workflows/docker-build-push-dockerhub.yml b/.github/workflows/docker-build-push-dockerhub.yml index 9942b7187..7d71fe561 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -109,13 +109,6 @@ jobs: 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: Upload build log on failure - if: steps.docker_build.outputs.exit_code != '0' - uses: actions/upload-artifact@v2 - with: - name: build.log - path: build.log # - name: Build with docker compose # run: | @@ -157,13 +150,6 @@ jobs: env: NEXTAUTH_SECRET: 'EI4qqDpcfdvf4A+0aQEEx8JjHxHSy4uWiZw/F32K+pA=' CALENDSO_ENCRYPTION_KEY: '0zfLtY99wjeLnsM7qsa8xsT+Q0oSgnOL' - - - name: Upload runtime log on failure - if: steps.test_runtime.outputs.exit_code != '0' - uses: actions/upload-artifact@v2 - with: - name: runtime.log - path: runtime.log - name: Cleanup run: | From f7885eed691289ee8bf327b7196c1e16587cc667 Mon Sep 17 00:00:00 2001 From: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com> Date: Thu, 28 Sep 2023 23:45:24 +0400 Subject: [PATCH 27/33] Allow pushing to Dockerhub --- .github/workflows/docker-build-push-dockerhub.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-build-push-dockerhub.yml b/.github/workflows/docker-build-push-dockerhub.yml index 7d71fe561..393a5ff1a 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -98,9 +98,9 @@ jobs: with: context: ./ file: ./Dockerfile - load: true - push: false - # push: ${{ github.event_name != 'pull_request' }} + # load: true + # push: false + push: ${{ github.event_name != 'pull_request' }} platforms: linux/amd64 tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} From d17064f67fe5a1add71185e07da06d5aaa0a32e5 Mon Sep 17 00:00:00 2001 From: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com> Date: Fri, 29 Sep 2023 11:55:30 +0400 Subject: [PATCH 28/33] split build and push image and test in between --- .../workflows/docker-build-push-dockerhub.yml | 44 ++++++++++++++----- 1 file changed, 32 insertions(+), 12 deletions(-) diff --git a/.github/workflows/docker-build-push-dockerhub.yml b/.github/workflows/docker-build-push-dockerhub.yml index 393a5ff1a..138f8b85a 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -91,16 +91,15 @@ jobs: # config-inline: | # [worker.oci] # max-parallelism = 1 - - - name: Build and push image + + - name: Build image id: docker_build uses: docker/build-push-action@v4 with: context: ./ file: ./Dockerfile - # load: true - # push: false - 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 tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} @@ -109,19 +108,23 @@ jobs: 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: Build with docker compose # 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: Test runtime run: | - 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 }} \ - docker.io/calcom/cal.com:add-runtime-check & + 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=$! @@ -151,6 +154,23 @@ jobs: NEXTAUTH_SECRET: 'EI4qqDpcfdvf4A+0aQEEx8JjHxHSy4uWiZw/F32K+pA=' CALENDSO_ENCRYPTION_KEY: '0zfLtY99wjeLnsM7qsa8xsT+Q0oSgnOL' + + - name: Push image + uses: docker/build-push-action@v4 + with: + context: . + # push: ${{ github.event_name != 'pull_request' }} + push: false + platforms: linux/amd64 + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + 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 push $tag + - name: Cleanup run: | docker compose down From 4be3f45228be04e91a0643e9c694c0a861521361 Mon Sep 17 00:00:00 2001 From: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com> Date: Fri, 29 Sep 2023 12:23:21 +0400 Subject: [PATCH 29/33] fix push step --- .../workflows/docker-build-push-dockerhub.yml | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/.github/workflows/docker-build-push-dockerhub.yml b/.github/workflows/docker-build-push-dockerhub.yml index 138f8b85a..85cc97544 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -156,20 +156,13 @@ jobs: - name: Push image - uses: docker/build-push-action@v4 - with: - context: . - # push: ${{ github.event_name != 'pull_request' }} - push: false - platforms: linux/amd64 - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} - 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 + 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 push $tag + docker push $tag + - name: Cleanup run: | From a23fd8b12a7ffc6772ae4acc1768713a141d9645 Mon Sep 17 00:00:00 2001 From: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com> Date: Fri, 29 Sep 2023 12:58:02 +0400 Subject: [PATCH 30/33] checkout spcific version --- .github/workflows/docker-build-push-dockerhub.yml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-build-push-dockerhub.yml b/.github/workflows/docker-build-push-dockerhub.yml index 85cc97544..00ed9b0bf 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -16,8 +16,12 @@ on: types: - completed # Allow running workflow manually from the Actions tab + # workflow_dispatch: workflow_dispatch: - + inputs: + version: + description: 'Version to build' + required: true # Leaving in example for releases. Initially we simply push to 'latest' # on: # release: @@ -33,8 +37,13 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - name: checkout - uses: actions/checkout@v3 + - name: Checkout code at specified version + uses: actions/checkout@v2 + with: + ref: ${{ github.event.inputs.version }} + + # - name: checkout + # uses: actions/checkout@v3 - name: Git submodule update run: | From 04e4c64efe3e732884e2d4c18e06c2e0dc3b6f7a Mon Sep 17 00:00:00 2001 From: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com> Date: Fri, 29 Sep 2023 12:58:39 +0400 Subject: [PATCH 31/33] comment push to dockerhub for testing --- .github/workflows/docker-build-push-dockerhub.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docker-build-push-dockerhub.yml b/.github/workflows/docker-build-push-dockerhub.yml index 00ed9b0bf..7390098cb 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -164,13 +164,13 @@ jobs: 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 - tag=${ADDR[0]} # Get the first tag + # - name: Push image + # 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 push $tag + # docker push $tag - name: Cleanup From 34c213f56a4436bb45128fc33c7644f82fabfabc Mon Sep 17 00:00:00 2001 From: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com> Date: Fri, 29 Sep 2023 13:46:44 +0400 Subject: [PATCH 32/33] Ready --- .../workflows/docker-build-push-dockerhub.yml | 37 ++++++++++--------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/.github/workflows/docker-build-push-dockerhub.yml b/.github/workflows/docker-build-push-dockerhub.yml index 7390098cb..e83f5d642 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -18,10 +18,12 @@ on: # Allow running workflow manually from the Actions tab # workflow_dispatch: workflow_dispatch: - inputs: - version: - description: 'Version to build' - required: true + # 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' # on: # release: @@ -36,14 +38,14 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - name: Checkout code at specified version - uses: actions/checkout@v2 - with: - ref: ${{ github.event.inputs.version }} + # 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 - # uses: actions/checkout@v3 + - name: checkout + uses: actions/checkout@v3 - name: Git submodule update run: | @@ -163,14 +165,13 @@ jobs: NEXTAUTH_SECRET: 'EI4qqDpcfdvf4A+0aQEEx8JjHxHSy4uWiZw/F32K+pA=' 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 - # tag=${ADDR[0]} # Get the first tag + - name: Push image + 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 push $tag + docker push $tag - name: Cleanup From 87379fea883e86af71a2da473632d8a015b26c68 Mon Sep 17 00:00:00 2001 From: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com> Date: Fri, 29 Sep 2023 13:58:38 +0400 Subject: [PATCH 33/33] remove unnecessary remnant --- .github/workflows/docker-build-push-dockerhub.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/docker-build-push-dockerhub.yml b/.github/workflows/docker-build-push-dockerhub.yml index e83f5d642..3b62c5278 100644 --- a/.github/workflows/docker-build-push-dockerhub.yml +++ b/.github/workflows/docker-build-push-dockerhub.yml @@ -16,7 +16,6 @@ on: types: - completed # Allow running workflow manually from the Actions tab - # workflow_dispatch: workflow_dispatch: # Uncomment below to allow specific version workflow run # inputs: