perf(docker): isolate high-frequency image payloads (#6365)

2026-08-31 13:07:56 +08:00 · 2026-08-20 14:47:06 +08:00
parent 23f5d59c74
commit 4e3a6c8032
9 changed files with 376 additions and 48 deletions
@@ -26,7 +26,34 @@ jobs:
        id: release_version
        run: |
          app_version=$(cat version.py |sed -ne "s/APP_VERSION\s=\s'v\(.*\)'/\1/gp")
+          frontend_version=$(sed -ne "s/FRONTEND_VERSION\s*=\s*'\([^']*\)'/\1/gp" version.py)
          echo "app_version=$app_version" >> $GITHUB_ENV
+          echo "SOURCE_COMMIT=$(git rev-parse HEAD)" >> $GITHUB_ENV
+          echo "frontend_version=$frontend_version" >> "$GITHUB_OUTPUT"
+
+      - name: Resolve External Payload Revisions
+        id: payloads
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          FRONTEND_VERSION: ${{ steps.release_version.outputs.frontend_version }}
+        run: |
+          plugins_revision=$(git ls-remote https://github.com/jxxghp/MoviePilot-Plugins.git refs/heads/main | awk '{print $1}')
+          resources_revision=$(git ls-remote https://github.com/jxxghp/MoviePilot-Resources.git refs/heads/main | awk '{print $1}')
+          frontend_digest=$(gh api "repos/jxxghp/MoviePilot-Frontend/releases/tags/${FRONTEND_VERSION}" \
+            --jq '.assets[] | select(.name == "dist.zip") | .digest')
+
+          [[ "$plugins_revision" =~ ^[0-9a-f]{40}$ ]]
+          [[ "$resources_revision" =~ ^[0-9a-f]{40}$ ]]
+          case "$frontend_digest" in
+            sha256:*) frontend_sha256=${frontend_digest#sha256:} ;;
+            *) echo "dist.zip 缺少 SHA-256 摘要" >&2; exit 1 ;;
+          esac
+          [[ "$frontend_sha256" =~ ^[0-9a-f]{64}$ ]]
+
+          echo "plugins_revision=$plugins_revision" >> "$GITHUB_OUTPUT"
+          echo "resources_revision=$resources_revision" >> "$GITHUB_OUTPUT"
+          echo "frontend_digest=$frontend_digest" >> "$GITHUB_OUTPUT"
+          echo "frontend_sha256=$frontend_sha256" >> "$GITHUB_OUTPUT"

      - name: Checkout Wiki Plugin Market
        uses: actions/checkout@v4
@@ -48,6 +75,7 @@ jobs:
          echo "wiki_commit=$wiki_commit" >> "$GITHUB_OUTPUT"

      - name: Download models.dev catalog
+        id: models_catalog
        run: |
          temp_file=$(mktemp app/agent/llm/models.json.XXXXXX)
          trap 'rm -f "$temp_file"' EXIT
@@ -58,6 +86,7 @@ jobs:
          # Git keeps only a small placeholder; the beta image receives the current catalog.
          chmod 644 "$temp_file"
          mv "$temp_file" app/agent/llm/models.json
+          echo "digest=sha256:$(sha256sum app/agent/llm/models.json | awk '{print $1}')" >> "$GITHUB_OUTPUT"
          echo "Downloaded models.dev catalog ($(wc -c < app/agent/llm/models.json) bytes)"

      - name: Docker Meta
@@ -99,8 +128,20 @@ jobs:
            linux/arm64/v8
          push: true
          tags: ${{ steps.meta.outputs.tags }}
+          build-args: |
+            MOVIEPILOT_FRONTEND_VERSION=${{ steps.release_version.outputs.frontend_version }}
+            MOVIEPILOT_FRONTEND_SHA256=${{ steps.payloads.outputs.frontend_sha256 }}
+            MOVIEPILOT_PLUGINS_REF=${{ steps.payloads.outputs.plugins_revision }}
+            MOVIEPILOT_RESOURCES_REF=${{ steps.payloads.outputs.resources_revision }}
          labels: |
            ${{ steps.meta.outputs.labels }}
+            org.opencontainers.image.revision=${{ env.SOURCE_COMMIT }}
+            org.moviepilot.source-revision=${{ env.SOURCE_COMMIT }}
+            org.moviepilot.frontend-version=${{ steps.release_version.outputs.frontend_version }}
+            org.moviepilot.frontend-digest=${{ steps.payloads.outputs.frontend_digest }}
+            org.moviepilot.plugins-revision=${{ steps.payloads.outputs.plugins_revision }}
+            org.moviepilot.resources-revision=${{ steps.payloads.outputs.resources_revision }}
            org.moviepilot.plugin-market-wiki-revision=${{ steps.plugin_market.outputs.wiki_commit }}
+            org.moviepilot.models-catalog-digest=${{ steps.models_catalog.outputs.digest }}
          cache-from: type=gha,scope=moviepilot-v3-docker,version=2
          cache-to: type=gha,scope=moviepilot-v3-docker,mode=max,version=2
@@ -34,8 +34,34 @@ jobs:
        id: release_version
        run: |
          app_version=$(cat version.py |sed -ne "s/APP_VERSION\s=\s'v\(.*\)'/\1/gp")
+          frontend_version=$(sed -ne "s/FRONTEND_VERSION\s*=\s*'\([^']*\)'/\1/gp" version.py)
          echo "app_version=$app_version" >> $GITHUB_ENV
          echo "SOURCE_COMMIT=$(git rev-parse HEAD)" >> $GITHUB_ENV
+          echo "frontend_version=$frontend_version" >> "$GITHUB_OUTPUT"
+
+      - name: Resolve External Payload Revisions
+        id: payloads
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          FRONTEND_VERSION: ${{ steps.release_version.outputs.frontend_version }}
+        run: |
+          plugins_revision=$(git ls-remote https://github.com/jxxghp/MoviePilot-Plugins.git refs/heads/main | awk '{print $1}')
+          resources_revision=$(git ls-remote https://github.com/jxxghp/MoviePilot-Resources.git refs/heads/main | awk '{print $1}')
+          frontend_digest=$(gh api "repos/jxxghp/MoviePilot-Frontend/releases/tags/${FRONTEND_VERSION}" \
+            --jq '.assets[] | select(.name == "dist.zip") | .digest')
+
+          [[ "$plugins_revision" =~ ^[0-9a-f]{40}$ ]]
+          [[ "$resources_revision" =~ ^[0-9a-f]{40}$ ]]
+          case "$frontend_digest" in
+            sha256:*) frontend_sha256=${frontend_digest#sha256:} ;;
+            *) echo "dist.zip 缺少 SHA-256 摘要" >&2; exit 1 ;;
+          esac
+          [[ "$frontend_sha256" =~ ^[0-9a-f]{64}$ ]]
+
+          echo "plugins_revision=$plugins_revision" >> "$GITHUB_OUTPUT"
+          echo "resources_revision=$resources_revision" >> "$GITHUB_OUTPUT"
+          echo "frontend_digest=$frontend_digest" >> "$GITHUB_OUTPUT"
+          echo "frontend_sha256=$frontend_sha256" >> "$GITHUB_OUTPUT"

      - name: Checkout Wiki Plugin Market
        uses: actions/checkout@v4
@@ -57,6 +83,7 @@ jobs:
          echo "wiki_commit=$wiki_commit" >> "$GITHUB_OUTPUT"

      - name: Download models.dev catalog
+        id: models_catalog
        run: |
          temp_file=$(mktemp app/agent/llm/models.json.XXXXXX)
          trap 'rm -f "$temp_file"' EXIT
@@ -67,6 +94,7 @@ jobs:
          # Git keeps only a small placeholder; the release image receives the current catalog.
          chmod 644 "$temp_file"
          mv "$temp_file" app/agent/llm/models.json
+          echo "digest=sha256:$(sha256sum app/agent/llm/models.json | awk '{print $1}')" >> "$GITHUB_OUTPUT"
          echo "Downloaded models.dev catalog ($(wc -c < app/agent/llm/models.json) bytes)"

      - name: Create Release Snapshot
@@ -122,10 +150,22 @@ jobs:
            linux/arm64/v8
          push: true
          tags: ${{ steps.meta.outputs.tags }}
+          build-args: |
+            MOVIEPILOT_FRONTEND_VERSION=${{ steps.release_version.outputs.frontend_version }}
+            MOVIEPILOT_FRONTEND_SHA256=${{ steps.payloads.outputs.frontend_sha256 }}
+            MOVIEPILOT_PLUGINS_REF=${{ steps.payloads.outputs.plugins_revision }}
+            MOVIEPILOT_RESOURCES_REF=${{ steps.payloads.outputs.resources_revision }}
          labels: |
            ${{ steps.meta.outputs.labels }}
            org.opencontainers.image.revision=${{ steps.release_snapshot.outputs.release_commit }}
+            org.moviepilot.source-revision=${{ env.SOURCE_COMMIT }}
+            org.moviepilot.release-snapshot-revision=${{ steps.release_snapshot.outputs.release_commit }}
+            org.moviepilot.frontend-version=${{ steps.release_version.outputs.frontend_version }}
+            org.moviepilot.frontend-digest=${{ steps.payloads.outputs.frontend_digest }}
+            org.moviepilot.plugins-revision=${{ steps.payloads.outputs.plugins_revision }}
+            org.moviepilot.resources-revision=${{ steps.payloads.outputs.resources_revision }}
            org.moviepilot.plugin-market-wiki-revision=${{ steps.plugin_market.outputs.wiki_commit }}
+            org.moviepilot.models-catalog-digest=${{ steps.models_catalog.outputs.digest }}
          cache-from: type=gha,scope=moviepilot-v3-docker,version=2
          cache-to: type=gha,scope=moviepilot-v3-docker,mode=max,version=2