Bot Updating Package Versions

2025-09-30 23:29:57 +00:00 · 2025-09-23 23:30:59 +00:00 · 2025-08-19 23:32:39 +00:00 · 2025-07-29 23:36:36 +00:00 · 2025-07-22 23:35:57 +00:00 · 2025-07-15 23:35:00 +00:00
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@ -6,7 +6,7 @@
 * Read, and fill the Pull Request template
  * If this is a fix for a typo (in code, documentation, or the README) please file an issue and let us sort it out. We do not need a PR
  * If the PR is addressing an existing issue include, closes #\<issue number>, in the body of the PR commit message
-* If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://discord.gg/YWrKVTn)
+* If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://linuxserver.io/discord)

 ## Common files

@ -105,10 +105,10 @@ docker build \
  -t linuxserver/baseimage-ubuntu:latest .
 ```

-The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
+The ARM variants can be built on x86_64 hardware and vice versa using `lscr.io/linuxserver/qemu-static`

 ```bash
-docker run --rm --privileged multiarch/qemu-user-static:register --reset
+docker run --rm --privileged lscr.io/linuxserver/qemu-static --reset
 ```

 Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`.
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@ -1,7 +1,7 @@
 blank_issues_enabled: false
 contact_links:
  - name: Discord chat support
-    url: https://discord.gg/YWrKVTn
+    url: https://linuxserver.io/discord
    about: Realtime support / chat with the community and the team.

  - name: Discourse discussion forum
--- a/.github/workflows/call_issue_pr_tracker.yml
+++ b/.github/workflows/call_issue_pr_tracker.yml
@ -8,6 +8,9 @@ on:
  pull_request_review:
    types: [submitted,edited,dismissed]

+permissions:
+  contents: read
+
 jobs:
  manage-project:
    permissions:
--- a/.github/workflows/call_issues_cron.yml
+++ b/.github/workflows/call_issues_cron.yml
@ -4,6 +4,9 @@ on:
    - cron:  '13 7 * * *'
  workflow_dispatch:

+permissions:
+  contents: read
+
 jobs:
  stale:
    permissions:
--- a/.github/workflows/external_trigger.yml
+++ b/.github/workflows/external_trigger.yml
@ -3,6 +3,9 @@ name: External Trigger Main
 on:
  workflow_dispatch:

+permissions:
+  contents: read
+
 jobs:
  external-trigger-jammy:
    runs-on: ubuntu-latest
@ -11,7 +14,15 @@ jobs:

      - name: External Trigger
        if: github.ref == 'refs/heads/jammy'
+        env:
+          SKIP_EXTERNAL_TRIGGER: ${{ vars.SKIP_EXTERNAL_TRIGGER }}
        run: |
-          echo "**** No external release, exiting ****"
+          printf "# External trigger for docker-baseimage-ubuntu\n\n" >> $GITHUB_STEP_SUMMARY
+          echo "Type is \`os\`" >> $GITHUB_STEP_SUMMARY
          echo "No external release, exiting" >> $GITHUB_STEP_SUMMARY
          exit 0
+          if grep -q "^baseimage-ubuntu_jammy_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
+            echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+            echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` matches current external release; skipping trigger." >> $GITHUB_STEP_SUMMARY
+            exit 0
+          fi
--- a/.github/workflows/external_trigger_scheduler.yml
+++ b/.github/workflows/external_trigger_scheduler.yml
@ -5,6 +5,9 @@ on:
    - cron:  '18 * * * *'
  workflow_dispatch:

+permissions:
+  contents: read
+
 jobs:
  external-trigger-scheduler:
    runs-on: ubuntu-latest
@ -15,31 +18,31 @@ jobs:

      - name: External Trigger Scheduler
        run: |
-          echo "**** Branches found: ****"
-          git for-each-ref --format='%(refname:short)' refs/remotes
-          for br in $(git for-each-ref --format='%(refname:short)' refs/remotes)
+          printf "# External trigger scheduler for docker-baseimage-ubuntu\n\n" >> $GITHUB_STEP_SUMMARY
+          printf "Found the branches:\n\n%s\n" "$(git for-each-ref --format='- %(refname:lstrip=3)' refs/remotes)" >> $GITHUB_STEP_SUMMARY
+          for br in $(git for-each-ref --format='%(refname:lstrip=3)' refs/remotes)
          do
-            br=$(echo "$br" | sed 's|origin/||g')
-            echo "**** Evaluating branch ${br} ****"
+            if [[ "${br}" == "HEAD" ]]; then
+              printf "\nSkipping %s.\n" ${br} >> $GITHUB_STEP_SUMMARY
+              continue
+            fi
+            printf "\n## Evaluating \`%s\`\n\n" ${br} >> $GITHUB_STEP_SUMMARY
            ls_jenkins_vars=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-baseimage-ubuntu/${br}/jenkins-vars.yml)
            ls_branch=$(echo "${ls_jenkins_vars}" | yq -r '.ls_branch')
            ls_trigger=$(echo "${ls_jenkins_vars}" | yq -r '.external_type')
            if [[ "${br}" == "${ls_branch}" ]] && [[ "${ls_trigger}" != "os" ]]; then
-              echo "**** Branch ${br} appears to be live and trigger is not os; checking workflow. ****"
+              echo "Branch appears to be live and trigger is not os; checking workflow." >> $GITHUB_STEP_SUMMARY
              if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-baseimage-ubuntu/${br}/.github/workflows/external_trigger.yml > /dev/null 2>&1; then
-                echo "**** Workflow exists. Triggering external trigger workflow for branch ${br} ****."
-                echo "Triggering external trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY
+                echo "Triggering external trigger workflow for branch." >> $GITHUB_STEP_SUMMARY
                curl -iX POST \
                  -H "Authorization: token ${{ secrets.CR_PAT }}" \
                  -H "Accept: application/vnd.github.v3+json" \
                  -d "{\"ref\":\"refs/heads/${br}\"}" \
                  https://api.github.com/repos/linuxserver/docker-baseimage-ubuntu/actions/workflows/external_trigger.yml/dispatches
              else
-                echo "**** Workflow doesn't exist; skipping trigger. ****"
-                echo "Skipping branch ${br} due to no external trigger workflow present." >> $GITHUB_STEP_SUMMARY
+                echo "Skipping branch due to no external trigger workflow present." >> $GITHUB_STEP_SUMMARY
              fi
            else
-              echo "**** ${br} is either a dev branch, or has no external version; skipping trigger. ****"
-              echo "Skipping branch ${br} due to being detected as dev branch or having no external version." >> $GITHUB_STEP_SUMMARY
+              echo "Skipping branch due to being detected as dev branch or having no external version." >> $GITHUB_STEP_SUMMARY
            fi
          done
--- a/.github/workflows/greetings.yml
+++ b/.github/workflows/greetings.yml
@ -2,8 +2,14 @@ name: Greetings

 on: [pull_request_target, issues]

+permissions:
+  contents: read
+
 jobs:
  greeting:
+    permissions:
+      issues: write
+      pull-requests: write
    runs-on: ubuntu-latest
    steps:
    - uses: actions/first-interaction@v1
--- a/.github/workflows/package_trigger.yml
+++ b/.github/workflows/package_trigger.yml
@ -1,42 +0,0 @@
-name: Package Trigger Main
-
-on:
-  workflow_dispatch:
-
-jobs:
-  package-trigger-jammy:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4.1.1
-
-      - name: Package Trigger
-        if: github.ref == 'refs/heads/jammy'
-        run: |
-          if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_BASEIMAGE_UBUNTU_JAMMY }}" ]; then
-            echo "**** Github secret PAUSE_PACKAGE_TRIGGER_BASEIMAGE_UBUNTU_JAMMY is set; skipping trigger. ****"
-            echo "Github secret \`PAUSE_PACKAGE_TRIGGER_BASEIMAGE_UBUNTU_JAMMY\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
-            exit 0
-          fi
-          if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-baseimage-ubuntu/job/jammy/lastBuild/api/json | jq -r '.building') == "true" ]; then
-            echo "**** There already seems to be an active build on Jenkins; skipping package trigger ****"
-            echo "There already seems to be an active build on Jenkins; skipping package trigger" >> $GITHUB_STEP_SUMMARY
-            exit 0
-          fi
-          echo "**** Package trigger running off of jammy branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_BASEIMAGE_UBUNTU_JAMMY\". ****"
-          echo "Package trigger running off of jammy branch. To disable, set a Github secret named \`PAUSE_PACKAGE_TRIGGER_BASEIMAGE_UBUNTU_JAMMY\`" >> $GITHUB_STEP_SUMMARY
-          response=$(curl -iX POST \
-            https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-baseimage-ubuntu/job/jammy/buildWithParameters?PACKAGE_CHECK=true \
-            --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
-          echo "**** Jenkins job queue url: ${response%$'\r'} ****"
-          echo "**** Sleeping 10 seconds until job starts ****"
-          sleep 10
-          buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
-          buildurl="${buildurl%$'\r'}"
-          echo "**** Jenkins job build url: ${buildurl} ****"
-          echo "Jenkins job build url: ${buildurl}" >> $GITHUB_STEP_SUMMARY
-          echo "**** Attempting to change the Jenkins job description ****"
-          curl -iX POST \
-            "${buildurl}submitDescription" \
-            --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \
-            --data-urlencode "description=GHA package trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
-            --data-urlencode "Submit=Submit"
--- a/.github/workflows/package_trigger_scheduler.yml
+++ b/.github/workflows/package_trigger_scheduler.yml
@ -5,6 +5,9 @@ on:
    - cron:  '19 23 * * 2'
  workflow_dispatch:

+permissions:
+  contents: read
+
 jobs:
  package-trigger-scheduler:
    runs-on: ubuntu-latest
@ -14,37 +17,87 @@ jobs:
          fetch-depth: '0'

      - name: Package Trigger Scheduler
+        env:
+          SKIP_PACKAGE_TRIGGER: ${{ vars.SKIP_PACKAGE_TRIGGER }}
        run: |
-          echo "**** Branches found: ****"
-          git for-each-ref --format='%(refname:short)' refs/remotes
-          for br in $(git for-each-ref --format='%(refname:short)' refs/remotes)
+          printf "# Package trigger scheduler for docker-baseimage-ubuntu\n\n" >> $GITHUB_STEP_SUMMARY
+          printf "Found the branches:\n\n%s\n" "$(git for-each-ref --format='- %(refname:lstrip=3)' refs/remotes)" >> $GITHUB_STEP_SUMMARY
+          for br in $(git for-each-ref --format='%(refname:lstrip=3)' refs/remotes)
          do
-            br=$(echo "$br" | sed 's|origin/||g')
-            echo "**** Evaluating branch ${br} ****"
-            ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-baseimage-ubuntu/${br}/jenkins-vars.yml | yq -r '.ls_branch')
-            if [ "${br}" == "${ls_branch}" ]; then
-              echo "**** Branch ${br} appears to be live; checking workflow. ****"
-              if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-baseimage-ubuntu/${br}/.github/workflows/package_trigger.yml > /dev/null 2>&1; then
-                echo "**** Workflow exists. Triggering package trigger workflow for branch ${br}. ****"
-                echo "Triggering package trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY
-                triggered_branches="${triggered_branches}${br} "
-                curl -iX POST \
-                  -H "Authorization: token ${{ secrets.CR_PAT }}" \
-                  -H "Accept: application/vnd.github.v3+json" \
-                  -d "{\"ref\":\"refs/heads/${br}\"}" \
-                  https://api.github.com/repos/linuxserver/docker-baseimage-ubuntu/actions/workflows/package_trigger.yml/dispatches
-                sleep 30
+            if [[ "${br}" == "HEAD" ]]; then
+              printf "\nSkipping %s.\n" ${br} >> $GITHUB_STEP_SUMMARY
+              continue
+            fi
+            printf "\n## Evaluating \`%s\`\n\n" ${br} >> $GITHUB_STEP_SUMMARY
+            JENKINS_VARS=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-baseimage-ubuntu/${br}/jenkins-vars.yml)
+            if ! curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-baseimage-ubuntu/${br}/Jenkinsfile >/dev/null 2>&1; then
+              echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+              echo "> No Jenkinsfile found. Branch is either deprecated or is an early dev branch." >> $GITHUB_STEP_SUMMARY
+              skipped_branches="${skipped_branches}${br} "
+            elif [[ "${br}" == $(yq -r '.ls_branch' <<< "${JENKINS_VARS}") ]]; then
+              echo "Branch appears to be live; checking workflow." >> $GITHUB_STEP_SUMMARY
+              README_VARS=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-baseimage-ubuntu/${br}/readme-vars.yml)
+              if [[ $(yq -r '.project_deprecation_status' <<< "${README_VARS}") == "true" ]]; then
+                echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+                echo "> Branch appears to be deprecated; skipping trigger." >> $GITHUB_STEP_SUMMARY
+                skipped_branches="${skipped_branches}${br} "
+              elif [[ $(yq -r '.skip_package_check' <<< "${JENKINS_VARS}") == "true" ]]; then
+                echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+                echo "> Skipping branch ${br} due to \`skip_package_check\` being set in \`jenkins-vars.yml\`." >> $GITHUB_STEP_SUMMARY
+                skipped_branches="${skipped_branches}${br} "
+              elif grep -q "^baseimage-ubuntu_${br}" <<< "${SKIP_PACKAGE_TRIGGER}"; then
+                echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+                echo "> Github organizational variable \`SKIP_PACKAGE_TRIGGER\` contains \`baseimage-ubuntu_${br}\`; skipping trigger." >> $GITHUB_STEP_SUMMARY
+                skipped_branches="${skipped_branches}${br} "
+              elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-baseimage-ubuntu/job/${br}/lastBuild/api/json | jq -r '.building' 2>/dev/null) == "true" ]; then
+                echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+                echo "> There already seems to be an active build on Jenkins; skipping package trigger for ${br}" >> $GITHUB_STEP_SUMMARY
+                skipped_branches="${skipped_branches}${br} "
              else
-                echo "**** Workflow doesn't exist; skipping trigger. ****"
-                echo "Skipping branch ${br} due to no package trigger workflow present." >> $GITHUB_STEP_SUMMARY
+                echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
+                echo "> Triggering package trigger for branch ${br}" >> $GITHUB_STEP_SUMMARY
+                printf "> To disable, add \`baseimage-ubuntu_%s\` into the Github organizational variable \`SKIP_PACKAGE_TRIGGER\`.\n\n" "${br}" >> $GITHUB_STEP_SUMMARY
+                triggered_branches="${triggered_branches}${br} "
+                response=$(curl -iX POST \
+                  https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-baseimage-ubuntu/job/${br}/buildWithParameters?PACKAGE_CHECK=true \
+                  --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
+                if [[ -z "${response}" ]]; then
+                  echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+                  echo "> Jenkins build could not be triggered. Skipping branch."
+                  continue
+                fi
+                echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY
+                echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY
+                sleep 10
+                buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
+                buildurl="${buildurl%$'\r'}"
+                echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY
+                echo "Attempting to change the Jenkins job description" >> $GITHUB_STEP_SUMMARY
+                if ! curl -ifX POST \
+                  "${buildurl}submitDescription" \
+                  --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \
+                  --data-urlencode "description=GHA package trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
+                  --data-urlencode "Submit=Submit"; then
+                  echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+                  echo "> Unable to change the Jenkins job description."
+                fi
+                sleep 20
              fi
            else
-              echo "**** ${br} appears to be a dev branch; skipping trigger. ****"
              echo "Skipping branch ${br} due to being detected as dev branch." >> $GITHUB_STEP_SUMMARY
            fi
          done
-          echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****"
-          echo "**** Notifying Discord ****"
-          curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
-            "description": "**Package Check Build(s) Triggered for baseimage-ubuntu** \n**Branch(es):** '"${triggered_branches}"' \n**Build URL:** '"https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-baseimage-ubuntu/activity/"' \n"}],
-            "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
+          if [[ -n "${triggered_branches}" ]] || [[ -n "${skipped_branches}" ]]; then
+            if [[ -n "${triggered_branches}" ]]; then
+              NOTIFY_BRANCHES="**Triggered:** ${triggered_branches} \n"
+              NOTIFY_BUILD_URL="**Build URL:** https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-baseimage-ubuntu/activity/ \n"
+              echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****"
+            fi
+            if [[ -n "${skipped_branches}" ]]; then
+              NOTIFY_BRANCHES="${NOTIFY_BRANCHES}**Skipped:** ${skipped_branches} \n"
+            fi
+            echo "**** Notifying Discord ****"
+            curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
+              "description": "**Package Check Build(s) for baseimage-ubuntu** \n'"${NOTIFY_BRANCHES}"''"${NOTIFY_BUILD_URL}"'"}],
+              "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
+          fi
--- a/.github/workflows/permissions.yml
+++ b/.github/workflows/permissions.yml
@ -5,6 +5,8 @@ on:
      - '**/run'
      - '**/finish'
      - '**/check'
+      - 'root/migrations/*'
+
 jobs:
  permission_check:
    uses: linuxserver/github-workflows/.github/workflows/init-svc-executable-permissions.yml@v1
--- a/8
+++ b/8
@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1

-FROM alpine:3.17 as rootfs-stage
+FROM alpine:3 as rootfs-stage

 # environment
 ENV REL=jammy
@ -27,7 +27,7 @@ RUN \
    /root-out/var/log/*

 # set version for s6 overlay
-ARG S6_OVERLAY_VERSION="3.1.5.0"
+ARG S6_OVERLAY_VERSION="3.1.6.2"
 ARG S6_OVERLAY_ARCH="x86_64"

 # add s6 overlay
@ -49,11 +49,13 @@ ARG BUILD_DATE
 ARG VERSION
 ARG MODS_VERSION="v3"
 ARG PKG_INST_VERSION="v1"
+ARG LSIOWN_VERSION="v1"
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="TheLamer"

 ADD --chmod=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/docker-mods.${MODS_VERSION}" "/docker-mods"
 ADD --chmod=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/package-install.${PKG_INST_VERSION}" "/etc/s6-overlay/s6-rc.d/init-mods-package-install/run"
+ADD --chmod=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/lsiown.${LSIOWN_VERSION}" "/usr/bin/lsiown"

 # set environment variables
 ARG DEBIAN_FRONTEND="noninteractive"
@ -105,11 +107,13 @@ RUN \
    > /run/systemd/container && \
  echo "**** install apt-utils and locales ****" && \
  apt-get update && \
+  apt-get upgrade -y && \
  apt-get install -y \
    apt-utils \
    locales && \
  echo "**** install packages ****" && \
  apt-get install -y \
+    catatonit \
    cron \
    curl \
    gnupg \
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1

-FROM alpine:3.17 as rootfs-stage
+FROM alpine:3 as rootfs-stage

 # environment
 ENV REL=jammy
@ -27,7 +27,7 @@ RUN \
    /root-out/var/log/*

 # set version for s6 overlay
-ARG S6_OVERLAY_VERSION="3.1.5.0"
+ARG S6_OVERLAY_VERSION="3.1.6.2"
 ARG S6_OVERLAY_ARCH="aarch64"

 # add s6 overlay
@ -49,11 +49,13 @@ ARG BUILD_DATE
 ARG VERSION
 ARG MODS_VERSION="v3"
 ARG PKG_INST_VERSION="v1"
+ARG LSIOWN_VERSION="v1"
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="TheLamer"

 ADD --chmod=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/docker-mods.${MODS_VERSION}" "/docker-mods"
 ADD --chmod=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/package-install.${PKG_INST_VERSION}" "/etc/s6-overlay/s6-rc.d/init-mods-package-install/run"
+ADD --chmod=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/lsiown.${LSIOWN_VERSION}" "/usr/bin/lsiown"

 # set environment variables
 ARG DEBIAN_FRONTEND="noninteractive"
@ -105,11 +107,13 @@ RUN \
    > /run/systemd/container && \
  echo "**** install apt-utils and locales ****" && \
  apt-get update && \
+  apt-get upgrade -y && \
  apt-get install -y \
    apt-utils \
    locales && \
  echo "**** install packages ****" && \
  apt-get install -y \
+    catatonit \
    cron \
    curl \
    gnupg \
--- a/494
+++ b/494
@ -8,7 +8,7 @@ pipeline {
  }
  // Input to determine if this is a package check
  parameters {
-     string(defaultValue: 'false', description: 'package check run', name: 'PACKAGE_CHECK')
+    string(defaultValue: 'false', description: 'package check run', name: 'PACKAGE_CHECK')
  }
  // Configuration for the variables used for this specific repo
  environment {
@ -17,6 +17,8 @@ pipeline {
    GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0')
    GITLAB_NAMESPACE=credentials('gitlab-namespace-id')
    DOCKERHUB_TOKEN=credentials('docker-hub-ci-pat')
+    QUAYIO_API_TOKEN=credentials('quayio-repo-api-token')
+    GIT_SIGNING_KEY=credentials('484fbca6-9a4f-455e-b9e3-97ac98785f5f')
    BUILD_VERSION_ARG = 'OS'
    LS_USER = 'linuxserver'
    LS_REPO = 'docker-baseimage-ubuntu'
@ -31,20 +33,46 @@ pipeline {
    CI_PORT='80'
    CI_SSL='true'
    CI_DELAY='30'
-    CI_DOCKERENV='TZ=US/Pacific|LSIO_FIRST_PARTY=true'
-    CI_AUTH='user:password'
+    CI_DOCKERENV='LSIO_FIRST_PARTY=true'
+    CI_AUTH=''
    CI_WEBPATH=''
  }
  stages {
+    stage("Set git config"){
+      steps{
+        sh '''#!/bin/bash
+              cat ${GIT_SIGNING_KEY} > /config/.ssh/id_sign
+              chmod 600 /config/.ssh/id_sign
+              ssh-keygen -y -f /config/.ssh/id_sign > /config/.ssh/id_sign.pub
+              echo "Using $(ssh-keygen -lf /config/.ssh/id_sign) to sign commits"
+              git config --global gpg.format ssh
+              git config --global user.signingkey /config/.ssh/id_sign
+              git config --global commit.gpgsign true
+        '''
+      }
+    }
    // Setup all the basic environment variables needed for the build
    stage("Set ENV Variables base"){
      steps{
+        echo "Running on node: ${NODE_NAME}"
        sh '''#! /bin/bash
-              containers=$(docker ps -aq)
+              echo "Pruning builder"
+              docker builder prune -f --builder container || :
+              containers=$(docker ps -q)
              if [[ -n "${containers}" ]]; then
-                docker stop ${containers}
+                BUILDX_CONTAINER_ID=$(docker ps -qf 'name=buildx_buildkit')
+                for container in ${containers}; do
+                  if [[ "${container}" == "${BUILDX_CONTAINER_ID}" ]]; then
+                    echo "skipping buildx container in docker stop"
+                  else
+                    echo "Stopping container ${container}"
+                    docker stop ${container}
+                  fi
+                done
              fi
-              docker system prune -af --volumes || : '''
+              docker system prune -f --volumes || :
+              docker image prune -af || :
+           '''
        script{
          env.EXIT_STATUS = ''
          env.LS_RELEASE = sh(
@ -65,8 +93,12 @@ pipeline {
          env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT
          env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/'
          env.PULL_REQUEST = env.CHANGE_ID
-          env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/call_issue_pr_tracker.yml ./.github/workflows/call_issues_cron.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml'
+          env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/call_issue_pr_tracker.yml ./.github/workflows/call_issues_cron.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml'
+          if ( env.SYFT_IMAGE_TAG == null ) {
+            env.SYFT_IMAGE_TAG = 'latest'
+          }
        }
+        echo "Using syft image tag ${SYFT_IMAGE_TAG}"
        sh '''#! /bin/bash
              echo "The default github branch detected as ${GH_DEFAULT_BRANCH}" '''
        script{
@ -173,6 +205,7 @@ pipeline {
          env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
          env.META_TAG = 'jammy-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
          env.EXT_RELEASE_TAG = 'jammy-version-' + env.EXT_RELEASE_CLEAN
+          env.BUILDCACHE = 'docker.io/lsiodev/buildcache,registry.gitlab.com/linuxserver.io/docker-jenkins-builder/lsiodev-buildcache,ghcr.io/linuxserver/lsiodev-buildcache,quay.io/linuxserver.io/lsiodev-buildcache'
        }
      }
    }
@ -197,6 +230,7 @@ pipeline {
          env.META_TAG = 'jammy-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
          env.EXT_RELEASE_TAG = 'jammy-version-' + env.EXT_RELEASE_CLEAN
          env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/'
+          env.BUILDCACHE = 'docker.io/lsiodev/buildcache,registry.gitlab.com/linuxserver.io/docker-jenkins-builder/lsiodev-buildcache,ghcr.io/linuxserver/lsiodev-buildcache,quay.io/linuxserver.io/lsiodev-buildcache'
        }
      }
    }
@ -221,6 +255,7 @@ pipeline {
          env.EXT_RELEASE_TAG = 'jammy-version-' + env.EXT_RELEASE_CLEAN
          env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST
          env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/'
+          env.BUILDCACHE = 'docker.io/lsiodev/buildcache,registry.gitlab.com/linuxserver.io/docker-jenkins-builder/lsiodev-buildcache,ghcr.io/linuxserver/lsiodev-buildcache,quay.io/linuxserver.io/lsiodev-buildcache'
        }
      }
    }
@ -243,7 +278,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.19 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
+                  ghcr.io/linuxserver/baseimage-alpine:3.20 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 && \
@ -266,8 +301,15 @@ pipeline {
              set -e
              TEMPDIR=$(mktemp -d)
              docker pull ghcr.io/linuxserver/jenkins-builder:latest
-              docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=jammy -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest 
-              # Stage 1 - Jenkinsfile update
+              # Cloned repo paths for templating:
+              # ${TEMPDIR}/docker-${CONTAINER_NAME}: Cloned branch jammy of ${LS_USER}/${LS_REPO} for running the jenkins builder on
+              # ${TEMPDIR}/repo/${LS_REPO}: Cloned branch jammy of ${LS_USER}/${LS_REPO} for commiting various templated file changes and pushing back to Github
+              # ${TEMPDIR}/docs/docker-documentation: Cloned docs repo for pushing docs updates to Github
+              # ${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 jammy --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 -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
                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
@ -279,14 +321,14 @@ pipeline {
                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git jammy
                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git jammy
                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
-                echo "Updating Jenkinsfile"
+                echo "Updating Jenkinsfile and exiting build, new one will trigger based on commit"
                rm -Rf ${TEMPDIR}
                exit 0
              else
                echo "Jenkinsfile is up to date."
              fi
-              # Stage 2 - Delete old templates
-              OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml Dockerfile.armhf"
+              echo "Starting Stage 2 - Delete old templates"
+              OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml .github/workflows/package_trigger.yml"
              for i in ${OLD_TEMPLATES}; do
                if [[ -f "${i}" ]]; then
                  TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
@ -304,13 +346,13 @@ pipeline {
                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git jammy
                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git jammy
                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
-                echo "Deleting old and deprecated templates"
+                echo "Deleting old/deprecated templates and exiting build, new one will trigger based on commit"
                rm -Rf ${TEMPDIR}
                exit 0
              else
                echo "No templates to delete"
              fi
-              # Stage 3 - Update templates
+              echo "Starting Stage 3 - Update templates"
              CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
              cd ${TEMPDIR}/docker-${CONTAINER_NAME}
              NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
@ -334,16 +376,22 @@ pipeline {
                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git jammy
                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git jammy
                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
+                echo "Updating templates and exiting build, new one will trigger based on commit"
+                rm -Rf ${TEMPDIR}
+                exit 0
              else
                echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
+                echo "No templates to update"
              fi
+              echo "Starting Stage 4 - External repo updates: Docs, Unraid Template and Readme Sync to Docker Hub"
              mkdir -p ${TEMPDIR}/docs
-              git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation
+              git clone --depth=1 https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation
              if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}"  ]] && [[ (! -f ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then
                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/docs/docker-documentation/docs/images/
                cd ${TEMPDIR}/docs/docker-documentation
                GH_DOCS_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||')
                git add docs/images/docker-${CONTAINER_NAME}.md
+                echo "Updating docs repo"
                git commit -m 'Bot Updating Documentation'
                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} --rebase
                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} || \
@ -351,16 +399,27 @@ pipeline {
                  sleep $((RANDOM % MAXWAIT)) && \
                  git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} --rebase && \
                  git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH})
+              else
+                echo "Docs update not needed, skipping"
              fi
-              # Stage 4 - Sync Readme to Docker Hub
              if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]]; then
-                if [[ $(cat ${TEMPDIR}/docker-${CONTAINER_NAME}/README.md | wc -m) > 25000 ]]; then
+                if [[ $(cat ${TEMPDIR}/docker-${CONTAINER_NAME}/README.md | wc -m) -gt 25000 ]]; then
                  echo "Readme is longer than 25,000 characters. Syncing the lite version to Docker Hub"
                  DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/README.lite"
                else
                  echo "Syncing readme to Docker Hub"
                  DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/README.md"
                fi
+                if curl -s https://hub.docker.com/v2/namespaces/${DOCKERHUB_IMAGE%%/*}/repositories/${DOCKERHUB_IMAGE##*/}/tags | jq -r '.message' | grep -q 404; then
+                  echo "Docker Hub endpoint doesn't exist. Creating endpoint first."
+                  DH_TOKEN=$(curl -d '{"username":"linuxserverci", "password":"'${DOCKERHUB_TOKEN}'"}' -H "Content-Type: application/json" -X POST https://hub.docker.com/v2/users/login | jq -r '.token')
+                  curl -s \
+                    -H "Authorization: JWT ${DH_TOKEN}" \
+                    -H "Content-Type: application/json" \
+                    -X POST \
+                    -d '{"name":"'${DOCKERHUB_IMAGE##*/}'", "namespace":"'${DOCKERHUB_IMAGE%%/*}'"}' \
+                    https://hub.docker.com/v2/repositories/ || :
+                fi
                DH_TOKEN=$(curl -d '{"username":"linuxserverci", "password":"'${DOCKERHUB_TOKEN}'"}' -H "Content-Type: application/json" -X POST https://hub.docker.com/v2/users/login | jq -r '.token')
                curl -s \
                  -H "Authorization: JWT ${DH_TOKEN}" \
@ -416,23 +475,27 @@ pipeline {
      }
    }
    /* #######################
-           GitLab Mirroring
+       GitLab Mirroring and Quay.io Repo Visibility
       ####################### */
-    // Ping into Gitlab to mirror this repo and have a registry endpoint
-    stage("GitLab Mirror"){
+    // Ping into Gitlab to mirror this repo and have a registry endpoint & mark this repo on Quay.io as public
+    stage("GitLab Mirror and Quay.io Visibility"){
      when {
        environment name: 'EXIT_STATUS', value: ''
      }
      steps{
        sh '''curl -H "Content-Type: application/json" -H "Private-Token: ${GITLAB_TOKEN}" -X POST https://gitlab.com/api/v4/projects \
-        -d '{"namespace_id":'${GITLAB_NAMESPACE}',\
-             "name":"'${LS_REPO}'",
-             "mirror":true,\
-             "import_url":"https://github.com/linuxserver/'${LS_REPO}'.git",\
-             "issues_access_level":"disabled",\
-             "merge_requests_access_level":"disabled",\
-             "repository_access_level":"enabled",\
-             "visibility":"public"}' '''
+          -d '{"namespace_id":'${GITLAB_NAMESPACE}',\
+            "name":"'${LS_REPO}'",
+            "mirror":true,\
+            "import_url":"https://github.com/linuxserver/'${LS_REPO}'.git",\
+            "issues_access_level":"disabled",\
+            "merge_requests_access_level":"disabled",\
+            "repository_access_level":"enabled",\
+            "visibility":"public"}' '''
+        sh '''curl -H "Private-Token: ${GITLAB_TOKEN}" -X PUT "https://gitlab.com/api/v4/projects/Linuxserver.io%2F${LS_REPO}" \
+          -d "mirror=true&import_url=https://github.com/linuxserver/${LS_REPO}.git" '''
+        sh '''curl -H "Content-Type: application/json" -H "Authorization: Bearer ${QUAYIO_API_TOKEN}" -X POST "https://quay.io/api/v1/repository${QUAYIMAGE/quay.io/}/changevisibility" \
+          -d '{"visibility":"public"}' ||: '''
      } 
    }
    /* ###############
@ -462,7 +525,42 @@ pipeline {
          --label \"org.opencontainers.image.title=Baseimage-ubuntu\" \
          --label \"org.opencontainers.image.description=baseimage-ubuntu image by linuxserver.io\" \
          --no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \
+          --provenance=true --sbom=true --builder=container --load \
          --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
+        sh '''#! /bin/bash
+              set -e
+              IFS=',' read -ra CACHE <<< "$BUILDCACHE"
+              for i in "${CACHE[@]}"; do
+                docker tag ${IMAGE}:${META_TAG} ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
+              done
+           '''
+        withCredentials([
+          [
+            $class: 'UsernamePasswordMultiBinding',
+            credentialsId: 'Quay.io-Robot',
+            usernameVariable: 'QUAYUSER',
+            passwordVariable: 'QUAYPASS'
+          ]
+        ]) {
+          retry_backoff(5,5) {
+              sh '''#! /bin/bash
+                    set -e
+                    echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin
+                    echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
+                    echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
+                    echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
+                    if [[ "${PACKAGE_CHECK}" != "true" ]]; then
+                      IFS=',' read -ra CACHE <<< "$BUILDCACHE"
+                      for i in "${CACHE[@]}"; do
+                        docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} &
+                      done
+                      for p in $(jobs -p); do
+                        wait "$p" || { echo "job $p failed" >&2; exit 1; }
+                      done
+                    fi
+                '''
+          }
+        }
      }
    }
    // Build MultiArch Docker containers for push to LS Repo
@ -492,7 +590,42 @@ pipeline {
              --label \"org.opencontainers.image.title=Baseimage-ubuntu\" \
              --label \"org.opencontainers.image.description=baseimage-ubuntu image by linuxserver.io\" \
              --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \
+              --provenance=true --sbom=true --builder=container --load \
              --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
+            sh '''#! /bin/bash
+                  set -e
+                  IFS=',' read -ra CACHE <<< "$BUILDCACHE"
+                  for i in "${CACHE[@]}"; do
+                    docker tag ${IMAGE}:amd64-${META_TAG} ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
+                  done
+               '''
+            withCredentials([
+              [
+                $class: 'UsernamePasswordMultiBinding',
+                credentialsId: 'Quay.io-Robot',
+                usernameVariable: 'QUAYUSER',
+                passwordVariable: 'QUAYPASS'
+              ]
+            ]) {
+              retry_backoff(5,5) {
+                  sh '''#! /bin/bash
+                        set -e
+                        echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin
+                        echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
+                        echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
+                        echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
+                        if [[ "${PACKAGE_CHECK}" != "true" ]]; then
+                          IFS=',' read -ra CACHE <<< "$BUILDCACHE"
+                          for i in "${CACHE[@]}"; do
+                            docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} &
+                          done
+                          for p in $(jobs -p); do
+                            wait "$p" || { echo "job $p failed" >&2; exit 1; }
+                          done
+                        fi
+                    '''
+              }
+            }
          }
        }
        stage('Build ARM64') {
@ -501,10 +634,6 @@ pipeline {
          }
          steps {
            echo "Running on node: ${NODE_NAME}"
-            echo 'Logging into Github'
-            sh '''#! /bin/bash
-                  echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
-               '''
            sh "docker buildx build \
              --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
              --label \"org.opencontainers.image.authors=linuxserver.io\" \
@ -519,17 +648,50 @@ pipeline {
              --label \"org.opencontainers.image.title=Baseimage-ubuntu\" \
              --label \"org.opencontainers.image.description=baseimage-ubuntu image by linuxserver.io\" \
              --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \
+              --provenance=true --sbom=true --builder=container --load \
              --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
-            sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
-            retry(5) {
-              sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
+            sh '''#! /bin/bash
+                  set -e
+                  IFS=',' read -ra CACHE <<< "$BUILDCACHE"
+                  for i in "${CACHE[@]}"; do
+                    docker tag ${IMAGE}:arm64v8-${META_TAG} ${i}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
+                  done
+               '''
+            withCredentials([
+              [
+                $class: 'UsernamePasswordMultiBinding',
+                credentialsId: 'Quay.io-Robot',
+                usernameVariable: 'QUAYUSER',
+                passwordVariable: 'QUAYPASS'
+              ]
+            ]) {
+              retry_backoff(5,5) {
+                  sh '''#! /bin/bash
+                        set -e
+                        echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin
+                        echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
+                        echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
+                        echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
+                        if [[ "${PACKAGE_CHECK}" != "true" ]]; then
+                          IFS=',' read -ra CACHE <<< "$BUILDCACHE"
+                          for i in "${CACHE[@]}"; do
+                            docker push ${i}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} &
+                          done
+                          for p in $(jobs -p); do
+                            wait "$p" || { echo "job $p failed" >&2; exit 1; }
+                          done
+                        fi
+                    '''
+              }
            }
            sh '''#! /bin/bash
                  containers=$(docker ps -aq)
                  if [[ -n "${containers}" ]]; then
                    docker stop ${containers}
                  fi
-                  docker system prune -af --volumes || : '''
+                  docker system prune -f --volumes || :
+                  docker image prune -af || :
+               '''
          }
        }
      }
@ -545,7 +707,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}
@ -554,7 +716,7 @@ pipeline {
              docker run --rm \
                -v /var/run/docker.sock:/var/run/docker.sock:ro \
                -v ${TEMPDIR}:/tmp \
-                ghcr.io/anchore/syft:latest \
+                ghcr.io/anchore/syft:${SYFT_IMAGE_TAG} \
                ${LOCAL_CONTAINER} -o table=/tmp/package_versions.txt
              NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 )
              echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github"
@ -633,27 +795,38 @@ pipeline {
          }
          sh '''#! /bin/bash
                set -e
+                if grep -q 'docker-baseimage' <<< "${LS_REPO}"; then
+                  echo "Detected baseimage, setting LSIO_FIRST_PARTY=true"
+                  if [ -n "${CI_DOCKERENV}" ]; then
+                    CI_DOCKERENV="LSIO_FIRST_PARTY=true|${CI_DOCKERENV}"
+                  else
+                    CI_DOCKERENV="LSIO_FIRST_PARTY=true"
+                  fi
+                fi
                docker pull ghcr.io/linuxserver/ci:latest
                if [ "${MULTIARCH}" == "true" ]; then
-                  docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
+                  docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64
                  docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
                fi
                docker run --rm \
                --shm-size=1gb \
                -v /var/run/docker.sock:/var/run/docker.sock \
                -e IMAGE=\"${IMAGE}\" \
-                -e DELAY_START=\"${CI_DELAY}\" \
+                -e DOCKER_LOGS_TIMEOUT=\"${CI_DELAY}\" \
                -e TAGS=\"${CI_TAGS}\" \
                -e META_TAG=\"${META_TAG}\" \
+                -e RELEASE_TAG=\"jammy\" \
                -e PORT=\"${CI_PORT}\" \
                -e SSL=\"${CI_SSL}\" \
                -e BASE=\"${DIST_IMAGE}\" \
                -e SECRET_KEY=\"${S3_SECRET}\" \
                -e ACCESS_KEY=\"${S3_KEY}\" \
-                -e DOCKER_ENV=\"LSIO_FIRST_PARTY=true|${CI_DOCKERENV}\" \
+                -e DOCKER_ENV=\"${CI_DOCKERENV}\" \
                -e WEB_SCREENSHOT=\"${CI_WEB}\" \
                -e WEB_AUTH=\"${CI_AUTH}\" \
                -e WEB_PATH=\"${CI_WEBPATH}\" \
+                -e NODE_NAME=\"${NODE_NAME}\" \
+                -e SYFT_IMAGE_TAG=\"${CI_SYFT_IMAGE_TAG:-${SYFT_IMAGE_TAG}}\" \
                -t ghcr.io/linuxserver/ci:latest \
                python3 test_build.py'''
        }
@ -669,37 +842,23 @@ pipeline {
        environment name: 'EXIT_STATUS', value: ''
      }
      steps {
-        withCredentials([
-          [
-            $class: 'UsernamePasswordMultiBinding',
-            credentialsId: 'Quay.io-Robot',
-            usernameVariable: 'QUAYUSER',
-            passwordVariable: 'QUAYPASS'
-          ]
-        ]) {
-          retry(5) {
-            sh '''#! /bin/bash
-                  set -e
-                  echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin
-                  echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
-                  echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
-                  echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
-                  for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do
-                    docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
-                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:jammy
-                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG}
-                    if [ -n "${SEMVER}" ]; then
-                      docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER}
-                    fi
-                    docker push ${PUSHIMAGE}:jammy
-                    docker push ${PUSHIMAGE}:${META_TAG}
-                    docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG}
-                    if [ -n "${SEMVER}" ]; then
-                     docker push ${PUSHIMAGE}:${SEMVER}
-                    fi
+        retry_backoff(5,5) {
+          sh '''#! /bin/bash
+                set -e
+                for PUSHIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
+                  [[ ${PUSHIMAGE%%/*} =~ \\. ]] && PUSHIMAGEPLUS="${PUSHIMAGE}" || PUSHIMAGEPLUS="docker.io/${PUSHIMAGE}"
+                  IFS=',' read -ra CACHE <<< "$BUILDCACHE"
+                  for i in "${CACHE[@]}"; do
+                      if [[ "${PUSHIMAGEPLUS}" == "$(cut -d "/" -f1 <<< ${i})"* ]]; then
+                          CACHEIMAGE=${i}
+                      fi
                  done
-               '''
-          }
+                  docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${META_TAG} -t ${PUSHIMAGE}:jammy -t ${PUSHIMAGE}:${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
+                  if [ -n "${SEMVER}" ]; then
+                    docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
+                  fi
+                done
+              '''
        }
      }
    }
@ -710,79 +869,34 @@ pipeline {
        environment name: 'EXIT_STATUS', value: ''
      }
      steps {
-        withCredentials([
-          [
-            $class: 'UsernamePasswordMultiBinding',
-            credentialsId: 'Quay.io-Robot',
-            usernameVariable: 'QUAYUSER',
-            passwordVariable: 'QUAYPASS'
-          ]
-        ]) {
-          retry(5) {
-            sh '''#! /bin/bash
-                  set -e
-                  echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin
-                  echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
-                  echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
-                  echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
-                  if [ "${CI}" == "false" ]; then
-                    docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
-                    docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
-                  fi
-                  for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
-                    docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG}
-                    docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-jammy
-                    docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
-                    docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
-                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-jammy
-                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
-                    if [ -n "${SEMVER}" ]; then
-                      docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER}
-                      docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
-                    fi
-                    docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
-                    docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
-                    docker push ${MANIFESTIMAGE}:amd64-jammy
-                    docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
-                    docker push ${MANIFESTIMAGE}:arm64v8-jammy
-                    docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
-                    if [ -n "${SEMVER}" ]; then
-                      docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
-                      docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
-                    fi
-                    docker manifest push --purge ${MANIFESTIMAGE}:jammy || :
-                    docker manifest create ${MANIFESTIMAGE}:jammy ${MANIFESTIMAGE}:amd64-jammy ${MANIFESTIMAGE}:arm64v8-jammy
-                    docker manifest annotate ${MANIFESTIMAGE}:jammy ${MANIFESTIMAGE}:arm64v8-jammy --os linux --arch arm64 --variant v8
-                    docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || :
-                    docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
-                    docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8
-                    docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} || :
-                    docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
-                    docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --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}:arm64v8-${SEMVER}
-                      docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
-                    fi
-                    token=$(curl -sX GET "https://ghcr.io/token?scope=repository%3Alinuxserver%2F${CONTAINER_NAME}%3Apull" | jq -r '.token')
-                    digest=$(curl -s \
-                      --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
-                      --header "Authorization: Bearer ${token}" \
-                      "https://ghcr.io/v2/linuxserver/${CONTAINER_NAME}/manifests/arm32v7-jammy")
-                    if [[ $(echo "$digest" | jq -r '.layers') != "null" ]]; then
-                      docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-jammy || :
-                      docker manifest create ${MANIFESTIMAGE}:arm32v7-jammy ${MANIFESTIMAGE}:amd64-jammy
-                      docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-jammy
-                    fi
-                    docker manifest push --purge ${MANIFESTIMAGE}:jammy
-                    docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} 
-                    docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} 
-                    if [ -n "${SEMVER}" ]; then
-                      docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} 
-                    fi
+        retry_backoff(5,5) {
+          sh '''#! /bin/bash
+                set -e
+                for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
+                  [[ ${MANIFESTIMAGE%%/*} =~ \\. ]] && MANIFESTIMAGEPLUS="${MANIFESTIMAGE}" || MANIFESTIMAGEPLUS="docker.io/${MANIFESTIMAGE}"
+                  IFS=',' read -ra CACHE <<< "$BUILDCACHE"
+                  for i in "${CACHE[@]}"; do
+                      if [[ "${MANIFESTIMAGEPLUS}" == "$(cut -d "/" -f1 <<< ${i})"* ]]; then
+                          CACHEIMAGE=${i}
+                      fi
                  done
-               '''
-          }
+                  docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${META_TAG} -t ${MANIFESTIMAGE}:amd64-jammy -t ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
+                  docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${META_TAG} -t ${MANIFESTIMAGE}:arm64v8-jammy -t ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
+                  if [ -n "${SEMVER}" ]; then
+                    docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
+                    docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${SEMVER} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
+                  fi
+                done
+                for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
+                  docker buildx imagetools create -t ${MANIFESTIMAGE}:jammy ${MANIFESTIMAGE}:amd64-jammy ${MANIFESTIMAGE}:arm64v8-jammy
+                  docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
+
+                  docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
+                  if [ -n "${SEMVER}" ]; then
+                    docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
+                  fi
+                done
+              '''
        }
      }
    }
@ -803,14 +917,14 @@ pipeline {
             "object": "'${COMMIT_SHA}'",\
             "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to jammy",\
             "type": "commit",\
-             "tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' '''
+             "tagger": {"name": "LinuxServer-CI","email": "ci@linuxserver.io","date": "'${GITHUB_DATE}'"}}' '''
        echo "Pushing New release for Tag"
        sh '''#! /bin/bash
              echo "Updating base packages to ${PACKAGE_TAG}" > releasebody.json
              echo '{"tag_name":"'${META_TAG}'",\
                     "target_commitish": "jammy",\
                     "name": "'${META_TAG}'",\
-                     "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**OS Changes:**\\n\\n' > start
+                     "body": "**CI Report:**\\n\\n'${CI_URL:-N/A}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Remote Changes:**\\n\\n' > start
              printf '","draft": false,"prerelease": true}' >> releasebody.json
              paste -d'\\0' start releasebody.json > releasebody.json.done
              curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''
@ -935,32 +1049,94 @@ EOF
     ###################### */
  post {
    always {
+      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
+        '''
      script{
+        env.JOB_DATE = sh(
+            script: '''date '+%Y-%m-%dT%H:%M:%S%:z' ''',
+            returnStdout: true).trim()
        if (env.EXIT_STATUS == "ABORTED"){
          sh 'echo "build aborted"'
-        }
-        else if (currentBuild.currentResult == "SUCCESS"){
-          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"color": 1681177,\
-                 "description": "**Build:**  '${BUILD_NUMBER}'\\n**CI Results:**  '${CI_URL}'\\n**ShellCheck Results:**  '${SHELLCHECK_URL}'\\n**Status:**  Success\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
-                 "username": "Jenkins"}' ${BUILDS_DISCORD} '''
-        }
-        else {
-          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"color": 16711680,\
-                 "description": "**Build:**  '${BUILD_NUMBER}'\\n**CI Results:**  '${CI_URL}'\\n**ShellCheck Results:**  '${SHELLCHECK_URL}'\\n**Status:**  failure\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
+        }else{
+          if (currentBuild.currentResult == "SUCCESS"){
+            if (env.GITHUBIMAGE =~ /lspipepr/){
+              env.JOB_WEBHOOK_STATUS='Success'
+              env.JOB_WEBHOOK_COLOUR=3957028
+              env.JOB_WEBHOOK_FOOTER='PR Build'
+            }else if (env.GITHUBIMAGE =~ /lsiodev/){
+              env.JOB_WEBHOOK_STATUS='Success'
+              env.JOB_WEBHOOK_COLOUR=3957028
+              env.JOB_WEBHOOK_FOOTER='Dev Build'
+            }else{
+              env.JOB_WEBHOOK_STATUS='Success'
+              env.JOB_WEBHOOK_COLOUR=1681177
+              env.JOB_WEBHOOK_FOOTER='Live Build'
+            }
+          }else{
+            if (env.GITHUBIMAGE =~ /lspipepr/){
+              env.JOB_WEBHOOK_STATUS='Failure'
+              env.JOB_WEBHOOK_COLOUR=12669523
+              env.JOB_WEBHOOK_FOOTER='PR Build'
+            }else if (env.GITHUBIMAGE =~ /lsiodev/){
+              env.JOB_WEBHOOK_STATUS='Failure'
+              env.JOB_WEBHOOK_COLOUR=12669523
+              env.JOB_WEBHOOK_FOOTER='Dev Build'
+            }else{
+              env.JOB_WEBHOOK_STATUS='Failure'
+              env.JOB_WEBHOOK_COLOUR=16711680
+              env.JOB_WEBHOOK_FOOTER='Live Build'
+            }
+          }
+          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"'color'": '${JOB_WEBHOOK_COLOUR}',\
+                 "footer": {"text" : "'"${JOB_WEBHOOK_FOOTER}"'"},\
+                 "timestamp": "'${JOB_DATE}'",\
+                 "description": "**Build:**  '${BUILD_NUMBER}'\\n**CI Results:**  '${CI_URL}'\\n**ShellCheck Results:**  '${SHELLCHECK_URL}'\\n**Status:**  '${JOB_WEBHOOK_STATUS}'\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
                 "username": "Jenkins"}' ${BUILDS_DISCORD} '''
        }
      }
    }
    cleanup {
      sh '''#! /bin/bash
-            echo "Performing docker system prune!!"
-            containers=$(docker ps -aq)
+            echo "Pruning builder!!"
+            docker builder prune -f --builder container || :
+            containers=$(docker ps -q)
            if [[ -n "${containers}" ]]; then
-              docker stop ${containers}
+              BUILDX_CONTAINER_ID=$(docker ps -qf 'name=buildx_buildkit')
+              for container in ${containers}; do
+                if [[ "${container}" == "${BUILDX_CONTAINER_ID}" ]]; then
+                  echo "skipping buildx container in docker stop"
+                else
+                  echo "Stopping container ${container}"
+                  docker stop ${container}
+                fi
+              done
            fi
-            docker system prune -af --volumes || :
+            docker system prune -f --volumes || :
+            docker image prune -af || :
         '''
      cleanWs()
    }
  }
 }
+
+def retry_backoff(int max_attempts, int power_base, Closure c) {
+  int n = 0
+  while (n < max_attempts) {
+    try {
+      c()
+      return
+    } catch (err) {
+      if ((n + 1) >= max_attempts) {
+        throw err
+      }
+      sleep(power_base ** n)
+      n++
+    }
+  }
+  return
+}
--- a/README.md
+++ b/README.md
@ -1,34 +1,21 @@
 <!-- DO NOT EDIT THIS FILE MANUALLY -->
 <!-- Please read https://github.com/linuxserver/docker-baseimage-ubuntu/blob/jammy/.github/CONTRIBUTING.md -->
-[linuxserverurl]: https://linuxserver.io
-[forumurl]: https://forum.linuxserver.io
-[ircurl]: https://www.linuxserver.io/irc/
-[appurl]: https://cloud-images.ubuntu.com
-[dockerfileurl]: https://github.com/linuxserver/docker-baseimage-ubuntu/blob/master/Dockerfile
-
-
-
-[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png?v=4&s=4000)][linuxserverurl]
-
+[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io)

 ## Contact information:-

 | Type | Address/Details |
 | :---: | --- |
-| Discord | [Discord](https://discord.gg/YWrKVTn) |
-| IRC | freenode at `#linuxserver.io` more information at:- [IRC][ircurl]
-| Forum | [LinuxServer.io forum][forumurl] |
+| Discord | [Discord](https://linuxserver.io/discord) |
+| IRC | `#linuxserver.io` on irc.libera.chat |
+| Forum | [Discourse](https://discourse.linuxserver.io/) |

-&nbsp;
-&nbsp;
+A custom base image built with [Ubuntu Linux](https://ubuntu.com) and [s6-overlay](https://github.com/just-containers/s6-overlay).

-[![](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/Dockerfile-Xenial-green.png)](https://github.com/linuxserver/docker-baseimage-ubuntu/blob/xenial/Dockerfile)
-
-[![](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/Dockerfile-Bionic-green.png)](https://github.com/linuxserver/docker-baseimage-ubuntu/blob/bionic/Dockerfile)
-
-[![](https://images.microbadger.com/badges/image/lsiobase/ubuntu.svg)](https://microbadger.com/images/lsiobase/ubuntu "Get your own image badge on microbadger.com")
-
-A custom base image built with [Ubuntu cloud image][appurl] and [S6 overlay](https://github.com/just-containers/s6-overlay)..
+- Support for using our base images in your own projects is provided on a Reasonable Endeavours basis, please see our [Support Policy](https://www.linuxserver.io/supportpolicy) for details.
+- There is no `latest` tag for any of our base images, by design. We often make breaking changes between versions, and we don't publish release notes like we do for the downstream images.
+- If you're intending to distribute an image using one of our bases, please read our [docs on container branding](https://docs.linuxserver.io/general/container-branding/) first.
+- Ubuntu releases are supported for 5 years, after which we will stop building new base images for that version.

 The following line is only in this repo for loop testing:

--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@ -21,6 +21,6 @@ repo_vars:
  - CI_PORT='80'
  - CI_SSL='true'
  - CI_DELAY='30'
-  - CI_DOCKERENV='TZ=US/Pacific|LSIO_FIRST_PARTY=true'
-  - CI_AUTH='user:password'
+  - CI_DOCKERENV='LSIO_FIRST_PARTY=true'
+  - CI_AUTH=''
  - CI_WEBPATH=''
--- a/package_versions.txt
+++ b/package_versions.txt
@ -1,146 +1,146 @@
 NAME                 VERSION                                  TYPE   
 adduser              3.118ubuntu5                             deb     
-apt                  2.4.11                                   deb     
-apt-utils            2.4.11                                   deb     
-base-files           12ubuntu4.3                              deb     
+apt                  2.4.14                                   deb     
+apt-utils            2.4.14                                   deb     
+base-files           12ubuntu4.7                              deb     
 base-passwd          3.5.52build1                             deb     
-bash                 5.1-6ubuntu1                             deb     
-bash                 5.1.16                                   binary  
-bsdutils             1:2.37.2-4ubuntu3                        deb     
-ca-certificates      20230311ubuntu0.22.04.1                  deb     
-coreutils            8.32-4.1ubuntu1                          deb     
+bash                 5.1-6ubuntu1.1                           deb     
+bsdutils             1:2.37.2-4ubuntu3.4                      deb     
+ca-certificates      20240203~22.04.1                         deb     
+catatonit            0.1.7-1                                  deb     
+coreutils            8.32-4.1ubuntu1.2                        deb     
 cron                 3.0pl1-137ubuntu3                        deb     
-curl                 7.81.0-1ubuntu1.15                       deb     
+curl                 7.81.0-1ubuntu1.21                       deb     
 dash                 0.5.11+git20210903+057cd650a4ed-3build1  deb     
 debconf              1.5.79ubuntu1                            deb     
 debianutils          5.5-1ubuntu2                             deb     
 diffutils            1:3.8-0ubuntu2                           deb     
-dirmngr              2.2.27-3ubuntu2.1                        deb     
-dpkg                 1.21.1ubuntu2.2                          deb     
-e2fsprogs            1.46.5-2ubuntu1.1                        deb     
+dirmngr              2.2.27-3ubuntu2.4                        deb     
+dpkg                 1.21.1ubuntu2.6                          deb     
+e2fsprogs            1.46.5-2ubuntu1.2                        deb     
 findutils            4.8.0-1ubuntu3                           deb     
-gcc-12-base          12.1.0-2ubuntu1~22.04                    deb     
-gnupg                2.2.27-3ubuntu2.1                        deb     
-gnupg-l10n           2.2.27-3ubuntu2.1                        deb     
-gnupg-utils          2.2.27-3ubuntu2.1                        deb     
-gpg                  2.2.27-3ubuntu2.1                        deb     
-gpg-agent            2.2.27-3ubuntu2.1                        deb     
-gpg-wks-client       2.2.27-3ubuntu2.1                        deb     
-gpg-wks-server       2.2.27-3ubuntu2.1                        deb     
-gpgconf              2.2.27-3ubuntu2.1                        deb     
-gpgsm                2.2.27-3ubuntu2.1                        deb     
-gpgv                 2.2.27-3ubuntu2.1                        deb     
+gcc-12-base          12.3.0-1ubuntu1~22.04.2                  deb     
+gnupg                2.2.27-3ubuntu2.4                        deb     
+gnupg-l10n           2.2.27-3ubuntu2.4                        deb     
+gnupg-utils          2.2.27-3ubuntu2.4                        deb     
+gpg                  2.2.27-3ubuntu2.4                        deb     
+gpg-agent            2.2.27-3ubuntu2.4                        deb     
+gpg-wks-client       2.2.27-3ubuntu2.4                        deb     
+gpg-wks-server       2.2.27-3ubuntu2.4                        deb     
+gpgconf              2.2.27-3ubuntu2.4                        deb     
+gpgsm                2.2.27-3ubuntu2.4                        deb     
+gpgv                 2.2.27-3ubuntu2.4                        deb     
 grep                 3.7-1build1                              deb     
 gzip                 1.10-4ubuntu4.1                          deb     
 hostname             3.23ubuntu2                              deb     
 init-system-helpers  1.62                                     deb     
-jq                   1.6-2.1ubuntu3                           deb     
+jq                   1.6-2.1ubuntu3.1                         deb     
 libacl1              2.3.1-1                                  deb     
-libapt-pkg6.0        2.4.11                                   deb     
+libapt-pkg6.0        2.4.14                                   deb     
 libassuan0           2.5.5-1build1                            deb     
 libattr1             1:2.5.1-1build1                          deb     
 libaudit-common      1:3.0.7-1build1                          deb     
 libaudit1            1:3.0.7-1build1                          deb     
-libblkid1            2.37.2-4ubuntu3                          deb     
+libblkid1            2.37.2-4ubuntu3.4                        deb     
 libbrotli1           1.0.9-2build6                            deb     
 libbsd0              0.11.5-1                                 deb     
 libbz2-1.0           1.0.8-5build1                            deb     
-libc-bin             2.35-0ubuntu3.1                          deb     
-libc6                2.35-0ubuntu3.1                          deb     
+libc-bin             2.35-0ubuntu3.11                         deb     
+libc6                2.35-0ubuntu3.11                         deb     
 libcap-ng0           0.7.9-2.2build3                          deb     
-libcap2              1:2.44-1ubuntu0.22.04.1                  deb     
-libcom-err2          1.46.5-2ubuntu1.1                        deb     
+libcap2              1:2.44-1ubuntu0.22.04.2                  deb     
+libcom-err2          1.46.5-2ubuntu1.2                        deb     
 libcrypt1            1:4.4.27-1                               deb     
-libcurl4             7.81.0-1ubuntu1.15                       deb     
+libcurl4             7.81.0-1ubuntu1.21                       deb     
 libdb5.3             5.3.28+dfsg1-0.8ubuntu3                  deb     
 libdebconfclient0    0.261ubuntu1                             deb     
-libext2fs2           1.46.5-2ubuntu1.1                        deb     
+libext2fs2           1.46.5-2ubuntu1.2                        deb     
 libffi8              3.4.2-4                                  deb     
-libgcc-s1            12.1.0-2ubuntu1~22.04                    deb     
+libgcc-s1            12.3.0-1ubuntu1~22.04.2                  deb     
 libgcrypt20          1.9.4-3ubuntu3                           deb     
 libgmp10             2:6.2.1+dfsg-3ubuntu1                    deb     
-libgnutls30          3.7.3-4ubuntu1.2                         deb     
+libgnutls30          3.7.3-4ubuntu1.7                         deb     
 libgpg-error0        1.43-3                                   deb     
-libgssapi-krb5-2     1.19.2-2ubuntu0.2                        deb     
+libgssapi-krb5-2     1.19.2-2ubuntu0.7                        deb     
 libhogweed6          3.7.3-1build2                            deb     
 libidn2-0            2.3.2-2build1                            deb     
-libjq1               1.6-2.1ubuntu3                           deb     
-libk5crypto3         1.19.2-2ubuntu0.2                        deb     
+libjq1               1.6-2.1ubuntu3.1                         deb     
+libk5crypto3         1.19.2-2ubuntu0.7                        deb     
 libkeyutils1         1.6.1-2ubuntu3                           deb     
-libkrb5-3            1.19.2-2ubuntu0.2                        deb     
-libkrb5support0      1.19.2-2ubuntu0.2                        deb     
+libkrb5-3            1.19.2-2ubuntu0.7                        deb     
+libkrb5support0      1.19.2-2ubuntu0.7                        deb     
 libksba8             1.6.0-2ubuntu0.2                         deb     
-libldap-2.5-0        2.5.16+dfsg-0ubuntu0.22.04.2             deb     
-libldap-common       2.5.16+dfsg-0ubuntu0.22.04.2             deb     
+libldap-2.5-0        2.5.19+dfsg-0ubuntu0.22.04.1             deb     
+libldap-common       2.5.19+dfsg-0ubuntu0.22.04.1             deb     
 liblz4-1             1.9.3-2build2                            deb     
 liblzma5             5.2.5-2ubuntu1                           deb     
 libmd0               1.0.4-1build1                            deb     
-libmount1            2.37.2-4ubuntu3                          deb     
+libmount1            2.37.2-4ubuntu3.4                        deb     
 libncurses6          6.3-2ubuntu0.1                           deb     
 libncursesw6         6.3-2ubuntu0.1                           deb     
 libnettle8           3.7.3-1build2                            deb     
-libnghttp2-14        1.43.0-1ubuntu0.1                        deb     
+libnghttp2-14        1.43.0-1ubuntu0.2                        deb     
 libnpth0             1.6-3build2                              deb     
 libnsl2              1.3.0-2build2                            deb     
 libonig5             6.9.7.1-2build1                          deb     
 libp11-kit0          0.24.0-6build1                           deb     
-libpam-modules       1.4.0-11ubuntu2.3                        deb     
-libpam-modules-bin   1.4.0-11ubuntu2.3                        deb     
-libpam-runtime       1.4.0-11ubuntu2.3                        deb     
-libpam0g             1.4.0-11ubuntu2.3                        deb     
+libpam-modules       1.4.0-11ubuntu2.6                        deb     
+libpam-modules-bin   1.4.0-11ubuntu2.6                        deb     
+libpam-runtime       1.4.0-11ubuntu2.6                        deb     
+libpam0g             1.4.0-11ubuntu2.6                        deb     
 libpcre2-8-0         10.39-3ubuntu0.1                         deb     
 libpcre3             2:8.39-13ubuntu0.22.04.1                 deb     
-libprocps8           2:3.3.17-6ubuntu2                        deb     
+libprocps8           2:3.3.17-6ubuntu2.1                      deb     
 libpsl5              0.21.0-1.2build2                         deb     
 libreadline8         8.1.2-1                                  deb     
 librtmp1             2.4+20151223.gitfa8646d.1-2build4        deb     
 libsasl2-2           2.1.27+dfsg2-3ubuntu1.2                  deb     
 libsasl2-modules     2.1.27+dfsg2-3ubuntu1.2                  deb     
 libsasl2-modules-db  2.1.27+dfsg2-3ubuntu1.2                  deb     
-libseccomp2          2.5.3-2ubuntu2                           deb     
+libseccomp2          2.5.3-2ubuntu3~22.04.1                   deb     
 libselinux1          3.3-1build2                              deb     
 libsemanage-common   3.3-1build2                              deb     
 libsemanage2         3.3-1build2                              deb     
 libsepol2            3.3-1build1                              deb     
-libsmartcols1        2.37.2-4ubuntu3                          deb     
-libsqlite3-0         3.37.2-2ubuntu0.3                        deb     
-libss2               1.46.5-2ubuntu1.1                        deb     
-libssh-4             0.9.6-2ubuntu0.22.04.3                   deb     
-libssl3              3.0.2-0ubuntu1.10                        deb     
-libstdc++6           12.1.0-2ubuntu1~22.04                    deb     
-libsystemd0          249.11-0ubuntu3.9                        deb     
-libtasn1-6           4.18.0-4build1                           deb     
+libsmartcols1        2.37.2-4ubuntu3.4                        deb     
+libsqlite3-0         3.37.2-2ubuntu0.5                        deb     
+libss2               1.46.5-2ubuntu1.2                        deb     
+libssh-4             0.9.6-2ubuntu0.22.04.4                   deb     
+libssl3              3.0.2-0ubuntu1.20                        deb     
+libstdc++6           12.3.0-1ubuntu1~22.04.2                  deb     
+libsystemd0          249.11-0ubuntu3.16                       deb     
+libtasn1-6           4.18.0-4ubuntu0.1                        deb     
 libtinfo6            6.3-2ubuntu0.1                           deb     
 libtirpc-common      1.3.2-2ubuntu0.1                         deb     
 libtirpc3            1.3.2-2ubuntu0.1                         deb     
-libudev1             249.11-0ubuntu3.9                        deb     
+libudev1             249.11-0ubuntu3.16                       deb     
 libunistring2        1.0-1                                    deb     
-libuuid1             2.37.2-4ubuntu3                          deb     
+libuuid1             2.37.2-4ubuntu3.4                        deb     
 libxxhash0           0.8.1-1                                  deb     
 libzstd1             1.4.8+dfsg-3build1                       deb     
-locales              2.35-0ubuntu3.6                          deb     
-login                1:4.8.1-2ubuntu2.1                       deb     
-logsave              1.46.5-2ubuntu1.1                        deb     
+locales              2.35-0ubuntu3.11                         deb     
+login                1:4.8.1-2ubuntu2.2                       deb     
+logsave              1.46.5-2ubuntu1.2                        deb     
 lsb-base             11.1.0ubuntu4                            deb     
 mawk                 1.3.4.20200120-3                         deb     
-mount                2.37.2-4ubuntu3                          deb     
+mount                2.37.2-4ubuntu3.4                        deb     
 ncurses-base         6.3-2ubuntu0.1                           deb     
 ncurses-bin          6.3-2ubuntu0.1                           deb     
 netcat               1.218-4ubuntu1                           deb     
 netcat-openbsd       1.218-4ubuntu1                           deb     
-openssl              3.0.2-0ubuntu1.15                        deb     
-passwd               1:4.8.1-2ubuntu2.1                       deb     
-perl-base            5.34.0-3ubuntu1.2                        deb     
+openssl              3.0.2-0ubuntu1.20                        deb     
+passwd               1:4.8.1-2ubuntu2.2                       deb     
+perl-base            5.34.0-3ubuntu1.5                        deb     
 pinentry-curses      1.1.1-1build2                            deb     
-procps               2:3.3.17-6ubuntu2                        deb     
+procps               2:3.3.17-6ubuntu2.1                      deb     
 publicsuffix         20211207.1025-1                          deb     
 readline-common      8.1.2-1                                  deb     
 sed                  4.8-1ubuntu2                             deb     
 sensible-utils       0.0.17                                   deb     
 sysvinit-utils       3.01-1ubuntu1                            deb     
-tar                  1.34+dfsg-1ubuntu0.1.22.04.1             deb     
-tzdata               2023d-0ubuntu0.22.04                     deb     
+tar                  1.34+dfsg-1ubuntu0.1.22.04.2             deb     
+tzdata               2025b-0ubuntu0.22.04.1                   deb     
 ubuntu-keyring       2021.03.26                               deb     
 usrmerge             25ubuntu2                                deb     
-util-linux           2.37.2-4ubuntu3                          deb     
+util-linux           2.37.2-4ubuntu3.4                        deb     
 zlib1g               1:1.2.11.dfsg-2ubuntu9.2                 deb     
--- a/readme-vars.yml
+++ b/readme-vars.yml
@ -4,35 +4,22 @@
 project_name: baseimage-ubuntu
 full_custom_readme: |
  {% raw -%}
-  [linuxserverurl]: https://linuxserver.io
-  [forumurl]: https://forum.linuxserver.io
-  [ircurl]: https://www.linuxserver.io/irc/
-  [appurl]: https://cloud-images.ubuntu.com
-  [dockerfileurl]: https://github.com/linuxserver/docker-baseimage-ubuntu/blob/master/Dockerfile
-
-
-
-  [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png?v=4&s=4000)][linuxserverurl]
-
+  [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io)

  ## Contact information:-

  | Type | Address/Details |
  | :---: | --- |
-  | Discord | [Discord](https://discord.gg/YWrKVTn) |
-  | IRC | freenode at `#linuxserver.io` more information at:- [IRC][ircurl]
-  | Forum | [LinuxServer.io forum][forumurl] |
+  | Discord | [Discord](https://linuxserver.io/discord) |
+  | IRC | `#linuxserver.io` on irc.libera.chat |
+  | Forum | [Discourse](https://discourse.linuxserver.io/) |

-  &nbsp;
-  &nbsp;
+  A custom base image built with [Ubuntu Linux](https://ubuntu.com) and [s6-overlay](https://github.com/just-containers/s6-overlay).

-  [![](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/Dockerfile-Xenial-green.png)](https://github.com/linuxserver/docker-baseimage-ubuntu/blob/xenial/Dockerfile)
-
-  [![](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/Dockerfile-Bionic-green.png)](https://github.com/linuxserver/docker-baseimage-ubuntu/blob/bionic/Dockerfile)
-
-  [![](https://images.microbadger.com/badges/image/lsiobase/ubuntu.svg)](https://microbadger.com/images/lsiobase/ubuntu "Get your own image badge on microbadger.com")
-
-  A custom base image built with [Ubuntu cloud image][appurl] and [S6 overlay](https://github.com/just-containers/s6-overlay)..
+  - Support for using our base images in your own projects is provided on a Reasonable Endeavours basis, please see our [Support Policy](https://www.linuxserver.io/supportpolicy) for details.
+  - There is no `latest` tag for any of our base images, by design. We often make breaking changes between versions, and we don't publish release notes like we do for the downstream images.
+  - If you're intending to distribute an image using one of our bases, please read our [docs on container branding](https://docs.linuxserver.io/general/container-branding/) first.
+  - Ubuntu releases are supported for 5 years, after which we will stop building new base images for that version.

  The following line is only in this repo for loop testing:

--- a/root/etc/s6-overlay/s6-rc.d/init-adduser/run
+++ b/root/etc/s6-overlay/s6-rc.d/init-adduser/run
@ -27,20 +27,6 @@ User GID:    $(id -g abc)
 ───────────────────────────────────────
 "

-if [[ "$(uname -m)" == "armv7l" ]] || [[ "$(uname -m)" == "armhf" ]]; then
-    echo '
-╔═════════════════════════════════════════════════════╗
-║                                                     ║
-║      The 32-bit Arm version of this image will      ║
-║       no longer be supported after 2023-07-01       ║
-║                                                     ║
-║          See: https://linuxserver.io/armhf          ║
-║                  for more details                   ║
-║                                                     ║
-╚═════════════════════════════════════════════════════╝
-'
-fi
-
 lsiown abc:abc /app
 lsiown abc:abc /config
 lsiown abc:abc /defaults
--- a/root/etc/s6-overlay/s6-rc.d/init-device-perms/dependencies.d/init-adduser
+++ b/root/etc/s6-overlay/s6-rc.d/init-device-perms/dependencies.d/init-adduser
--- a/root/etc/s6-overlay/s6-rc.d/init-device-perms/run
+++ b/root/etc/s6-overlay/s6-rc.d/init-device-perms/run
@ -0,0 +1,37 @@
+#!/usr/bin/with-contenv bash
+# shellcheck shell=bash
+
+if [[ -z ${LSIO_NON_ROOT_USER} ]] && [[ -n ${ATTACHED_DEVICES_PERMS} ]]; then
+    FILES=$(find ${ATTACHED_DEVICES_PERMS} -print 2>/dev/null)
+
+    for i in ${FILES}; do
+        FILE_GID=$(stat -c '%g' "${i}")
+        FILE_UID=$(stat -c '%u' "${i}")
+        # check if user matches device
+        if id -u abc | grep -qw "${FILE_UID}"; then
+            echo "**** permissions for ${i} are good ****"
+        else
+            # check if group matches and that device has group rw
+            if id -G abc | grep -qw "${FILE_GID}" && [[ $(stat -c '%A' "${i}" | cut -b 5,6) == "rw" ]]; then
+                echo "**** permissions for ${i} are good ****"
+            # check if device needs to be added to group
+            elif ! id -G abc | grep -qw "${FILE_GID}"; then
+                # check if group needs to be created
+                GROUP_NAME=$(getent group "${FILE_GID}" | awk -F: '{print $1}')
+                if [[ -z "${GROUP_NAME}" ]]; then
+                    GROUP_NAME="group$(head /dev/urandom | tr -dc 'a-z0-9' | head -c4)"
+                    groupadd "${GROUP_NAME}"
+                    groupmod -g "${FILE_GID}" "${GROUP_NAME}"
+                    echo "**** creating group ${GROUP_NAME} with id ${FILE_GID} ****"
+                fi
+                echo "**** adding ${i} to group ${GROUP_NAME} with id ${FILE_GID} ****"
+                usermod -a -G "${GROUP_NAME}" abc
+            fi
+            # check if device has group rw
+            if [[ $(stat -c '%A' "${i}" | cut -b 5,6) != "rw" ]]; then
+                echo -e "**** The device ${i} does not have group read/write permissions, attempting to fix inside the container. ****"
+                chmod g+rw "${i}"
+            fi
+        fi
+    done
+fi
--- a/root/etc/s6-overlay/s6-rc.d/init-device-perms/type
+++ b/root/etc/s6-overlay/s6-rc.d/init-device-perms/type
@ -0,0 +1 @@
+oneshot
--- a/root/etc/s6-overlay/s6-rc.d/init-device-perms/up
+++ b/root/etc/s6-overlay/s6-rc.d/init-device-perms/up
@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-device-perms/run
--- a/root/etc/s6-overlay/s6-rc.d/init-os-end/dependencies.d/init-device-perms
+++ b/root/etc/s6-overlay/s6-rc.d/init-os-end/dependencies.d/init-device-perms
--- a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-device-perms
+++ b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-device-perms
Autor	SHA1	Wiadomość	Data
LinuxServer-CI	6b91dade60	Bot Updating Package Versions	2025-09-30 23:29:57 +00:00
LinuxServer-CI	fc56ecd716	Bot Updating Package Versions	2025-09-23 23:30:59 +00:00
LinuxServer-CI	136e5c56b6	Bot Updating Package Versions	2025-08-19 23:32:39 +00:00
LinuxServer-CI	a43054a951	Bot Updating Package Versions	2025-07-29 23:36:36 +00:00
LinuxServer-CI	1c75743213	Bot Updating Package Versions	2025-07-22 23:35:57 +00:00
LinuxServer-CI	5b7a623d31	Bot Updating Package Versions	2025-07-15 23:35:00 +00:00
LinuxServer-CI	8e408e1e59	Bot Updating Package Versions	2025-07-08 23:38:40 +00:00
LinuxServer-CI	8bc194e16c	Bot Updating Templated Files	2025-07-08 23:35:02 +00:00
LinuxServer-CI	53312f9aa0	Bot Updating Templated Files	2025-07-08 23:33:18 +00:00
LinuxServer-CI	b3b8e87f78	Bot Updating Package Versions	2025-06-24 23:34:37 +00:00
LinuxServer-CI	3ff397424d	Bot Updating Package Versions	2025-06-17 23:33:39 +00:00
LinuxServer-CI	c23a38fb6a	Bot Updating Templated Files	2025-06-10 23:32:15 +00:00
LinuxServer-CI	1084d53330	Bot Updating Package Versions	2025-06-03 23:33:54 +00:00
LinuxServer-CI	c9711b4b82	Bot Updating Package Versions	2025-05-27 23:32:34 +00:00
LinuxServer-CI	3f0f340be9	Bot Updating Package Versions	2025-05-16 18:43:53 +00:00
aptalca	17fc248600	Merge pull request #182 from linuxserver/jammy-dev-perms jammy: add device perm fixing to base	2025-05-16 14:39:55 -04:00
aptalca	baed74b393	run only when env is set	2025-05-16 12:37:24 -04:00
aptalca	cd42f7fe4a	add device perm fixing to base	2025-05-16 11:53:40 -04:00
LinuxServer-CI	9816352c23	Bot Updating Package Versions	2025-04-29 23:31:59 +00:00
LinuxServer-CI	949149983f	Bot Updating Package Versions	2025-04-15 23:33:43 +00:00
LinuxServer-CI	6a8fe2bb70	Bot Updating Package Versions	2025-04-08 23:34:48 +00:00
LinuxServer-CI	d31a2ac95c	Bot Updating Package Versions	2025-04-01 23:32:57 +00:00
LinuxServer-CI	7e6fe5d034	Bot Updating Package Versions	2025-03-04 23:32:08 +00:00
LinuxServer-CI	18627d8216	Bot Updating Package Versions	2025-02-25 23:32:14 +00:00
LinuxServer-CI	a11d6df2b2	Bot Updating Package Versions	2025-02-18 23:30:40 +00:00
LinuxServer-CI	2dfcca3d0a	Bot Updating Package Versions	2025-02-11 23:32:55 +00:00
LinuxServer-CI	f063e307f4	Bot Updating Templated Files	2025-02-11 23:29:43 +00:00
LinuxServer-CI	ad3fd4af79	Bot Updating Package Versions	2025-02-04 23:29:40 +00:00
LinuxServer-CI	a95cb7b09d	Bot Updating Package Versions	2025-01-28 23:34:06 +00:00
LinuxServer-CI	bc0b6ab84d	Bot Updating Templated Files	2025-01-28 23:29:52 +00:00
LinuxServer-CI	55f23757f1	Bot Updating Templated Files	2025-01-28 23:27:51 +00:00
Adam	b9a4b0097b	Merge pull request #178 from linuxserver/jammy-switch-default	2025-01-18 21:45:39 +00:00
thespad	102a9d6505	Switch Jammy to pre-release	2025-01-17 19:40:30 +00:00
LinuxServer-CI	b75eb2b0cf	Bot Updating Package Versions	2024-12-17 23:31:21 +00:00
LinuxServer-CI	b484a08347	Bot Updating Templated Files	2024-12-15 18:34:42 +00:00
LinuxServer-CI	3e05afa4b8	Bot Updating Templated Files	2024-12-15 18:32:03 +00:00
LinuxServer-CI	f2d5c41d22	Bot Updating Package Versions	2024-12-10 08:04:03 +00:00
LinuxServer-CI	78546c6665	Bot Updating Templated Files	2024-12-10 08:00:32 +00:00
LinuxServer-CI	6c8b721bf3	Bot Updating Templated Files	2024-12-10 07:57:44 +00:00
Roxedus	2fbb5a0168	Merge pull request #176 from linuxserver/jammy-alpine3	2024-12-10 08:55:47 +01:00
thespad	7a36582b4c	Use alpine:3 for rootfs stage	2024-12-06 14:05:26 +00:00
LinuxServer-CI	93b4c6be0e	Bot Updating Package Versions	2024-10-01 23:36:12 +00:00
LinuxServer-CI	2d77de1e41	Bot Updating Templated Files	2024-10-01 23:33:05 +00:00
LinuxServer-CI	be2573743c	Bot Updating Templated Files	2024-10-01 23:31:07 +00:00
LinuxServer-CI	af73702356	Bot Updating Templated Files	2024-10-01 23:29:08 +00:00
LinuxServer-CI	ae99560c36	Bot Updating Package Versions	2024-09-17 23:32:56 +00:00
LinuxServer-CI	95abaffe3a	Bot Updating Package Versions	2024-09-10 23:30:34 +00:00
LinuxServer-CI	2a9a7f470c	Bot Updating Package Versions	2024-09-03 23:30:36 +00:00
LinuxServer-CI	ac30f0613f	Bot Updating Package Versions	2024-08-27 23:29:48 +00:00
LinuxServer-CI	a7dd06ca43	Bot Updating Templated Files	2024-08-20 23:31:28 +00:00
LinuxServer-CI	c189495ebd	Bot Updating Templated Files	2024-08-20 23:29:13 +00:00
LinuxServer-CI	58acae7fbc	Bot Updating Package Versions	2024-08-13 23:29:23 +00:00
LinuxServer-CI	566530ed12	Bot Updating Package Versions	2024-08-06 23:30:43 +00:00
LinuxServer-CI	2ae996f1b0	Bot Updating Package Versions	2024-07-30 23:25:17 +00:00
LinuxServer-CI	6ffc718eb2	Bot Updating Package Versions	2024-07-16 23:35:17 +00:00
LinuxServer-CI	b46fae470e	Bot Updating Templated Files	2024-07-16 23:31:43 +00:00
LinuxServer-CI	ba50c7c68a	Bot Updating Templated Files	2024-07-16 23:30:25 +00:00
LinuxServer-CI	3b654ea2fd	Bot Updating Package Versions	2024-07-09 23:30:42 +00:00
LinuxServer-CI	8bc271783b	Bot Updating Package Versions	2024-07-02 23:29:17 +00:00
LinuxServer-CI	3cb89a7ddb	Bot Updating Templated Files	2024-06-12 15:51:05 +00:00
Adam	278e71e11d	Merge pull request #170 from linuxserver/jammy-lsiown Copy lsiown from repo (jammy)	2024-06-12 16:49:07 +01:00
thespad	2162be9ed9	Copy lsiown from repo	2024-06-10 15:54:43 +01:00
LinuxServer-CI	0387117443	Bot Updating Package Versions	2024-06-04 23:30:40 +00:00
LinuxServer-CI	894092aaef	Bot Updating Templated Files	2024-05-21 23:27:09 +00:00
LinuxServer-CI	39fcc1f505	Bot Updating Package Versions	2024-05-14 12:29:18 +00:00
Roxedus	c40bb68d1f	Merge pull request #165 from linuxserver/jammy-remove-arm-warning	2024-05-14 14:24:33 +02:00
thespad	dbc1998ef2	Remove armhf warning	2024-05-12 15:06:39 +01:00
LinuxServer-CI	319ff4ca14	Bot Updating Package Versions	2024-05-08 18:53:59 +00:00
Roxedus	b855da2fb6	Merge pull request #161 from linuxserver/jammy-catatonit	2024-05-08 20:49:42 +02:00
Roxedus	3397401195	Add Catatonit	2024-05-06 20:33:19 +02:00
LinuxServer-CI	860abb4949	Bot Updating Package Versions	2024-04-30 23:30:30 +00:00
LinuxServer-CI	576a06552b	Bot Updating Templated Files	2024-04-30 23:25:57 +00:00
LinuxServer-CI	f4dd926eff	Bot Updating Package Versions	2024-04-23 23:26:53 +00:00
LinuxServer-CI	8786100991	Bot Updating Package Versions	2024-04-16 23:28:17 +00:00
LinuxServer-CI	4f6eaa7aee	Bot Updating Package Versions	2024-04-02 23:38:43 +00:00
LinuxServer-CI	2b09c1043c	Bot Updating Package Versions	2024-03-19 15:57:23 +00:00
Adam	567cc0a5ae	Merge pull request #158 from linuxserver/jammy-upgrade Run apt-get upgrade during build	2024-03-19 15:53:52 +00:00
TheSpad	ef14251070	Make jammy the stable release	2024-03-19 15:01:48 +00:00
TheSpad	397422a824	Bump s6 to 3.1.6.2	2024-03-19 15:00:07 +00:00
TheSpad	ba23dac60a	Run apt-upgrade during build	2024-03-19 14:59:53 +00:00
LinuxServer-CI	2b6530ec48	Bot Updating Templated Files	2024-03-12 23:27:05 +00:00
LinuxServer-CI	02df6e750f	Bot Updating Package Versions	2024-03-05 23:27:00 +00:00
				`@ -0,0 +1 @@`
				`/etc/s6-overlay/s6-rc.d/init-device-perms/run`