Bot Updating Package Versions

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

README.md

@@ -48,17 +48,17 @@ 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:development` 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\> |
 
 ## Application Setup
 
@@ -80,7 +80,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:development
     container_name: heimdall
     environment:
       - PUID=1000
@@ -106,7 +106,7 @@ docker run -d \
   -p 443:443 \
   -v </path/to/appdata/config>:/config \
   --restart unless-stopped \
-  lscr.io/linuxserver/heimdall
+  lscr.io/linuxserver/heimdall:development
 ```
 
 Using tags, you can switch between the stable releases of Heimdall and the master branch. No tag is required for the latest stable release.
@@ -170,7 +170,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:development`
 
 ## Updating Info
 
@@ -188,7 +188,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:development`
 * 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)
@@ -223,7 +223,7 @@ cd docker-heimdall
 docker build \
   --no-cache \
   --pull \
-  -t lscr.io/linuxserver/heimdall:latest .
+  -t lscr.io/linuxserver/heimdall:development .
 ```
 
 The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`

package_versions.txt

@@ -2,33 +2,33 @@ alpine-baselayout-3.2.0-r16
 alpine-keys-2.4-r0
 apache2-utils-2.4.53-r0
 apk-tools-2.12.7-r0
-apr-1.7.0-r0
+apr-1.7.0-r1
 apr-util-1.6.1-r7
 argon2-libs-20190702-r1
-bash-5.1.4-r0
+bash-5.1.16-r0
 brotli-libs-1.0.9-r5
-busybox-1.33.1-r6
+busybox-1.33.1-r7
 ca-certificates-20211220-r0
 ca-certificates-bundle-20211220-r0
 coreutils-8.32-r2
-curl-7.79.1-r0
+curl-7.79.1-r1
 expat-2.4.7-r0
-git-2.32.0-r0
+git-2.32.2-r0
 libacl-2.2.53-r0
 libattr-2.5.1-r0
 libc-utils-0.7.2-r3
-libcrypto1.1-1.1.1l-r0
+libcrypto1.1-1.1.1o-r0
-libcurl-7.79.1-r0
+libcurl-7.79.1-r1
 libedit-20210216.3.1-r0
 libintl-0.21-r0
 libmagic-5.40-r1
 libproc-3.3.17-r0
 libressl3.3-libcrypto-3.3.6-r0
 libressl3.3-libssl-3.3.6-r0
-libretls-3.3.3p1-r2
+libretls-3.3.3p1-r3
-libssl1.1-1.1.1l-r0
+libssl1.1-1.1.1o-r0
 libuuid-2.37.4-r0
-libxml2-2.9.13-r0
+libxml2-2.9.14-r0
 libzip-1.7.3-r2
 linux-pam-1.5.1-r1
 logrotate-3.18.1-r1
@@ -38,9 +38,9 @@ nano-5.7-r2
 ncurses-libs-6.2_p20210612-r0
 ncurses-terminfo-base-6.2_p20210612-r0
 nghttp2-libs-1.43.0-r0
-nginx-1.20.2-r0
+nginx-1.20.2-r1
 oniguruma-6.9.7.1-r0
-openssl-1.1.1n-r0
+openssl-1.1.1o-r0
 pcre-8.44-r0
 pcre2-10.36-r0
 php7-7.4.26-r0
@@ -67,9 +67,9 @@ scanelf-1.3.2-r0
 shadow-4.8.1-r0
 skalibs-2.10.0.3-r0
 sqlite-libs-3.35.5-r0
-ssl_client-1.33.1-r6
+ssl_client-1.33.1-r7
-tzdata-2021e-r0
+tzdata-2022a-r0
 utmps-0.1.0.2-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-r1