Bot Updating Templated Files

Jenkinsfile

@@ -78,6 +78,7 @@ pipeline {
            '''
         script{
           env.EXIT_STATUS = ''
+          env.CI_TEST_ATTEMPTED = ''
           env.LS_RELEASE = sh(
             script: '''docker run --rm quay.io/skopeo/stable:v1 inspect docker://ghcr.io/${LS_USER}/${CONTAINER_NAME}:latest 2>/dev/null | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
             returnStdout: true).trim()
@@ -293,7 +294,7 @@ pipeline {
                   -v ${WORKSPACE}:/mnt \
                   -e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \
                   -e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \
-                  ghcr.io/linuxserver/baseimage-alpine:3 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
+                  ghcr.io/linuxserver/baseimage-alpine:3.23 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
                     apk add --no-cache python3 && \
                     python3 -m venv /lsiopy && \
                     pip install --no-cache-dir -U pip && \
@@ -881,6 +882,7 @@ pipeline {
           script{
             env.CI_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/index.html'
             env.CI_JSON_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/report.json'
+            env.CI_TEST_ATTEMPTED = 'true'
           }
           sh '''#! /bin/bash
                 set -e
@@ -1083,98 +1085,13 @@ EOF
           ) '''
       }
     }
-    // If this is a Pull request send the CI link as a comment on it
-    stage('Pull Request Comment') {
-      when {
-        not {environment name: 'CHANGE_ID', value: ''}
-        environment name: 'EXIT_STATUS', value: ''
-      }
-      steps {
-        sh '''#! /bin/bash
-            # Function to retrieve JSON data from URL
-            get_json() {
-              local url="$1"
-              local response=$(curl -s "$url")
-              if [ $? -ne 0 ]; then
-                echo "Failed to retrieve JSON data from $url"
-                return 1
-              fi
-              local json=$(echo "$response" | jq .)
-              if [ $? -ne 0 ]; then
-                echo "Failed to parse JSON data from $url"
-                return 1
-              fi
-              echo "$json"
-            }
-
-            build_table() {
-              local data="$1"
-
-              # Get the keys in the JSON data
-              local keys=$(echo "$data" | jq -r 'to_entries | map(.key) | .[]')
-
-              # Check if keys are empty
-              if [ -z "$keys" ]; then
-                echo "JSON report data does not contain any keys or the report does not exist."
-                return 1
-              fi
-
-              # Build table header
-              local header="| Tag | Passed |\\n| --- | --- |\\n"
-
-              # Loop through the JSON data to build the table rows
-              local rows=""
-              for build in $keys; do
-                local status=$(echo "$data" | jq -r ".[\\"$build\\"].test_success")
-                if [ "$status" = "true" ]; then
-                  status="✅"
-                else
-                  status="❌"
-                fi
-                local row="| "$build" | "$status" |\\n"
-                rows="${rows}${row}"
-              done
-
-              local table="${header}${rows}"
-              local escaped_table=$(echo "$table" | sed 's/\"/\\\\"/g')
-              echo "$escaped_table"
-            }
-
-            if [[ "${CI}" = "true" ]]; then
-              # Retrieve JSON data from URL
-              data=$(get_json "$CI_JSON_URL")
-              # Create table from JSON data
-              table=$(build_table "$data")
-              echo -e "$table"
-
-              curl -X POST -H "Authorization: token $GITHUB_TOKEN" \
-                -H "Accept: application/vnd.github.v3+json" \
-                "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \
-                -d "{\\"body\\": \\"I am a bot, here are the test results for this PR: \\n${CI_URL}\\n${SHELLCHECK_URL}\\n${table}\\"}"
-            else
-              curl -X POST -H "Authorization: token $GITHUB_TOKEN" \
-                -H "Accept: application/vnd.github.v3+json" \
-                "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \
-                -d "{\\"body\\": \\"I am a bot, here is the pushed image/manifest for this PR: \\n\\n\\`${GITHUBIMAGE}:${META_TAG}\\`\\"}"
-            fi
-            '''
-
-      }
-    }
   }
   /* ######################
-     Send status to Discord
+     Comment on PR and Send status to Discord
      ###################### */
   post {
     always {
-      sh '''#!/bin/bash
+      script {
-            rm -rf /config/.ssh/id_sign
-            rm -rf /config/.ssh/id_sign.pub
-            git config --global --unset gpg.format
-            git config --global --unset user.signingkey
-            git config --global --unset commit.gpgsign
-        '''
-      script{
         env.JOB_DATE = sh(
             script: '''date '+%Y-%m-%dT%H:%M:%S%:z' ''',
             returnStdout: true).trim()
@@ -1217,6 +1134,87 @@ EOF
                  "username": "Jenkins"}' ${BUILDS_DISCORD} '''
         }
       }
+      script {
+        if (env.GITHUBIMAGE =~ /lspipepr/){
+          if (env.CI_TEST_ATTEMPTED == "true"){
+            sh '''#! /bin/bash
+                  # Function to retrieve JSON data from URL
+                  get_json() {
+                    local url="$1"
+                    local response=$(curl -s "$url")
+                    if [ $? -ne 0 ]; then
+                      echo "Failed to retrieve JSON data from $url"
+                      return 1
+                    fi
+                    local json=$(echo "$response" | jq .)
+                    if [ $? -ne 0 ]; then
+                      echo "Failed to parse JSON data from $url"
+                      return 1
+                    fi
+                    echo "$json"
+                  }
+
+                  build_table() {
+                    local data="$1"
+
+                    # Get the keys in the JSON data
+                    local keys=$(echo "$data" | jq -r 'to_entries | map(.key) | .[]')
+
+                    # Check if keys are empty
+                    if [ -z "$keys" ]; then
+                      echo "JSON report data does not contain any keys or the report does not exist."
+                      return 1
+                    fi
+
+                    # Build table header
+                    local header="| Tag | Passed |\\n| --- | --- |\\n"
+
+                    # Loop through the JSON data to build the table rows
+                    local rows=""
+                    for build in $keys; do
+                      local status=$(echo "$data" | jq -r ".[\\"$build\\"].test_success")
+                      if [ "$status" = "true" ]; then
+                        status="✅"
+                      else
+                        status="❌"
+                      fi
+                      local row="| "$build" | "$status" |\\n"
+                      rows="${rows}${row}"
+                    done
+
+                    local table="${header}${rows}"
+                    local escaped_table=$(echo "$table" | sed 's/\"/\\\\"/g')
+                    echo "$escaped_table"
+                  }
+
+                  if [[ "${CI}" = "true" ]]; then
+                    # Retrieve JSON data from URL
+                    data=$(get_json "$CI_JSON_URL")
+                    # Create table from JSON data
+                    table=$(build_table "$data")
+                    echo -e "$table"
+
+                    curl -X POST -H "Authorization: token $GITHUB_TOKEN" \
+                      -H "Accept: application/vnd.github.v3+json" \
+                      "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \
+                      -d "{\\"body\\": \\"I am a bot, here are the test results for this PR: \\n${CI_URL}\\n${SHELLCHECK_URL}\\n${table}\\"}"
+                  else
+                    curl -X POST -H "Authorization: token $GITHUB_TOKEN" \
+                      -H "Accept: application/vnd.github.v3+json" \
+                      "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \
+                      -d "{\\"body\\": \\"I am a bot, here is the pushed image/manifest for this PR: \\n\\n\\`${GITHUBIMAGE}:${META_TAG}\\`\\"}"
+                  fi
+                  '''
+          }
+        }
+      }
+      sh '''#!/bin/bash
+            rm -rf /config/.ssh/id_sign
+            rm -rf /config/.ssh/id_sign.pub
+            git config --global --unset gpg.format
+            git config --global --unset user.signingkey
+            git config --global --unset commit.gpgsign
+        '''
     }
     cleanup {
       sh '''#! /bin/bash

README.md

@@ -80,7 +80,7 @@ This image now supports password protection through htpasswd. Run the following
 To help you get started creating a container from this image you can either use docker-compose or the docker cli.
 
 >[!NOTE]
->Unless a parameter is flaged as 'optional', it is *mandatory* and a value must be provided.
+>Unless a parameter is flagged as 'optional', it is *mandatory* and a value must be provided.
 
 ### docker-compose (recommended, [click here for more info](https://docs.linuxserver.io/general/docker-compose))
 

package_versions.txt

@@ -4,7 +4,7 @@ acl-libs                            2.3.2-r1          apk
 alpine-baselayout                   3.7.0-r0          apk             
 alpine-baselayout-data              3.7.0-r0          apk             
 alpine-keys                         2.5-r0            apk             
-alpine-release                      3.22.2-r0         apk             
+alpine-release                      3.22.3-r0         apk             
 apache2-utils                       2.4.66-r0         apk             
 apk-tools                           2.14.9-r3         apk             
 apr                                 1.7.5-r0          apk             
@@ -25,7 +25,7 @@ ca-certificates-bundle              20250911-r0       apk
 carbonphp/carbon-doctrine-types     3.2.0             php-composer    
 catatonit                           0.2.1-r0          apk             
 clue/stream-filter                  v1.7.0            php-composer    
-composer                            2.9.3             binary          
+composer                            2.9.5             binary          
 composer/class-map-generator        1.6.1             php-composer    
 composer/pcre                       3.3.2             php-composer    
 coreutils                           9.7-r1            apk             
@@ -76,19 +76,19 @@ libapk2                             2.14.9-r3         apk
 libattr                             2.5.2-r2          apk             
 libbsd                              0.12.2-r0         apk             
 libbz2                              1.0.8-r6          apk             
-libcrypto3                          3.5.4-r0          apk             
+libcrypto3                          3.5.5-r0          apk             
 libcurl                             8.14.1-r2         apk             
 libedit                             20250104.3.1-r1   apk             
-libexpat                            2.7.3-r0          apk             
+libexpat                            2.7.5-r0          apk             
 libgcc                              14.2.0-r6         apk             
 libidn2                             2.3.7-r0          apk             
 libintl                             0.24.1-r0         apk             
 libmd                               1.1.0-r0          apk             
 libncursesw                         6.5_p20250503-r0  apk             
-libpq                               17.7-r0           apk             
+libpq                               17.9-r0           apk             
 libproc2                            4.0.4-r3          apk             
 libpsl                              0.21.5-r3         apk             
-libssl3                             3.5.4-r0          apk             
+libssl3                             3.5.5-r0          apk             
 libstdc++                           14.2.0-r6         apk             
 libunistring                        1.3-r0            apk             
 libuuid                             2.41-r9           apk             
@@ -109,12 +109,12 @@ netcat-openbsd                      1.229.1-r0        apk
 nette/schema                        v1.3.2            php-composer    
 nette/utils                         v4.0.7            php-composer    
 nghttp2-libs                        1.65.0-r0         apk             
-nginx                               1.28.0-r3         apk             
+nginx                               1.28.3-r0         apk             
 nikic/php-parser                    v5.5.0            php-composer    
 nunomaduro/collision                v8.5.0            php-composer    
 nunomaduro/termwind                 v2.3.1            php-composer    
 oniguruma                           6.9.10-r0         apk             
-openssl                             3.5.4-r0          apk             
+openssl                             3.5.5-r0          apk             
 pcre2                               10.46-r0          apk             
 phar-io/manifest                    2.0.4             php-composer    
 phar-io/version                     3.2.1             php-composer    
@@ -235,7 +235,7 @@ symfony/var-exporter                v7.3.0            php-composer
 symfony/yaml                        v7.3.1            php-composer    
 theseer/tokenizer                   1.2.3             php-composer    
 tijsverkoyen/css-to-inline-styles   v2.3.0            php-composer    
-tzdata                              2025c-r0          apk             
+tzdata                              2026a-r0          apk             
 utmps-libs                          0.1.3.1-r0        apk             
 vlucas/phpdotenv                    v5.6.2            php-composer    
 voku/portable-ascii                 2.0.3             php-composer