Merge pull request #5 from linuxserver/chinese-no-arm

no more aarch64 support for chinese AUR build
linuxserver · Aug 3, 2024 · fc1040c · fc1040c
2 parents 0ad9b41 + ba8627b
commit fc1040c
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 73 deletions.
diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml
@@ -39,15 +39,10 @@ jobs:
           token=$(curl -sX GET \
             "https://ghcr.io/token?scope=repository%3Alinuxserver%2Fwps-office%3Apull" \
             | jq -r '.token')
-            multidigest=$(curl -s \
-              --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
-              --header "Authorization: Bearer ${token}" \
-              "https://ghcr.io/v2/${image}/manifests/${tag}" \
-              | jq -r 'first(.manifests[].digest)')
             digest=$(curl -s \
               --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
               --header "Authorization: Bearer ${token}" \
-              "https://ghcr.io/v2/${image}/manifests/${multidigest}" \
+              "https://ghcr.io/v2/${image}/manifests/${tag}" \
               | jq -r '.config.digest')
           image_info=$(curl -sL \
             --header "Authorization: Bearer ${token}" \

diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -25,7 +25,7 @@ pipeline {
     DEV_DOCKERHUB_IMAGE = 'lsiodev/wps-office'
     PR_DOCKERHUB_IMAGE = 'lspipepr/wps-office'
     DIST_IMAGE = 'arch'
-    MULTIARCH = 'true'
+    MULTIARCH = 'false'
     CI = 'true'
     CI_WEB = 'true'
     CI_PORT = '3000'

diff --git a/jenkins-vars.yml b/jenkins-vars.yml
@@ -16,7 +16,7 @@ repo_vars:
   - DEV_DOCKERHUB_IMAGE = 'lsiodev/wps-office'
   - PR_DOCKERHUB_IMAGE = 'lspipepr/wps-office'
   - DIST_IMAGE = 'arch'
-  - MULTIARCH = 'true'
+  - MULTIARCH = 'false'
   - CI = 'true'
   - CI_WEB = 'true'
   - CI_PORT = '3000'