Bot Updating Package Versions

.github/workflows/external_trigger.yml

@@ -48,8 +48,12 @@ jobs:
               | jq -r '.config.digest')
           image_info=$(curl -sL \
             --header "Authorization: Bearer ${token}" \
-            "https://ghcr.io/v2/${image}/blobs/${digest}" \
+            "https://ghcr.io/v2/${image}/blobs/${digest}")
-            | jq -r '.container_config')
+          if [[ $(echo $image_info | jq -r '.container_config') == "null" ]]; then
+            image_info=$(echo $image_info | jq -r '.config')
+          else
+            image_info=$(echo $image_info | jq -r '.container_config')
+          fi
           IMAGE_RELEASE=$(echo ${image_info} | jq -r '.Labels.build_version' | awk '{print $3}')
           IMAGE_VERSION=$(echo ${IMAGE_RELEASE} | awk -F'-ls' '{print $1}')
           if [ -z "${IMAGE_VERSION}" ]; then

Jenkinsfile

@@ -353,9 +353,11 @@ pipeline {
               if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then
                 cd ${TEMPDIR}/unraid/templates/
                 if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then
-                  echo "Image is on the ignore list, removing Unraid template"
+                  echo "Image is on the ignore list, marking Unraid template as deprecated"
-                  git rm unraid/${CONTAINER_NAME}.xml || :
+                  cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
-                  git commit -m 'Bot Removing Deprecated Unraid Template' || :
+                  git add -u unraid/${CONTAINER_NAME}.xml
+                  git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || :
+                  git commit -m 'Bot Moving Deprecated Unraid Template' || :
                 else
                   cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
                   git add unraid/${CONTAINER_NAME}.xml
@@ -718,7 +720,7 @@ pipeline {
                 -e DO_REGION="ams3" \
                 -e DO_BUCKET="lsio-ci" \
                 -t ghcr.io/linuxserver/ci:latest \
-                python /ci/ci.py'''
+                python3 test_build.py'''
         }
       }
     }

README.md

@@ -48,26 +48,26 @@ Why not use it as your browser start page? It even has the ability to include a
 
 ## Supported Architectures
 
-Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
+We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
 
-Simply pulling `lscr.io/linuxserver/heimdall` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
+Simply pulling `lscr.io/linuxserver/heimdall:js` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
 
 The architectures supported by this image are:
 
-| Architecture | Tag |
+| Architecture | Available | Tag |
-| :----: | --- |
+| :----: | :----: | ---- |
-| x86-64 | amd64-latest |
+| x86-64 | ✅ | amd64-\<version tag\> |
-| arm64 | arm64v8-latest |
+| arm64 | ✅ | arm64v8-\<version tag\> |
-| armhf | arm32v7-latest |
+| armhf| ✅ | arm32v7-\<version tag\> |
 
 ## Version Tags
 
-This image provides various versions that are available via tags. `latest` tag usually provides the latest stable version. Others are considered under development and caution must be exercised when using them.
+This image provides various versions that are available via tags. Please read the descriptions carefully and exercise caution when using unstable or development tags.
 
-| Tag | Description |
+| Tag | Available | Description |
-| :----: | --- |
+| :----: | :----: |--- |
-| latest | Stable Heimdall releases. |
+| latest | ✅ | Stable Heimdall releases. |
-| development | Latest commit from the github master branch. |
+| development | ✅ | Latest commit from the github master branch. |
 
 ## Application Setup
 
@@ -89,7 +89,7 @@ Here are some example snippets to help you get started creating a container.
 version: "2.1"
 services:
   heimdall:
-    image: lscr.io/linuxserver/heimdall
+    image: lscr.io/linuxserver/heimdall:js
     container_name: heimdall
     environment:
       - PUID=1000
@@ -113,7 +113,7 @@ docker run -d \
   -p 3000:3000 \
   -v /path/to/appdata/config:/config \
   --restart unless-stopped \
-  lscr.io/linuxserver/heimdall
+  lscr.io/linuxserver/heimdall:js
 ```
 
 ## Parameters
@@ -171,7 +171,7 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to
 * container version number
   * `docker inspect -f '{{ index .Config.Labels "build_version" }}' heimdall`
 * image version number
-  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/heimdall`
+  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/heimdall:js`
 
 ## Updating Info
 
@@ -189,7 +189,7 @@ Below are the instructions for updating containers:
 
 ### Via Docker Run
 
-* Update the image: `docker pull lscr.io/linuxserver/heimdall`
+* Update the image: `docker pull lscr.io/linuxserver/heimdall:js`
 * Stop the running container: `docker stop heimdall`
 * Delete the container: `docker rm heimdall`
 * Recreate a new container with the same docker run parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved)
@@ -224,7 +224,7 @@ cd docker-heimdall
 docker build \
   --no-cache \
   --pull \
-  -t lscr.io/linuxserver/heimdall:latest .
+  -t lscr.io/linuxserver/heimdall:js .
 ```
 
 The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`

package_versions.txt

@@ -1,40 +1,42 @@
 alpine-baselayout-3.2.0-r8
 alpine-keys-2.4-r0
 apk-tools-2.12.7-r0
-bash-5.1.0-r0
+bash-5.1.16-r0
 brotli-libs-1.0.9-r3
-busybox-1.32.1-r7
+busybox-1.32.1-r9
 c-ares-1.17.2-r0
-ca-certificates-20191127-r5
+ca-certificates-20220614-r0
-ca-certificates-bundle-20191127-r5
+ca-certificates-bundle-20220614-r0
 coreutils-8.32-r2
+curl-7.79.1-r3
 libacl-2.2.53-r0
 libattr-2.4.48-r0
 libc-utils-0.7.2-r3
-libcrypto1.1-1.1.1l-r0
+libcrypto1.1-1.1.1s-r0
+libcurl-7.79.1-r3
 libgcc-10.2.1_pre1-r3
 libintl-0.20.2-r2
 libproc-3.3.16-r0
-libssl1.1-1.1.1l-r0
+libssl1.1-1.1.1s-r0
 libstdc++-10.2.1_pre1-r3
 libtls-standalone-2.9.1-r1
 linux-pam-1.5.1-r0
 musl-1.2.2-r1
 musl-utils-1.2.2-r1
-ncurses-libs-6.2_p20210109-r0
+ncurses-libs-6.2_p20210109-r1
-ncurses-terminfo-base-6.2_p20210109-r0
+ncurses-terminfo-base-6.2_p20210109-r1
 nghttp2-libs-1.42.0-r1
-nodejs-14.18.1-r0
+nodejs-14.20.1-r0
-npm-14.18.1-r0
+npm-14.20.1-r0
 procps-3.3.16-r0
 readline-8.1.0-r0
 s6-ipcserver-2.10.0.0-r0
 scanelf-1.2.8-r0
 shadow-4.8.1-r0
 skalibs-2.10.0.0-r0
-ssl_client-1.32.1-r7
+ssl_client-1.32.1-r9
-tzdata-2021e-r0
+tzdata-2022f-r1
 utmps-0.1.0.0-r0
-xz-5.2.5-r0
+xz-5.2.5-r1
-xz-libs-5.2.5-r0
+xz-libs-5.2.5-r1
-zlib-1.2.11-r3
+zlib-1.2.12-r3