Disable multiarch

.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}" \

Dockerfile.aarch64

@@ -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

Dockerfile.armhf

@@ -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

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'

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'

root-arm/etc/s6-overlay/s6-rc.d/init-calibre-config/run

@@ -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

root-arm/etc/s6-overlay/s6-rc.d/init-calibre-config/type

@@ -1 +0,0 @@
-oneshot

root-arm/etc/s6-overlay/s6-rc.d/init-calibre-config/up

@@ -1 +0,0 @@
-/etc/s6-overlay/s6-rc.d/init-calibre-config/run