Bot Updating Package Versions

2026-03-31 17:17:07 +09:00 · 2022-02-27 08:58:29 +01:00 · 2022-02-20 08:57:56 +01:00 · 2022-02-13 08:58:14 +01:00 · 2022-02-06 08:57:58 +01:00 · 2022-01-23 08:57:55 +01:00
3 changed files with 85 additions and 72 deletions
--- a/88
+++ b/88
@@ -128,12 +128,11 @@ pipeline {
            script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g' ''',
            returnStdout: true).trim()

-          env.SEMVER = (new Date()).format('YYYY.MM.dd')
-          def semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)\.(\d+)$/
+          def semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)\.(\d+)/
          if (semver.find()) {
            env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${semver[0][3]}"
          } else {
-            semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)(?:\.(\d+))?(.*)$/
+            semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)(?:\.(\d+))?(.*)/
            if (semver.find()) {
              if (semver[0][3]) {
                env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${semver[0][3]}"
@@ -143,7 +142,15 @@ pipeline {
            }
          }

-          println("SEMVER: ${env.SEMVER}")
+          if (env.SEMVER != null) {
+            if (BRANCH_NAME != "master" && BRANCH_NAME != "main") {
+              env.SEMVER = "${env.SEMVER}-${BRANCH_NAME}"
+            }
+            println("SEMVER: ${env.SEMVER}")
+          } else {
+            println("No SEMVER detected")
+          }
+
        }
      }
    }
@@ -412,10 +419,10 @@ pipeline {
      steps{
        sh '''#! /bin/bash
              set -e
-              PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/packages | jq -r '.[] | select(.name=="linuxserver/heimdall") | .uuid')
+              PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/organizations/linuxserver-ci/packages | jq -r '.[] | select(.name=="linuxserver/heimdall") | .uuid')
              if [ -z "${PACKAGE_UUID}" ]; then
                echo "Adding package to Scarf.sh"
-                PACKAGE_UUID=$(curl -sX POST https://scarf.sh/api/v1/packages \
+                curl -sX POST https://scarf.sh/api/v1/organizations/linuxserver-ci/packages \
                  -H "Authorization: Bearer ${SCARF_TOKEN}" \
                  -H "Content-Type: application/json" \
                  -d '{"name":"linuxserver/heimdall",\
@@ -423,22 +430,10 @@ pipeline {
                       "libraryType":"docker",\
                       "website":"https://github.com/linuxserver/docker-heimdall",\
                       "backendUrl":"https://ghcr.io/linuxserver/heimdall",\
-                       "publicUrl":"https://lscr.io/linuxserver/heimdall"}' \
-                  | jq -r .uuid)
+                       "publicUrl":"https://lscr.io/linuxserver/heimdall"}' || :
              else
                echo "Package already exists on Scarf.sh"
              fi
-              echo "Setting permissions on Scarf.sh for package ${PACKAGE_UUID}"
-              curl -X POST https://scarf.sh/api/v1/packages/${PACKAGE_UUID}/permissions \
-                -H "Authorization: Bearer ${SCARF_TOKEN}" \
-                -H "Content-Type: application/json" \
-                -d '[{"userQuery":"Spad","permissionLevel":"admin"},\
-                     {"userQuery":"roxedus","permissionLevel":"admin"},\
-                     {"userQuery":"nemchik","permissionLevel":"admin"},\
-                     {"userQuery":"driz","permissionLevel":"admin"},\
-                     {"userQuery":"aptalca","permissionLevel":"admin"},\
-                     {"userQuery":"saarg","permissionLevel":"admin"},\
-                     {"userQuery":"Stark","permissionLevel":"admin"}]'
           '''
      } 
    }
@@ -762,11 +757,15 @@ pipeline {
                    docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest
                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG}
-                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER}
+                    if [ -n "${SEMVER}" ]; then
+                      docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER}
+                    fi
                    docker push ${PUSHIMAGE}:latest
                    docker push ${PUSHIMAGE}:${META_TAG}
                    docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG}
-                    docker push ${PUSHIMAGE}:${SEMVER}
+                    if [ -n "${SEMVER}" ]; then
+                     docker push ${PUSHIMAGE}:${SEMVER}
+                    fi
                  done
               '''
          }
@@ -775,8 +774,10 @@ pipeline {
                  docker rmi \
                  ${DELETEIMAGE}:${META_TAG} \
                  ${DELETEIMAGE}:${EXT_RELEASE_TAG} \
-                  ${DELETEIMAGE}:latest \
-                  ${DELETEIMAGE}:${SEMVER} || :
+                  ${DELETEIMAGE}:latest || :
+                  if [ -n "${SEMVER}" ]; then
+                    docker rmi ${DELETEIMAGE}:${SEMVER} || :
+                  fi
                done
             '''
        }
@@ -826,9 +827,11 @@ pipeline {
                    docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
                    docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
-                    docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER}
-                    docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER}
-                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
+                    if [ -n "${SEMVER}" ]; then
+                      docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER}
+                      docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER}
+                      docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
+                    fi
                    docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
                    docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
                    docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
@@ -838,9 +841,11 @@ pipeline {
                    docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
                    docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
                    docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
-                    docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
-                    docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER}
-                    docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
+                    if [ -n "${SEMVER}" ]; then
+                      docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
+                      docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER}
+                      docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
+                    fi
                    docker manifest push --purge ${MANIFESTIMAGE}:latest || :
                    docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest
                    docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm
@@ -853,14 +858,18 @@ pipeline {
                    docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
                    docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm
                    docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8
-                    docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || :
-                    docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
-                    docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm
-                    docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
+                    if [ -n "${SEMVER}" ]; then
+                      docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || :
+                      docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
+                      docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm
+                      docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
+                    fi
                    docker manifest push --purge ${MANIFESTIMAGE}:latest
                    docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} 
                    docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} 
-                    docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} 
+                    if [ -n "${SEMVER}" ]; then
+                      docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} 
+                    fi
                  done
               '''
          }
@@ -870,15 +879,18 @@ pipeline {
                  ${DELETEIMAGE}:amd64-${META_TAG} \
                  ${DELETEIMAGE}:amd64-latest \
                  ${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \
-                  ${DELETEIMAGE}:amd64-${SEMVER} \
                  ${DELETEIMAGE}:arm32v7-${META_TAG} \
                  ${DELETEIMAGE}:arm32v7-latest \
                  ${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \
-                  ${DELETEIMAGE}:arm32v7-${SEMVER} \
                  ${DELETEIMAGE}:arm64v8-${META_TAG} \
                  ${DELETEIMAGE}:arm64v8-latest \
-                  ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} \
-                  ${DELETEIMAGE}:arm64v8-${SEMVER} || :
+                  ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || :
+                  if [ -n "${SEMVER}" ]; then
+                    docker rmi \
+                    ${DELETEIMAGE}:amd64-${SEMVER} \
+                    ${DELETEIMAGE}:arm32v7-${SEMVER} \
+                    ${DELETEIMAGE}:arm64v8-${SEMVER} || :
+                  fi
                done
                docker rmi \
                ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \
--- a/README.md
+++ b/README.md
@@ -29,6 +29,7 @@ Find us at:

 # [linuxserver/heimdall](https://github.com/linuxserver/docker-heimdall)

+[![Scarf.io pulls](https://scarf.sh/installs-badge/linuxserver-ci/linuxserver%2Fheimdall?color=94398d&label-color=555555&logo-color=ffffff&style=for-the-badge&package-type=docker)](https://scarf.sh/gateway/linuxserver-ci/docker/linuxserver%2Fheimdall)
 [![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-heimdall.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-heimdall)
 [![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-heimdall.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-heimdall/releases)
 [![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-heimdall/packages)
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -1,18 +1,18 @@
 alpine-baselayout-3.2.0-r7
-alpine-keys-2.2-r0
-apache2-utils-2.4.49-r0
-apk-tools-2.10.8-r0
+alpine-keys-2.4-r0
+apache2-utils-2.4.52-r0
+apk-tools-2.10.8-r1
 apr-1.7.0-r0
 apr-util-1.6.1-r6
 argon2-libs-20190702-r1
 bash-5.0.17-r0
-busybox-1.31.1-r20
-ca-certificates-20191127-r4
-ca-certificates-bundle-20191127-r4
+busybox-1.31.1-r21
+ca-certificates-20211220-r0
+ca-certificates-bundle-20211220-r0
 coreutils-8.32-r0
 curl-7.79.1-r0
 db-5.3.28-r1
-expat-2.2.9-r1
+expat-2.2.10-r2
 git-2.26.3-r0
 libacl-2.2.53-r0
 libattr-2.4.48-r0
@@ -23,57 +23,57 @@ libedit-20191231.3.1-r0
 libintl-0.20.2-r0
 libldap-2.4.50-r2
 libmagic-5.38-r0
-libpq-12.8-r0
+libpq-12.10-r0
 libproc-3.3.16-r0
 libressl3.1-libcrypto-3.1.2-r0
 libressl3.1-libssl-3.1.2-r0
 libsasl-2.1.27-r6
 libssl1.1-1.1.1l-r0
 libtls-standalone-2.9.1-r1
-libuuid-2.35.2-r0
+libuuid-2.37.4-r0
 libxml2-2.9.12-r0
 libzip-1.6.1-r1
 linux-pam-1.3.1-r4
-logrotate-3.16.0-r0
+logrotate-3.16.0-r1
 musl-1.1.24-r10
 musl-utils-1.1.24-r10
 nano-4.9.3-r0
-ncurses-libs-6.2_p20200523-r0
-ncurses-terminfo-base-6.2_p20200523-r0
+ncurses-libs-6.2_p20200523-r1
+ncurses-terminfo-base-6.2_p20200523-r1
 nghttp2-libs-1.41.0-r0
 nginx-1.18.0-r3
 openssl-1.1.1l-r0
 pcre-8.44-r0
 pcre2-10.35-r0
-php7-7.3.31-r0
-php7-common-7.3.31-r0
-php7-ctype-7.3.31-r0
-php7-curl-7.3.31-r0
-php7-fileinfo-7.3.31-r0
-php7-fpm-7.3.31-r0
-php7-json-7.3.31-r0
-php7-mbstring-7.3.31-r0
-php7-mysqlnd-7.3.31-r0
-php7-openssl-7.3.31-r0
-php7-pdo-7.3.31-r0
-php7-pdo_mysql-7.3.31-r0
-php7-pdo_pgsql-7.3.31-r0
-php7-pdo_sqlite-7.3.31-r0
-php7-session-7.3.31-r0
-php7-simplexml-7.3.31-r0
-php7-tokenizer-7.3.31-r0
-php7-xml-7.3.31-r0
-php7-xmlwriter-7.3.31-r0
-php7-zip-7.3.31-r0
+php7-7.3.33-r0
+php7-common-7.3.33-r0
+php7-ctype-7.3.33-r0
+php7-curl-7.3.33-r0
+php7-fileinfo-7.3.33-r0
+php7-fpm-7.3.33-r0
+php7-json-7.3.33-r0
+php7-mbstring-7.3.33-r0
+php7-mysqlnd-7.3.33-r0
+php7-openssl-7.3.33-r0
+php7-pdo-7.3.33-r0
+php7-pdo_mysql-7.3.33-r0
+php7-pdo_pgsql-7.3.33-r0
+php7-pdo_sqlite-7.3.33-r0
+php7-session-7.3.33-r0
+php7-simplexml-7.3.33-r0
+php7-tokenizer-7.3.33-r0
+php7-xml-7.3.33-r0
+php7-xmlwriter-7.3.33-r0
+php7-zip-7.3.33-r0
 popt-1.16-r7
 procps-3.3.16-r0
 readline-8.0.4-r0
 scanelf-1.2.6-r0
 shadow-4.8.1-r0
 sqlite-libs-3.32.1-r1
-ssl_client-1.31.1-r20
+ssl_client-1.31.1-r21
 tar-1.32-r2
-tzdata-2021b-r0
+tzdata-2021e-r0
 xz-5.2.5-r0
 xz-libs-5.2.5-r0
 zlib-1.2.11-r3
Author	SHA1	Message	Date
LinuxServer-CI	cc9a84b0cc	Bot Updating Package Versions	2022-02-27 08:58:29 +01:00
LinuxServer-CI	c29c23e7a2	Bot Updating Package Versions	2022-02-20 08:57:56 +01:00
LinuxServer-CI	2ee91c559d	Bot Updating Package Versions	2022-02-13 08:58:14 +01:00
LinuxServer-CI	fef327d0b8	Bot Updating Package Versions	2022-02-06 08:57:58 +01:00
LinuxServer-CI	b2951972b0	Bot Updating Package Versions	2022-01-23 08:57:55 +01:00
LinuxServer-CI	c5739b5916	Bot Updating Package Versions	2021-12-26 08:57:57 +01:00
LinuxServer-CI	3af6408f4f	Bot Updating Package Versions	2021-12-19 09:01:27 +01:00
LinuxServer-CI	6b54e93c4e	Bot Updating Templated Files	2021-12-19 08:59:13 +01:00
LinuxServer-CI	aabf6d3919	Bot Updating Templated Files	2021-12-19 08:57:55 +01:00
LinuxServer-CI	f13db2b813	Bot Updating Package Versions	2021-11-28 08:58:14 +01:00
LinuxServer-CI	0ca5a50c27	Bot Updating Package Versions	2021-11-21 08:58:19 +01:00
LinuxServer-CI	0ce2fb9e8d	Bot Updating Package Versions	2021-11-14 08:58:06 +01:00
LinuxServer-CI	5fb64c3d1a	Bot Updating Package Versions	2021-11-07 08:58:30 +01:00
LinuxServer-CI	3949667e63	Bot Updating Package Versions	2021-10-31 08:57:43 +01:00
LinuxServer-CI	4003590441	Bot Updating Package Versions	2021-10-24 09:58:21 +02:00
LinuxServer-CI	71bcdc26f7	Bot Updating Package Versions	2021-10-17 09:58:07 +02:00
LinuxServer-CI	dc095a5aca	Bot Updating Package Versions	2021-10-10 09:57:52 +02:00