From d479107eaa7708b49d9f875fff34a319e0dec38a Mon Sep 17 00:00:00 2001 From: "Richard Kuo (Onyx)" Date: Thu, 1 May 2025 13:04:53 -0700 Subject: [PATCH 01/11] restore caching and fix up some prefixing --- ...-build-push-cloud-web-container-on-tag.yml | 5 ++++- ...ild-push-model-server-container-on-tag.yml | 15 +++++++++++--- ...docker-build-push-web-container-on-tag.yml | 11 ++++++---- .github/workflows/pr-integration-tests.yml | 18 +++++++++-------- .../workflows/pr-mit-integration-tests.yml | 20 +++++++++---------- 5 files changed, 43 insertions(+), 26 deletions(-) diff --git a/.github/workflows/docker-build-push-cloud-web-container-on-tag.yml b/.github/workflows/docker-build-push-cloud-web-container-on-tag.yml index 65e72c4aa7c..2e6db22757a 100644 --- a/.github/workflows/docker-build-push-cloud-web-container-on-tag.yml +++ b/.github/workflows/docker-build-push-cloud-web-container-on-tag.yml @@ -9,7 +9,8 @@ on: env: REGISTRY_IMAGE: onyxdotapp/onyx-web-server-cloud LATEST_TAG: ${{ contains(github.ref_name, 'latest') }} - + DEPLOYMENT: cloud + jobs: build: runs-on: @@ -72,6 +73,8 @@ jobs: NODE_OPTIONS=--max-old-space-size=8192 labels: ${{ steps.meta.outputs.labels }} outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true + cache-from: type=s3,prefix=cache/${{ github.repository }}/${{ env.DEPLOYMENT }}/web-${{ env.PLATFORM_PAIR }},region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }} + cache-to: type=s3,prefix=cache/${{ github.repository }}/${{ env.DEPLOYMENT }}/web-${{ env.PLATFORM_PAIR }},region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }},mode=max # no-cache needed due to weird interactions with the builds for different platforms no-cache: true diff --git a/.github/workflows/docker-build-push-model-server-container-on-tag.yml b/.github/workflows/docker-build-push-model-server-container-on-tag.yml index 6f663192e38..d2e0c49531c 100644 --- a/.github/workflows/docker-build-push-model-server-container-on-tag.yml +++ b/.github/workflows/docker-build-push-model-server-container-on-tag.yml @@ -10,7 +10,8 @@ env: LATEST_TAG: ${{ contains(github.ref_name, 'latest') }} DOCKER_BUILDKIT: 1 BUILDKIT_PROGRESS: plain - + DEPLOYMENT: ${{ contains(github.ref_name, 'cloud') && 'cloud' || 'standalone' }} + jobs: # Bypassing this for now as the idea of not building is glitching @@ -51,6 +52,8 @@ jobs: if: needs.check_model_server_changes.outputs.changed == 'true' runs-on: [runs-on, runner=8cpu-linux-x64, "run-id=${{ github.run_id }}-amd64"] + env: + PLATFORM_PAIR: linux-amd64 steps: - name: Checkout code uses: actions/checkout@v4 @@ -86,13 +89,17 @@ jobs: DANSWER_VERSION=${{ github.ref_name }} outputs: type=registry provenance: false - no-cache: true + cache-from: type=s3,prefix=cache/${{ github.repository }}/${{ env.DEPLOYMENT }}/model-server-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }} + cache-to: type=s3,prefix=cache/${{ github.repository }}/${{ env.DEPLOYMENT }}/model-server-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }},mode=max +# no-cache: true build-arm64: needs: [check_model_server_changes] if: needs.check_model_server_changes.outputs.changed == 'true' runs-on: [runs-on, runner=8cpu-linux-x64, "run-id=${{ github.run_id }}-arm64"] + env: + PLATFORM_PAIR: linux-arm64 steps: - name: Checkout code uses: actions/checkout@v4 @@ -128,7 +135,9 @@ jobs: DANSWER_VERSION=${{ github.ref_name }} outputs: type=registry provenance: false - no-cache: true + cache-from: type=s3,prefix=cache/${{ github.repository }}/${{ env.DEPLOYMENT }}/model-server-${{ env.PLATFORM_PAIR }},region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }} + cache-to: type=s3,prefix=cache/${{ github.repository }}/${{ env.DEPLOYMENT }}/model-server-${{ env.PLATFORM_PAIR }},region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }},mode=max +# no-cache: true merge-and-scan: needs: [build-amd64, build-arm64, check_model_server_changes] diff --git a/.github/workflows/docker-build-push-web-container-on-tag.yml b/.github/workflows/docker-build-push-web-container-on-tag.yml index 605c54521c0..1626abd220d 100644 --- a/.github/workflows/docker-build-push-web-container-on-tag.yml +++ b/.github/workflows/docker-build-push-web-container-on-tag.yml @@ -8,7 +8,8 @@ on: env: REGISTRY_IMAGE: onyxdotapp/onyx-web-server LATEST_TAG: ${{ contains(github.ref_name, 'latest') }} - + DEPLOYMENT: standalone + jobs: build: runs-on: @@ -62,12 +63,14 @@ jobs: ONYX_VERSION=${{ github.ref_name }} NODE_OPTIONS=--max-old-space-size=8192 - # needed due to weird interactions with the builds for different platforms - no-cache: true labels: ${{ steps.meta.outputs.labels }} outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true + cache-from: type=s3,prefix=cache/${{ github.repository }}/${{ env.DEPLOYMENT }}/web-${{ env.PLATFORM_PAIR }},region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }} + cache-to: type=s3,prefix=cache/${{ github.repository }}/${{ env.DEPLOYMENT }}/web-${{ env.PLATFORM_PAIR }},region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }},mode=max + # needed due to weird interactions with the builds for different platforms + # NOTE(rkuo): this may not be true any more with the proper cache prefixing by architecture no-cache: true - + - name: Export digest run: | mkdir -p /tmp/digests diff --git a/.github/workflows/pr-integration-tests.yml b/.github/workflows/pr-integration-tests.yml index d95c4dd8184..ea5c3ca38fc 100644 --- a/.github/workflows/pr-integration-tests.yml +++ b/.github/workflows/pr-integration-tests.yml @@ -16,6 +16,7 @@ env: CONFLUENCE_TEST_SPACE_URL: ${{ secrets.CONFLUENCE_TEST_SPACE_URL }} CONFLUENCE_USER_NAME: ${{ secrets.CONFLUENCE_USER_NAME }} CONFLUENCE_ACCESS_TOKEN: ${{ secrets.CONFLUENCE_ACCESS_TOKEN }} + PLATFORM_PAIR: linux-amd64 jobs: integration-tests: @@ -61,9 +62,9 @@ jobs: tags: onyxdotapp/onyx-backend:test push: false load: true - no-cache: true -# cache-from: type=s3,prefix=cache/${{ github.repository }}/integration-tests/backend/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }} - cache-to: type=s3,prefix=cache/${{ github.repository }}/integration-tests/backend/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }},mode=max + cache-from: type=s3,prefix=cache/${{ github.repository }}/integration-tests/backend-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }} + cache-to: type=s3,prefix=cache/${{ github.repository }}/integration-tests/backend-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }},mode=max +# no-cache: true - name: Build Model Server Docker image uses: ./.github/actions/custom-build-and-push @@ -74,9 +75,9 @@ jobs: tags: onyxdotapp/onyx-model-server:test push: false load: true - no-cache: true -# cache-from: type=s3,prefix=cache/${{ github.repository }}/integration-tests/model-server/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }} - cache-to: type=s3,prefix=cache/${{ github.repository }}/integration-tests/model-server/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }},mode=max + cache-from: type=s3,prefix=cache/${{ github.repository }}/integration-tests/model-server-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }} + cache-to: type=s3,prefix=cache/${{ github.repository }}/integration-tests/model-server-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }},mode=max +# no-cache: true - name: Build integration test Docker image uses: ./.github/actions/custom-build-and-push @@ -88,8 +89,9 @@ jobs: push: false load: true no-cache: true -# cache-from: type=s3,prefix=cache/${{ github.repository }}/integration-tests/integration/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }} - cache-to: type=s3,prefix=cache/${{ github.repository }}/integration-tests/integration/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }},mode=max + cache-from: type=s3,prefix=cache/${{ github.repository }}/integration-tests/integration-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }} + cache-to: type=s3,prefix=cache/${{ github.repository }}/integration-tests/integration-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }},mode=max +# no-cache: true # Start containers for multi-tenant tests - name: Start Docker containers for multi-tenant tests diff --git a/.github/workflows/pr-mit-integration-tests.yml b/.github/workflows/pr-mit-integration-tests.yml index 2f4ede4a697..03f856c45d8 100644 --- a/.github/workflows/pr-mit-integration-tests.yml +++ b/.github/workflows/pr-mit-integration-tests.yml @@ -16,7 +16,7 @@ env: CONFLUENCE_TEST_SPACE_URL: ${{ secrets.CONFLUENCE_TEST_SPACE_URL }} CONFLUENCE_USER_NAME: ${{ secrets.CONFLUENCE_USER_NAME }} CONFLUENCE_ACCESS_TOKEN: ${{ secrets.CONFLUENCE_ACCESS_TOKEN }} - + PLATFORM_PAIR: linux-amd64 jobs: integration-tests-mit: # See https://runs-on.com/runners/linux/ @@ -61,9 +61,9 @@ jobs: tags: onyxdotapp/onyx-backend:test push: false load: true - no-cache: true -# cache-from: type=s3,prefix=cache/${{ github.repository }}/integration-tests/backend/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }} - cache-to: type=s3,prefix=cache/${{ github.repository }}/integration-tests/backend/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }},mode=max + cache-from: type=s3,prefix=cache/${{ github.repository }}/integration-tests/backend-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }} + cache-to: type=s3,prefix=cache/${{ github.repository }}/integration-tests/backend-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }},mode=max +# no-cache: true - name: Build Model Server Docker image uses: ./.github/actions/custom-build-and-push @@ -74,9 +74,9 @@ jobs: tags: onyxdotapp/onyx-model-server:test push: false load: true - no-cache: true -# cache-from: type=s3,prefix=cache/${{ github.repository }}/integration-tests/model-server/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }} - cache-to: type=s3,prefix=cache/${{ github.repository }}/integration-tests/model-server/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }},mode=max + cache-from: type=s3,prefix=cache/${{ github.repository }}/integration-tests/model-server-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }} + cache-to: type=s3,prefix=cache/${{ github.repository }}/integration-tests/model-server-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }},mode=max +# no-cache: true - name: Build integration test Docker image uses: ./.github/actions/custom-build-and-push @@ -87,9 +87,9 @@ jobs: tags: onyxdotapp/onyx-integration:test push: false load: true - no-cache: true -# cache-from: type=s3,prefix=cache/${{ github.repository }}/integration-tests/integration/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }} - cache-to: type=s3,prefix=cache/${{ github.repository }}/integration-tests/integration/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }},mode=max + cache-from: type=s3,prefix=cache/${{ github.repository }}/integration-tests/integration-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }} + cache-to: type=s3,prefix=cache/${{ github.repository }}/integration-tests/integration-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }},mode=max +# no-cache: true # NOTE: Use pre-ping/null pool to reduce flakiness due to dropped connections - name: Start Docker containers From e2ff16868b1898d438f9a04eb58f5102d37694bd Mon Sep 17 00:00:00 2001 From: "Richard Kuo (Onyx)" Date: Thu, 1 May 2025 16:36:04 -0700 Subject: [PATCH 02/11] try backend matrix build and fix artifact names --- ...er-build-push-backend-container-on-tag.yml | 90 +++++++++++++++++-- ...-build-push-cloud-web-container-on-tag.yml | 4 +- ...docker-build-push-web-container-on-tag.yml | 4 +- 3 files changed, 89 insertions(+), 9 deletions(-) diff --git a/.github/workflows/docker-build-push-backend-container-on-tag.yml b/.github/workflows/docker-build-push-backend-container-on-tag.yml index 9ee9d3152fc..cb52d362775 100644 --- a/.github/workflows/docker-build-push-backend-container-on-tag.yml +++ b/.github/workflows/docker-build-push-backend-container-on-tag.yml @@ -8,17 +8,42 @@ on: env: REGISTRY_IMAGE: ${{ contains(github.ref_name, 'cloud') && 'onyxdotapp/onyx-backend-cloud' || 'onyxdotapp/onyx-backend' }} LATEST_TAG: ${{ contains(github.ref_name, 'latest') }} + DEPLOYMENT: ${{ contains(github.ref_name, 'cloud') && 'cloud' || 'standalone' }} jobs: - build-and-push: + build: # TODO: investigate a matrix build like the web container # See https://runs-on.com/runners/linux/ - runs-on: [runs-on, runner=8cpu-linux-x64, "run-id=${{ github.run_id }}"] - + runs-on: + - runs-on + - runner=${{ matrix.platform == 'linux/amd64' && '8cpu-linux-x64' || '8cpu-linux-arm64' }} + - run-id=${{ github.run_id }} + - tag=platform-${{ matrix.platform }} + strategy: + fail-fast: false + matrix: + platform: + - linux/amd64 + - linux/arm64 + steps: + - name: Prepare + run: | + platform=${{ matrix.platform }} + echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV + - name: Checkout code uses: actions/checkout@v4 + - name: Docker meta + id: meta + uses: docker/metadata-action@v5 + with: + images: ${{ env.REGISTRY_IMAGE }} + tags: | + type=raw,value=${{ env.REGISTRY_IMAGE }}:${{ github.ref_name }} + type=raw,value=${{ env.LATEST_TAG == 'true' && format('{0}:latest', env.REGISTRY_IMAGE) || '' }} + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -38,15 +63,70 @@ jobs: with: context: ./backend file: ./backend/Dockerfile - platforms: linux/amd64,linux/arm64 + platforms: ${{ matrix.platform }} push: true tags: | ${{ env.REGISTRY_IMAGE }}:${{ github.ref_name }} ${{ env.LATEST_TAG == 'true' && format('{0}:latest', env.REGISTRY_IMAGE) || '' }} build-args: | ONYX_VERSION=${{ github.ref_name }} - no-cache: true + labels: ${{ steps.meta.outputs.labels }} + outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true + cache-from: type=s3,prefix=cache/${{ github.repository }}/${{ env.DEPLOYMENT }}/backend-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }} + cache-to: type=s3,prefix=cache/${{ github.repository }}/${{ env.DEPLOYMENT }}/backend-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }},mode=max +# no-cache: true + - name: Export digest + + run: | + mkdir -p /tmp/digests + digest="${{ steps.build.outputs.digest }}" + touch "/tmp/digests/${digest#sha256:}" + + - name: Upload digest + uses: actions/upload-artifact@v4 + with: + name: backend-digests-${{ env.PLATFORM_PAIR }}-${{ github.run_id }} + path: /tmp/digests/* + if-no-files-found: error + retention-days: 1 + + merge: + runs-on: ubuntu-latest + needs: + - build + steps: + - name: Download digests + uses: actions/download-artifact@v4 + with: + path: /tmp/digests + pattern: backend-digests-*-${{ github.run_id }} + merge-multiple: true + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - name: Docker meta + id: meta + uses: docker/metadata-action@v5 + with: + images: ${{ env.REGISTRY_IMAGE }} + + - name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_TOKEN }} + + - name: Create manifest list and push + working-directory: /tmp/digests + run: | + docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \ + $(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *) + + - name: Inspect image + run: | + docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }} + # trivy has their own rate limiting issues causing this action to flake # we worked around it by hardcoding to different db repos in env # can re-enable when they figure it out diff --git a/.github/workflows/docker-build-push-cloud-web-container-on-tag.yml b/.github/workflows/docker-build-push-cloud-web-container-on-tag.yml index 2e6db22757a..7ddd3a9bf44 100644 --- a/.github/workflows/docker-build-push-cloud-web-container-on-tag.yml +++ b/.github/workflows/docker-build-push-cloud-web-container-on-tag.yml @@ -87,7 +87,7 @@ jobs: - name: Upload digest uses: actions/upload-artifact@v4 with: - name: digests-${{ env.PLATFORM_PAIR }} + name: cloudweb-digests-${{ env.PLATFORM_PAIR }}-${{ github.run_id }} path: /tmp/digests/* if-no-files-found: error retention-days: 1 @@ -101,7 +101,7 @@ jobs: uses: actions/download-artifact@v4 with: path: /tmp/digests - pattern: digests-* + pattern: cloudweb-digests-*-${{ github.run_id }} merge-multiple: true - name: Set up Docker Buildx diff --git a/.github/workflows/docker-build-push-web-container-on-tag.yml b/.github/workflows/docker-build-push-web-container-on-tag.yml index 2627ae22f3e..10552e96508 100644 --- a/.github/workflows/docker-build-push-web-container-on-tag.yml +++ b/.github/workflows/docker-build-push-web-container-on-tag.yml @@ -80,7 +80,7 @@ jobs: - name: Upload digest uses: actions/upload-artifact@v4 with: - name: digests-${{ env.PLATFORM_PAIR }} + name: web-digests-${{ env.PLATFORM_PAIR }}-${{ github.run_id }} path: /tmp/digests/* if-no-files-found: error retention-days: 1 @@ -94,7 +94,7 @@ jobs: uses: actions/download-artifact@v4 with: path: /tmp/digests - pattern: digests-* + pattern: web-digests-*-${{ github.run_id }} merge-multiple: true - name: Set up Docker Buildx From 63688ea27a8cfe55774b1cac06e78ab06e6bc5ac Mon Sep 17 00:00:00 2001 From: "Richard Kuo (Onyx)" Date: Thu, 1 May 2025 16:48:00 -0700 Subject: [PATCH 03/11] need id --- .../workflows/docker-build-push-backend-container-on-tag.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-build-push-backend-container-on-tag.yml b/.github/workflows/docker-build-push-backend-container-on-tag.yml index cb52d362775..d49203a257f 100644 --- a/.github/workflows/docker-build-push-backend-container-on-tag.yml +++ b/.github/workflows/docker-build-push-backend-container-on-tag.yml @@ -11,7 +11,7 @@ env: DEPLOYMENT: ${{ contains(github.ref_name, 'cloud') && 'cloud' || 'standalone' }} jobs: - build: + build-and-push: # TODO: investigate a matrix build like the web container # See https://runs-on.com/runners/linux/ runs-on: @@ -59,6 +59,7 @@ jobs: sudo apt-get install -y build-essential - name: Backend Image Docker Build and Push + id: build uses: docker/build-push-action@v5 with: context: ./backend @@ -93,7 +94,7 @@ jobs: merge: runs-on: ubuntu-latest needs: - - build + - build-and-push steps: - name: Download digests uses: actions/download-artifact@v4 From 5de2563368edba96e81e971d5edf7359dad62c8e Mon Sep 17 00:00:00 2001 From: "Richard Kuo (Onyx)" Date: Thu, 1 May 2025 16:50:54 -0700 Subject: [PATCH 04/11] add backslashes to be consistent --- .../docker-build-push-cloud-web-container-on-tag.yml | 4 ++-- .../docker-build-push-model-server-container-on-tag.yml | 4 ++-- .github/workflows/docker-build-push-web-container-on-tag.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docker-build-push-cloud-web-container-on-tag.yml b/.github/workflows/docker-build-push-cloud-web-container-on-tag.yml index 7ddd3a9bf44..b5edc8095b6 100644 --- a/.github/workflows/docker-build-push-cloud-web-container-on-tag.yml +++ b/.github/workflows/docker-build-push-cloud-web-container-on-tag.yml @@ -73,8 +73,8 @@ jobs: NODE_OPTIONS=--max-old-space-size=8192 labels: ${{ steps.meta.outputs.labels }} outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true - cache-from: type=s3,prefix=cache/${{ github.repository }}/${{ env.DEPLOYMENT }}/web-${{ env.PLATFORM_PAIR }},region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }} - cache-to: type=s3,prefix=cache/${{ github.repository }}/${{ env.DEPLOYMENT }}/web-${{ env.PLATFORM_PAIR }},region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }},mode=max + cache-from: type=s3,prefix=cache/${{ github.repository }}/${{ env.DEPLOYMENT }}/web-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }} + cache-to: type=s3,prefix=cache/${{ github.repository }}/${{ env.DEPLOYMENT }}/web-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }},mode=max # no-cache needed due to weird interactions with the builds for different platforms no-cache: true diff --git a/.github/workflows/docker-build-push-model-server-container-on-tag.yml b/.github/workflows/docker-build-push-model-server-container-on-tag.yml index d2e0c49531c..7f9ed86ba81 100644 --- a/.github/workflows/docker-build-push-model-server-container-on-tag.yml +++ b/.github/workflows/docker-build-push-model-server-container-on-tag.yml @@ -135,8 +135,8 @@ jobs: DANSWER_VERSION=${{ github.ref_name }} outputs: type=registry provenance: false - cache-from: type=s3,prefix=cache/${{ github.repository }}/${{ env.DEPLOYMENT }}/model-server-${{ env.PLATFORM_PAIR }},region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }} - cache-to: type=s3,prefix=cache/${{ github.repository }}/${{ env.DEPLOYMENT }}/model-server-${{ env.PLATFORM_PAIR }},region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }},mode=max + cache-from: type=s3,prefix=cache/${{ github.repository }}/${{ env.DEPLOYMENT }}/model-server-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }} + cache-to: type=s3,prefix=cache/${{ github.repository }}/${{ env.DEPLOYMENT }}/model-server-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }},mode=max # no-cache: true merge-and-scan: diff --git a/.github/workflows/docker-build-push-web-container-on-tag.yml b/.github/workflows/docker-build-push-web-container-on-tag.yml index 10552e96508..fcfc9a43c30 100644 --- a/.github/workflows/docker-build-push-web-container-on-tag.yml +++ b/.github/workflows/docker-build-push-web-container-on-tag.yml @@ -65,8 +65,8 @@ jobs: labels: ${{ steps.meta.outputs.labels }} outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true - cache-from: type=s3,prefix=cache/${{ github.repository }}/${{ env.DEPLOYMENT }}/web-${{ env.PLATFORM_PAIR }},region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }} - cache-to: type=s3,prefix=cache/${{ github.repository }}/${{ env.DEPLOYMENT }}/web-${{ env.PLATFORM_PAIR }},region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }},mode=max + cache-from: type=s3,prefix=cache/${{ github.repository }}/${{ env.DEPLOYMENT }}/web-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }} + cache-to: type=s3,prefix=cache/${{ github.repository }}/${{ env.DEPLOYMENT }}/web-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }},mode=max # no-cache needed due to weird interactions with the builds for different platforms # NOTE(rkuo): this may not be true any more with the proper cache prefixing by architecture - currently testing with it off # no-cache: true From 9d8776cedf7b1a98c6d622e8d0418e0291d95cab Mon Sep 17 00:00:00 2001 From: "Richard Kuo (Onyx)" Date: Thu, 1 May 2025 16:58:37 -0700 Subject: [PATCH 05/11] fix no-cache --- .github/workflows/pr-integration-tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/pr-integration-tests.yml b/.github/workflows/pr-integration-tests.yml index ea5c3ca38fc..e8eaf7784f3 100644 --- a/.github/workflows/pr-integration-tests.yml +++ b/.github/workflows/pr-integration-tests.yml @@ -88,7 +88,6 @@ jobs: tags: onyxdotapp/onyx-integration:test push: false load: true - no-cache: true cache-from: type=s3,prefix=cache/${{ github.repository }}/integration-tests/integration-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }} cache-to: type=s3,prefix=cache/${{ github.repository }}/integration-tests/integration-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }},mode=max # no-cache: true From ee8c72dcf11307c5b0dfb9a70878924a77b593bf Mon Sep 17 00:00:00 2001 From: "Richard Kuo (Onyx)" Date: Thu, 1 May 2025 17:00:03 -0700 Subject: [PATCH 06/11] leave docker tags to the meta action --- .../workflows/docker-build-push-backend-container-on-tag.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/docker-build-push-backend-container-on-tag.yml b/.github/workflows/docker-build-push-backend-container-on-tag.yml index d49203a257f..e0c353e6ae2 100644 --- a/.github/workflows/docker-build-push-backend-container-on-tag.yml +++ b/.github/workflows/docker-build-push-backend-container-on-tag.yml @@ -66,9 +66,6 @@ jobs: file: ./backend/Dockerfile platforms: ${{ matrix.platform }} push: true - tags: | - ${{ env.REGISTRY_IMAGE }}:${{ github.ref_name }} - ${{ env.LATEST_TAG == 'true' && format('{0}:latest', env.REGISTRY_IMAGE) || '' }} build-args: | ONYX_VERSION=${{ github.ref_name }} labels: ${{ steps.meta.outputs.labels }} From d79e56aef2ce70217ee9eb6019b8b299c1eedef5 Mon Sep 17 00:00:00 2001 From: "Richard Kuo (Onyx)" Date: Thu, 1 May 2025 19:45:31 -0700 Subject: [PATCH 07/11] need checkout in merge --- .../workflows/docker-build-push-backend-container-on-tag.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/docker-build-push-backend-container-on-tag.yml b/.github/workflows/docker-build-push-backend-container-on-tag.yml index e0c353e6ae2..606aa9a2654 100644 --- a/.github/workflows/docker-build-push-backend-container-on-tag.yml +++ b/.github/workflows/docker-build-push-backend-container-on-tag.yml @@ -93,6 +93,9 @@ jobs: needs: - build-and-push steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Download digests uses: actions/download-artifact@v4 with: From d4692f08e05c05cd3ffd7f1a31e896b747c0d4e4 Mon Sep 17 00:00:00 2001 From: "Richard Kuo (Onyx)" Date: Thu, 1 May 2025 19:45:48 -0700 Subject: [PATCH 08/11] add comment --- .github/workflows/docker-build-push-backend-container-on-tag.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker-build-push-backend-container-on-tag.yml b/.github/workflows/docker-build-push-backend-container-on-tag.yml index 606aa9a2654..fa8847e0fd5 100644 --- a/.github/workflows/docker-build-push-backend-container-on-tag.yml +++ b/.github/workflows/docker-build-push-backend-container-on-tag.yml @@ -93,6 +93,7 @@ jobs: needs: - build-and-push steps: + # Needed for trivyignore - name: Checkout uses: actions/checkout@v4 From 8afd5ea2033bb175eb268bd31314c126ec08f016 Mon Sep 17 00:00:00 2001 From: "Richard Kuo (Onyx)" Date: Fri, 2 May 2025 09:56:01 -0700 Subject: [PATCH 09/11] move spammy logs to debug status --- backend/onyx/background/celery/tasks/indexing/tasks.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/onyx/background/celery/tasks/indexing/tasks.py b/backend/onyx/background/celery/tasks/indexing/tasks.py index 1f2dc482f59..674889e189d 100644 --- a/backend/onyx/background/celery/tasks/indexing/tasks.py +++ b/backend/onyx/background/celery/tasks/indexing/tasks.py @@ -507,7 +507,7 @@ def check_for_indexing(self: Task, *, tenant_id: str) -> int | None: search_settings_instance.id ) if redis_connector_index.fenced: - task_logger.info( + task_logger.debug( f"check_for_indexing - Skipping fenced connector: " f"cc_pair={cc_pair_id} search_settings={search_settings_instance.id}" ) @@ -529,14 +529,14 @@ def check_for_indexing(self: Task, *, tenant_id: str) -> int | None: secondary_index_building=len(search_settings_list) > 1, db_session=db_session, ): - task_logger.info( + task_logger.debug( f"check_for_indexing - Not indexing cc_pair_id: {cc_pair_id} " f"search_settings={search_settings_instance.id}, " f"secondary_index_building={len(search_settings_list) > 1}" ) continue else: - task_logger.info( + task_logger.debug( f"check_for_indexing - Will index cc_pair_id: {cc_pair_id} " f"search_settings={search_settings_instance.id}, " f"secondary_index_building={len(search_settings_list) > 1}" From 97af231be946878fd227bd7819cf59cb1399fc5e Mon Sep 17 00:00:00 2001 From: "Richard Kuo (Onyx)" Date: Fri, 2 May 2025 17:34:18 -0700 Subject: [PATCH 10/11] bunch of no-cache updates --- ...docker-build-push-backend-container-on-tag.yml | 5 ++--- ...cker-build-push-cloud-web-container-on-tag.yml | 2 +- ...r-build-push-model-server-container-on-tag.yml | 1 - .../docker-build-push-web-container-on-tag.yml | 1 - .github/workflows/pr-integration-tests.yml | 3 --- .github/workflows/pr-mit-integration-tests.yml | 15 ++++++--------- 6 files changed, 9 insertions(+), 18 deletions(-) diff --git a/.github/workflows/docker-build-push-backend-container-on-tag.yml b/.github/workflows/docker-build-push-backend-container-on-tag.yml index fa8847e0fd5..92f3846b2a5 100644 --- a/.github/workflows/docker-build-push-backend-container-on-tag.yml +++ b/.github/workflows/docker-build-push-backend-container-on-tag.yml @@ -72,9 +72,8 @@ jobs: outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true cache-from: type=s3,prefix=cache/${{ github.repository }}/${{ env.DEPLOYMENT }}/backend-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }} cache-to: type=s3,prefix=cache/${{ github.repository }}/${{ env.DEPLOYMENT }}/backend-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }},mode=max -# no-cache: true - - name: Export digest - + + - name: Export digest run: | mkdir -p /tmp/digests digest="${{ steps.build.outputs.digest }}" diff --git a/.github/workflows/docker-build-push-cloud-web-container-on-tag.yml b/.github/workflows/docker-build-push-cloud-web-container-on-tag.yml index b5edc8095b6..dfa889fbf35 100644 --- a/.github/workflows/docker-build-push-cloud-web-container-on-tag.yml +++ b/.github/workflows/docker-build-push-cloud-web-container-on-tag.yml @@ -76,7 +76,7 @@ jobs: cache-from: type=s3,prefix=cache/${{ github.repository }}/${{ env.DEPLOYMENT }}/web-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }} cache-to: type=s3,prefix=cache/${{ github.repository }}/${{ env.DEPLOYMENT }}/web-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }},mode=max # no-cache needed due to weird interactions with the builds for different platforms - no-cache: true + # NOTE(rkuo): this may not be true any more with the proper cache prefixing by architecture - currently testing with it off - name: Export digest run: | diff --git a/.github/workflows/docker-build-push-model-server-container-on-tag.yml b/.github/workflows/docker-build-push-model-server-container-on-tag.yml index 7f9ed86ba81..8a930851eda 100644 --- a/.github/workflows/docker-build-push-model-server-container-on-tag.yml +++ b/.github/workflows/docker-build-push-model-server-container-on-tag.yml @@ -137,7 +137,6 @@ jobs: provenance: false cache-from: type=s3,prefix=cache/${{ github.repository }}/${{ env.DEPLOYMENT }}/model-server-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }} cache-to: type=s3,prefix=cache/${{ github.repository }}/${{ env.DEPLOYMENT }}/model-server-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }},mode=max -# no-cache: true merge-and-scan: needs: [build-amd64, build-arm64, check_model_server_changes] diff --git a/.github/workflows/docker-build-push-web-container-on-tag.yml b/.github/workflows/docker-build-push-web-container-on-tag.yml index fcfc9a43c30..3700f91d014 100644 --- a/.github/workflows/docker-build-push-web-container-on-tag.yml +++ b/.github/workflows/docker-build-push-web-container-on-tag.yml @@ -69,7 +69,6 @@ jobs: cache-to: type=s3,prefix=cache/${{ github.repository }}/${{ env.DEPLOYMENT }}/web-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }},mode=max # no-cache needed due to weird interactions with the builds for different platforms # NOTE(rkuo): this may not be true any more with the proper cache prefixing by architecture - currently testing with it off -# no-cache: true - name: Export digest run: | diff --git a/.github/workflows/pr-integration-tests.yml b/.github/workflows/pr-integration-tests.yml index e8eaf7784f3..62535fd13ec 100644 --- a/.github/workflows/pr-integration-tests.yml +++ b/.github/workflows/pr-integration-tests.yml @@ -64,7 +64,6 @@ jobs: load: true cache-from: type=s3,prefix=cache/${{ github.repository }}/integration-tests/backend-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }} cache-to: type=s3,prefix=cache/${{ github.repository }}/integration-tests/backend-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }},mode=max -# no-cache: true - name: Build Model Server Docker image uses: ./.github/actions/custom-build-and-push @@ -77,7 +76,6 @@ jobs: load: true cache-from: type=s3,prefix=cache/${{ github.repository }}/integration-tests/model-server-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }} cache-to: type=s3,prefix=cache/${{ github.repository }}/integration-tests/model-server-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }},mode=max -# no-cache: true - name: Build integration test Docker image uses: ./.github/actions/custom-build-and-push @@ -90,7 +88,6 @@ jobs: load: true cache-from: type=s3,prefix=cache/${{ github.repository }}/integration-tests/integration-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }} cache-to: type=s3,prefix=cache/${{ github.repository }}/integration-tests/integration-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }},mode=max -# no-cache: true # Start containers for multi-tenant tests - name: Start Docker containers for multi-tenant tests diff --git a/.github/workflows/pr-mit-integration-tests.yml b/.github/workflows/pr-mit-integration-tests.yml index 03f856c45d8..b80bb6102b7 100644 --- a/.github/workflows/pr-mit-integration-tests.yml +++ b/.github/workflows/pr-mit-integration-tests.yml @@ -61,9 +61,8 @@ jobs: tags: onyxdotapp/onyx-backend:test push: false load: true - cache-from: type=s3,prefix=cache/${{ github.repository }}/integration-tests/backend-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }} - cache-to: type=s3,prefix=cache/${{ github.repository }}/integration-tests/backend-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }},mode=max -# no-cache: true + cache-from: type=s3,prefix=cache/${{ github.repository }}/mit-integration-tests/backend-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }} + cache-to: type=s3,prefix=cache/${{ github.repository }}/mit-integration-tests/backend-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }},mode=max - name: Build Model Server Docker image uses: ./.github/actions/custom-build-and-push @@ -74,9 +73,8 @@ jobs: tags: onyxdotapp/onyx-model-server:test push: false load: true - cache-from: type=s3,prefix=cache/${{ github.repository }}/integration-tests/model-server-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }} - cache-to: type=s3,prefix=cache/${{ github.repository }}/integration-tests/model-server-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }},mode=max -# no-cache: true + cache-from: type=s3,prefix=cache/${{ github.repository }}/mit-integration-tests/model-server-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }} + cache-to: type=s3,prefix=cache/${{ github.repository }}/mit-integration-tests/model-server-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }},mode=max - name: Build integration test Docker image uses: ./.github/actions/custom-build-and-push @@ -87,9 +85,8 @@ jobs: tags: onyxdotapp/onyx-integration:test push: false load: true - cache-from: type=s3,prefix=cache/${{ github.repository }}/integration-tests/integration-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }} - cache-to: type=s3,prefix=cache/${{ github.repository }}/integration-tests/integration-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }},mode=max -# no-cache: true + cache-from: type=s3,prefix=cache/${{ github.repository }}/mit-integration-tests/integration-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }} + cache-to: type=s3,prefix=cache/${{ github.repository }}/mit-integration-tests/integration-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }},mode=max # NOTE: Use pre-ping/null pool to reduce flakiness due to dropped connections - name: Start Docker containers From 9c6b41110d0b3030f55ad3fe65be90816fb5b139 Mon Sep 17 00:00:00 2001 From: "Richard Kuo (Onyx)" Date: Fri, 2 May 2025 17:35:56 -0700 Subject: [PATCH 11/11] prefix --- .../docker-build-push-cloud-web-container-on-tag.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-build-push-cloud-web-container-on-tag.yml b/.github/workflows/docker-build-push-cloud-web-container-on-tag.yml index dfa889fbf35..05bece322fb 100644 --- a/.github/workflows/docker-build-push-cloud-web-container-on-tag.yml +++ b/.github/workflows/docker-build-push-cloud-web-container-on-tag.yml @@ -73,8 +73,8 @@ jobs: NODE_OPTIONS=--max-old-space-size=8192 labels: ${{ steps.meta.outputs.labels }} outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true - cache-from: type=s3,prefix=cache/${{ github.repository }}/${{ env.DEPLOYMENT }}/web-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }} - cache-to: type=s3,prefix=cache/${{ github.repository }}/${{ env.DEPLOYMENT }}/web-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }},mode=max + cache-from: type=s3,prefix=cache/${{ github.repository }}/${{ env.DEPLOYMENT }}/cloudweb-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }} + cache-to: type=s3,prefix=cache/${{ github.repository }}/${{ env.DEPLOYMENT }}/cloudweb-${{ env.PLATFORM_PAIR }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }},mode=max # no-cache needed due to weird interactions with the builds for different platforms # NOTE(rkuo): this may not be true any more with the proper cache prefixing by architecture - currently testing with it off