Simplify mod logic, add quay.io support

README.md

@@ -2,6 +2,7 @@
 
 These files are used by Linuxserver build processes to handle mods in our images. Not for end-user consumption.
 
+* **19.03.23:** - Add quay.io support for mods.
 * **25.02.23:** - Inject branding.
 * **05.02.23:** - Support multi-manifest mods for provenance, etc.
 * **21.01.23:** - Create with-contenv alias.

docker-mods.v3

@@ -161,69 +161,35 @@ curl_check() {
 
 # Use different filtering depending on URL
 get_blob_sha() {
-    if [[ $1 == "ghcr" ]]; then
+    MULTIDIGEST=$(curl  -f --retry 10 --retry-max-time 60 --retry-connrefused \
-        MULTIDIGEST=$(curl  -f --retry 10 --retry-max-time 60 --retry-connrefused \
+        --silent \
+        --location \
+        --request GET \
+        --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
+        --header "Accept: application/vnd.oci.image.index.v1+json" \
+        --header "Authorization: Bearer ${1}" \
+        "${2}/${3}" | jq -r 'first(.manifests[].digest)?')
+    if [[ -z "${MULTIDIGEST}" ]]; then
+        if DIGEST=$(curl  -f --retry 10 --retry-max-time 60 --retry-connrefused \
             --silent \
             --location \
             --request GET \
             --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
-            --header "Accept: application/vnd.oci.image.index.v1+json" \
+            --header "Accept: application/vnd.oci.image.manifest.v1+json" \
-            --header "Authorization: Bearer ${2}" \
+            --header "Authorization: Bearer ${1}" \
-            "${3}/${4}" | jq -r 'first(.manifests[].digest)?')
+            "${2}/${3}"); then
-        if [[ -z "${MULTIDIGEST}" ]]; then
+            echo "${DIGEST}" | jq -r '.layers[0].digest';
-            if DIGEST=$(curl  -f --retry 10 --retry-max-time 60 --retry-connrefused \
-                --silent \
-                --location \
-                --request GET \
-                --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
-                --header "Accept: application/vnd.oci.image.manifest.v1+json" \
-                --header "Authorization: Bearer ${2}" \
-                "${3}/${4}"); then
-                echo "${DIGEST}" | jq -r '.layers[0].digest';
-            fi
-        else
-            if DIGEST=$(curl  -f --retry 10 --retry-max-time 60 --retry-connrefused \
-                --silent \
-                --location \
-                --request GET \
-                --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
-                --header "Accept: application/vnd.oci.image.manifest.v1+json" \
-                --header "Authorization: Bearer ${2}" \
-                "${3}/${MULTIDIGEST}"); then
-                echo "${DIGEST}" | jq -r '.layers[0].digest';
-            fi
         fi
     else
-        MULTIDIGEST=$(curl  -f --retry 10 --retry-max-time 60 --retry-connrefused \
+        if DIGEST=$(curl  -f --retry 10 --retry-max-time 60 --retry-connrefused \
             --silent \
             --location \
             --request GET \
             --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
-            --header "Accept: application/vnd.oci.image.index.v1+json" \
+            --header "Accept: application/vnd.oci.image.manifest.v1+json" \
-            --header "Authorization: Bearer ${2}" \
+            --header "Authorization: Bearer ${1}" \
-            "${3}/${4}" | jq -r 'first(.manifests[].digest)?')
+            "${2}/${MULTIDIGEST}"); then
-        if [[ -z "${MULTIDIGEST}" ]]; then
+            echo "${DIGEST}" | jq -r '.layers[0].digest';
-            if DIGEST=$(curl  -f --retry 10 --retry-max-time 60 --retry-connrefused \
-                --silent \
-                --location \
-                --request GET \
-                --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
-                --header "Accept: application/vnd.oci.image.manifest.v1+json" \
-                --header "Authorization: Bearer ${2}" \
-                "${3}/${4}"); then
-                echo "${DIGEST}" | jq -r '.layers[0].digest';
-            fi
-        else
-            if DIGEST=$(curl  -f --retry 10 --retry-max-time 60 --retry-connrefused \
-                --silent \
-                --location \
-                --request GET \
-                --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
-                --header "Accept: application/vnd.oci.image.manifest.v1+json" \
-                --header "Authorization: Bearer ${2}" \
-                "${3}/${MULTIDIGEST}"); then
-                echo "${DIGEST}" | jq -r '.layers[0].digest';
-            fi
         fi
     fi
 }
@@ -233,34 +199,37 @@ run_mods() {
     echo "[mod-init] Attempting to run Docker Modification Logic"
     for DOCKER_MOD in $(echo "${DOCKER_MODS}" | tr '|' '\n'); do
         # Support alternative endpoints
-        if [[ ${DOCKER_MOD} == ghcr.io/* ]] || [[ ${DOCKER_MOD} == linuxserver/* ]]; then
+        case "${DOCKER_MOD}" in
+        linuxserver/* )
+            REGISTRY="ghcr.io"
+            ;;
+        ghcr.io/* )
+            REGISTRY="ghcr.io"
             DOCKER_MOD="${DOCKER_MOD#ghcr.io/*}"
-            ENDPOINT="${DOCKER_MOD%%:*}"
+            ;;
-            USERNAME="${DOCKER_MOD%%/*}"
+        quay.io/* )
-            REPO="${ENDPOINT#*/}"
+            REGISTRY="quay.io"
-            TAG="${DOCKER_MOD#*:}"
+            DOCKER_MOD="${DOCKER_MOD#quay.io/*}"
-            if [[ ${TAG} == "${DOCKER_MOD}" ]]; then
+            ;;
-                TAG="latest"
+        * )
-            fi
+            REGISTRY="registry-1.docker.io"
-            FILENAME="${USERNAME}.${REPO}.${TAG}"
+            ;;
-            AUTH_URL="https://ghcr.io/token?scope=repository%3A${USERNAME}%2F${REPO}%3Apull"
+        esac
-            MANIFEST_URL="https://ghcr.io/v2/${ENDPOINT}/manifests"
+        ENDPOINT="${DOCKER_MOD%%:*}"
-            BLOB_URL="https://ghcr.io/v2/${ENDPOINT}/blobs/"
+        USERNAME="${DOCKER_MOD%%/*}"
-            MODE="ghcr"
+        REPO="${ENDPOINT#*/}"
-        else
+        TAG="${DOCKER_MOD#*:}"
-            ENDPOINT="${DOCKER_MOD%%:*}"
+        if [[ "${TAG}" == "${DOCKER_MOD}" ]]; then
-            USERNAME="${DOCKER_MOD%%/*}"
+            TAG="latest"
-            REPO="${ENDPOINT#*/}"
-            TAG="${DOCKER_MOD#*:}"
-            if [[ ${TAG} == "${DOCKER_MOD}" ]]; then
-                TAG="latest"
-            fi
-            FILENAME="${USERNAME}.${REPO}.${TAG}"
-            AUTH_URL="https://auth.docker.io/token?service=registry.docker.io&scope=repository:${ENDPOINT}:pull"
-            MANIFEST_URL="https://registry-1.docker.io/v2/${ENDPOINT}/manifests"
-            BLOB_URL="https://registry-1.docker.io/v2/${ENDPOINT}/blobs/"
-            MODE="dockerhub"
         fi
+        FILENAME="${USERNAME}.${REPO}.${TAG}"
+        MANIFEST_URL="https://${REGISTRY}/v2/${ENDPOINT}/manifests"
+        BLOB_URL="https://${REGISTRY}/v2/${ENDPOINT}/blobs/"
+        case "${REGISTRY}" in
+            "ghcr.io") AUTH_URL="https://ghcr.io/token?scope=repository%3A${USERNAME}%2F${REPO}%3Apull";;
+            "quay.io") AUTH_URL="https://quay.io/v2/auth?service=quay.io&scope=repository%3A${USERNAME}%2F${REPO}%3Apull";;
+            "registry-1.docker.io") AUTH_URL="https://auth.docker.io/token?service=registry.docker.io&scope=repository:${ENDPOINT}:pull";;
+        esac
         # Kill off modification logic if any of the usernames are banned
         for BANNED in $(curl -s https://raw.githubusercontent.com/linuxserver/docker-mods/master/blacklist.txt); do
             if [[ "${BANNED,,}" == "${USERNAME,,}" ]]; then
@@ -282,7 +251,7 @@ run_mods() {
                 jq -r '.token'
         )"
         # Determine first and only layer of image
-        SHALAYER=$(get_blob_sha "${MODE}" "${TOKEN}" "${MANIFEST_URL}" "${TAG}")
+        SHALAYER=$(get_blob_sha "${TOKEN}" "${MANIFEST_URL}" "${TAG}")
         if [[ -z "${SHALAYER}" ]]; then
             echo "[mod-init] ${DOCKER_MOD} could not be found on ${MODE}"
             continue