Bot Updating Package Versions

Jenkinsfile

@@ -275,7 +275,7 @@ pipeline {
               # ${TEMPDIR}/unraid/docker-templates: Cloned docker-templates repo to check for logos
               # ${TEMPDIR}/unraid/templates: Cloned templates repo for commiting unraid template changes and pushing back to Github
               git clone --branch develop --depth 1 https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/docker-${CONTAINER_NAME}
-              docker run --rm -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/tmp -e LOCAL=true ghcr.io/linuxserver/jenkins-builder:latest 
+              docker run --rm -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/tmp -e LOCAL=true -e PUID=$(id -u) -e PGID=$(id -g) ghcr.io/linuxserver/jenkins-builder:latest 
               echo "Starting Stage 1 - Jenkinsfile update"
               if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then
                 mkdir -p ${TEMPDIR}/repo
@@ -382,11 +382,15 @@ pipeline {
                 cd ${TEMPDIR}/unraid/templates/
                 GH_TEMPLATES_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||')
                 if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then
-                  echo "Image is on the ignore list, marking Unraid template as deprecated"
-                  cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
-                  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' || :
+                  if [[ -f ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ]]; then
+                    echo "Image is on the ignore list, marking Unraid template as deprecated"
+                    cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
+                    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
+                    echo "Image is on the ignore list, but no template exist, skipping deprecation"
+                  fi
                 else
                   cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
                   git add unraid/${CONTAINER_NAME}.xml
@@ -608,7 +612,7 @@ pipeline {
         sh '''#! /bin/bash
               set -e
               TEMPDIR=$(mktemp -d)
-              if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
+              if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" != "true" ]; then
                 LOCAL_CONTAINER=${IMAGE}:amd64-${META_TAG}
               else
                 LOCAL_CONTAINER=${IMAGE}:${META_TAG}

package_versions.txt

@@ -18,7 +18,7 @@ anyhow                               1.0.71                           rust-crate
 anyhow                               1.0.75                           rust-crate                    
 aom-libs                             3.7.1-r0                         apk                           
 apache2-utils                        2.4.59-r0                        apk                           
-apk-tools                            2.14.3-r1                        apk                           
+apk-tools                            2.14.4-r0                        apk                           
 apr                                  1.7.4-r0                         apk                           
 apr-util                             1.6.3-r1                         apk                           
 arg_enum_proc_macro                  0.3.2                            rust-crate                    
@@ -53,7 +53,7 @@ clap                                 4.0.32                           rust-crate
 clap_complete                        4.0.7                            rust-crate                    
 clap_derive                          4.0.21                           rust-crate                    
 clap_lex                             0.3.0                            rust-crate                    
-composer                             2.7.2                            binary                        
+composer                             2.7.4                            binary                        
 console                              0.15.5                           rust-crate                    
 coreutils                            9.4-r2                           apk                           
 coreutils-env                        9.4-r2                           apk                           
@@ -94,6 +94,7 @@ fftw-double-libs                     3.3.10-r5                        apk
 fgrosse/phpasn1                      v2.3.0                           php-composer                  
 files_downloadlimit                  1.1.0                            npm                           
 files_pdfviewer                      2.10.0                           npm                           
+findutils                            4.9.0-r5                         apk                           
 firstrunwizard                       2.18.0                           npm                           
 fontconfig                           2.14.2-r4                        apk                           
 freetype                             2.13.2-r0                        apk                           
@@ -119,7 +120,6 @@ guzzlehttp/uri-template              v0.2.0                           php-compos
 harfbuzz                             8.3.0-r0                         apk                           
 heck                                 0.4.1                            rust-crate                    
 hexogen/kdtree                       v0.2.5                           php-composer                  
-hiredis                              1.2.0-r0                         apk                           
 hwdata-pci                           0.377.2-r0                       apk                           
 icewind/searchdav                    v3.1.0                           php-composer                  
 icewind/smb                          v3.5.4                           php-composer                  
@@ -152,7 +152,7 @@ league/uri                           6.4.0                            php-compos
 league/uri-interfaces                2.2.0                            php-composer                  
 libSvtAv1Enc                         1.7.0-r0                         apk                           
 libacl                               2.3.1-r4                         apk                           
-libarchive                           3.7.2-r1                         apk                           
+libarchive                           3.7.4-r0                         apk                           
 libass                               0.17.1-r1                        apk                           
 libasyncns                           0.8-r2                           apk                           
 libattr                              2.5.1-r5                         apk                           
@@ -197,7 +197,7 @@ libpanelw                            6.4_p20231125-r0                 apk
 libpciaccess                         0.17-r2                          apk                           
 libplacebo                           6.338.1-r0                       apk                           
 libpng                               1.6.40-r0                        apk                           
-libpq                                16.2-r0                          apk                           
+libpq                                16.2-r1                          apk                           
 libproc2                             4.0.4-r0                         apk                           
 libpulse                             16.1-r11                         apk                           
 librist                              0.2.10-r0                        apk                           
@@ -265,7 +265,7 @@ new_debug_unreachable                1.0.4                            rust-crate
 nextcloud                            1.0.0                            npm                           
 nextcloud/lognormalizer              v1.0.0                           php-composer                  
 nghttp2-libs                         1.58.0-r0                        apk                           
-nginx                                1.24.0-r15                       apk                           
+nginx                                1.24.0-r16                       apk                           
 nom                                  7.1.3                            rust-crate                    
 noop_proc_macro                      0.3.0                            rust-crate                    
 notifications                        2.17.0                           npm