From 220a224ee614d3ee7a2ddd8236decb5ec7bbbf73 Mon Sep 17 00:00:00 2001 From: thespad Date: Tue, 26 Nov 2024 15:03:17 +0000 Subject: [PATCH] Not multi-arch --- .github/workflows/external_trigger.yml | 7 +------ Jenkinsfile | 2 +- jenkins-vars.yml | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index c89ce61..a835525 100644 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -43,15 +43,10 @@ jobs: token=$(curl -sX GET \ "https://ghcr.io/token?scope=repository%3Alinuxserver%2Fpiper%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/Jenkinsfile b/Jenkinsfile index c15d51d..511d007 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -28,7 +28,7 @@ pipeline { DEV_DOCKERHUB_IMAGE = 'lsiodev/piper' PR_DOCKERHUB_IMAGE = 'lspipepr/piper' DIST_IMAGE = 'ubuntu' - MULTIARCH='true' + MULTIARCH='false' CI='false' CI_WEB='false' CI_DELAY='120' diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 0e6122c..8d5360c 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -16,7 +16,7 @@ repo_vars: - DEV_DOCKERHUB_IMAGE = 'lsiodev/piper' - PR_DOCKERHUB_IMAGE = 'lspipepr/piper' - DIST_IMAGE = 'ubuntu' - - MULTIARCH='true' + - MULTIARCH='false' - CI='false' - CI_WEB='false' - CI_DELAY='120'