From 59cd94f66cff83793709474f421a91a96b2077e8 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Thu, 22 Dec 2022 20:41:02 +0000 Subject: [PATCH] Disable multiarch --- .github/workflows/external_trigger.yml | 7 +----- Dockerfile.aarch64 | 25 ------------------- Dockerfile.armhf | 25 ------------------- Jenkinsfile | 2 +- jenkins-vars.yml | 2 +- .../dependencies.d/init-rdesktop-web-end | 0 .../s6-rc.d/init-calibre-config/run | 15 ----------- .../s6-rc.d/init-calibre-config/type | 1 - .../s6-overlay/s6-rc.d/init-calibre-config/up | 1 - .../dependencies.d/init-calibre-config | 0 .../user/contents.d/init-calibre-config | 0 11 files changed, 3 insertions(+), 75 deletions(-) delete mode 100644 Dockerfile.aarch64 delete mode 100644 Dockerfile.armhf delete mode 100644 root-arm/etc/s6-overlay/s6-rc.d/init-calibre-config/dependencies.d/init-rdesktop-web-end delete mode 100755 root-arm/etc/s6-overlay/s6-rc.d/init-calibre-config/run delete mode 100644 root-arm/etc/s6-overlay/s6-rc.d/init-calibre-config/type delete mode 100644 root-arm/etc/s6-overlay/s6-rc.d/init-calibre-config/up delete mode 100644 root-arm/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-calibre-config delete mode 100644 root-arm/etc/s6-overlay/s6-rc.d/user/contents.d/init-calibre-config diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 2be2c40..654ec66 100755 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -36,15 +36,10 @@ jobs: token=$(curl -sX GET \ "https://ghcr.io/token?scope=repository%3Alinuxserver%2Fcalibre%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 deleted file mode 100644 index 41f80b7..0000000 --- a/Dockerfile.aarch64 +++ /dev/null @@ -1,25 +0,0 @@ -# syntax=docker/dockerfile:1 - -FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arm64v8-jammy - -# set version label -ARG BUILD_DATE -ARG VERSION -ARG CALIBRE_RELEASE -LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" -LABEL maintainer="aptalca" - -# add local files -COPY root-arm/ / - -# prevent baseimage services from starting -RUN \ - cd /etc/s6-overlay/s6-rc.d/user/contents.d && \ - rm -rf \ - svc-autostart \ - svc-guacd \ - svc-web \ - svc-xrdp \ - svc-xrdp-sesman - -# This Calibre image does not support ARM due to lack of upstream support diff --git a/Dockerfile.armhf b/Dockerfile.armhf deleted file mode 100644 index b283a66..0000000 --- a/Dockerfile.armhf +++ /dev/null @@ -1,25 +0,0 @@ -# syntax=docker/dockerfile:1 - -FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arm32v7-jammy - -# set version label -ARG BUILD_DATE -ARG VERSION -ARG CALIBRE_RELEASE -LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" -LABEL maintainer="aptalca" - -# add local files -COPY root-arm/ / - -# prevent baseimage services from starting -RUN \ - cd /etc/s6-overlay/s6-rc.d/user/contents.d && \ - rm -rf \ - svc-autostart \ - svc-guacd \ - svc-web \ - svc-xrdp \ - svc-xrdp-sesman - -# This Calibre image does not support ARM due to lack of upstream support diff --git a/Jenkinsfile b/Jenkinsfile index 04dbec8..95f9683 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -25,7 +25,7 @@ pipeline { DEV_DOCKERHUB_IMAGE = 'lsiodev/calibre' PR_DOCKERHUB_IMAGE = 'lspipepr/calibre' DIST_IMAGE = 'ubuntu' - MULTIARCH = 'true' + MULTIARCH = 'false' CI = 'true' CI_WEB = 'true' CI_PORT = '8080' diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 1d15a92..7d1a3b7 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -16,7 +16,7 @@ repo_vars: - DEV_DOCKERHUB_IMAGE = 'lsiodev/calibre' - PR_DOCKERHUB_IMAGE = 'lspipepr/calibre' - DIST_IMAGE = 'ubuntu' - - MULTIARCH = 'true' + - MULTIARCH = 'false' - CI = 'true' - CI_WEB = 'true' - CI_PORT = '8080' diff --git a/root-arm/etc/s6-overlay/s6-rc.d/init-calibre-config/dependencies.d/init-rdesktop-web-end b/root-arm/etc/s6-overlay/s6-rc.d/init-calibre-config/dependencies.d/init-rdesktop-web-end deleted file mode 100644 index e69de29..0000000 diff --git a/root-arm/etc/s6-overlay/s6-rc.d/init-calibre-config/run b/root-arm/etc/s6-overlay/s6-rc.d/init-calibre-config/run deleted file mode 100755 index 2343f51..0000000 --- a/root-arm/etc/s6-overlay/s6-rc.d/init-calibre-config/run +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/with-contenv bash -# shellcheck shell=bash - -cat <<-EOF - ******************************************************** - ******************************************************** - * * - * !!!! * - * This Calibre image does not support * - * ARM due to a lack of upstream packages * - * * - * * - ******************************************************** - ******************************************************** -EOF diff --git a/root-arm/etc/s6-overlay/s6-rc.d/init-calibre-config/type b/root-arm/etc/s6-overlay/s6-rc.d/init-calibre-config/type deleted file mode 100644 index 3d92b15..0000000 --- a/root-arm/etc/s6-overlay/s6-rc.d/init-calibre-config/type +++ /dev/null @@ -1 +0,0 @@ -oneshot \ No newline at end of file diff --git a/root-arm/etc/s6-overlay/s6-rc.d/init-calibre-config/up b/root-arm/etc/s6-overlay/s6-rc.d/init-calibre-config/up deleted file mode 100644 index 7cb2ca0..0000000 --- a/root-arm/etc/s6-overlay/s6-rc.d/init-calibre-config/up +++ /dev/null @@ -1 +0,0 @@ -/etc/s6-overlay/s6-rc.d/init-calibre-config/run \ No newline at end of file diff --git a/root-arm/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-calibre-config b/root-arm/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-calibre-config deleted file mode 100644 index e69de29..0000000 diff --git a/root-arm/etc/s6-overlay/s6-rc.d/user/contents.d/init-calibre-config b/root-arm/etc/s6-overlay/s6-rc.d/user/contents.d/init-calibre-config deleted file mode 100644 index e69de29..0000000