Bot Updating Templated Files

.github/ISSUE_TEMPLATE/issue.bug.yml

@@ -67,10 +67,10 @@ body:
   - type: textarea
     attributes:
       description: |
-        Provide a full docker log, output of "docker logs linuxserver.io"
+        Provide a full docker log, output of "docker logs code-server"
       label: Container logs
       placeholder: |
-        Output of `docker logs linuxserver.io`
+        Output of `docker logs code-server`
       render: bash
     validations:
       required: true

.github/workflows/external_trigger.yml

@@ -7,7 +7,7 @@ jobs:
   external-trigger-master:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v4.1.1
 
       - name: External Trigger
         if: github.ref == 'refs/heads/master'

.github/workflows/external_trigger_scheduler.yml

@@ -9,7 +9,7 @@ jobs:
   external-trigger-scheduler:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v4.1.1
         with:
           fetch-depth: '0'
 

.github/workflows/package_trigger.yml

@@ -7,7 +7,7 @@ jobs:
   package-trigger-master:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v4.1.1
 
       - name: Package Trigger
         if: github.ref == 'refs/heads/master'

.github/workflows/package_trigger_scheduler.yml

@@ -9,7 +9,7 @@ jobs:
   package-trigger-scheduler:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v4.1.1
         with:
           fetch-depth: '0'
 

Jenkinsfile

@@ -245,9 +245,11 @@ pipeline {
                   -v ${WORKSPACE}:/mnt \
                   -e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \
                   -e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \
-                  ghcr.io/linuxserver/baseimage-alpine:3.17 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
+                  ghcr.io/linuxserver/baseimage-alpine:3.19 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
-                    apk add --no-cache py3-pip && \
+                    apk add --no-cache python3 && \
-                    pip install s3cmd && \
+                    python3 -m venv /lsiopy && \
+                    pip install --no-cache-dir -U pip && \
+                    pip install --no-cache-dir s3cmd && \
                     s3cmd put --no-preserve --acl-public -m text/xml /mnt/shellcheck-result.xml s3://ci-tests.linuxserver.io/${IMAGE}/${META_TAG}/shellcheck-result.xml" || :'''
         }
       }
@@ -262,150 +264,149 @@ pipeline {
         }
       }
       steps {
-        withCredentials([
+        sh '''#! /bin/bash
-          [
+              set -e
-            $class: 'UsernamePasswordMultiBinding',
+              TEMPDIR=$(mktemp -d)
-            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
+              docker pull ghcr.io/linuxserver/jenkins-builder:latest
-            usernameVariable: 'DOCKERUSER',
+              docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest 
-            passwordVariable: 'DOCKERPASS'
+              # Stage 1 - Jenkinsfile update
-          ]
+              if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then
-        ]) {
+                mkdir -p ${TEMPDIR}/repo
-          sh '''#! /bin/bash
+                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
-                set -e
+                cd ${TEMPDIR}/repo/${LS_REPO}
-                TEMPDIR=$(mktemp -d)
+                git checkout -f master
-                docker pull ghcr.io/linuxserver/jenkins-builder:latest
+                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/
-                docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest 
+                git add Jenkinsfile
-                # Stage 1 - Jenkinsfile update
+                git commit -m 'Bot Updating Templated Files'
-                if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
-                  mkdir -p ${TEMPDIR}/repo
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
-                  git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
+                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
-                  cd ${TEMPDIR}/repo/${LS_REPO}
+                echo "Updating Jenkinsfile"
-                  git checkout -f master
+                rm -Rf ${TEMPDIR}
-                  cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/
+                exit 0
-                  git add Jenkinsfile
+              else
-                  git commit -m 'Bot Updating Templated Files'
+                echo "Jenkinsfile is up to date."
-                  git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
+              fi
-                  git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
+              # Stage 2 - Delete old templates
-                  echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
+              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 "Updating Jenkinsfile"
+              for i in ${OLD_TEMPLATES}; do
-                  rm -Rf ${TEMPDIR}
+                if [[ -f "${i}" ]]; then
-                  exit 0
+                  TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
-                else
-                  echo "Jenkinsfile is up to date."
                 fi
-                # Stage 2 - Delete old templates
+              done
-                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"
+              if [[ -n "${TEMPLATES_TO_DELETE}" ]]; then
-                for i in ${OLD_TEMPLATES}; do
+                mkdir -p ${TEMPDIR}/repo
-                  if [[ -f "${i}" ]]; then
+                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
-                    TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
+                cd ${TEMPDIR}/repo/${LS_REPO}
-                  fi
+                git checkout -f master
+                for i in ${TEMPLATES_TO_DELETE}; do
+                  git rm "${i}"
                 done
-                if [[ -n "${TEMPLATES_TO_DELETE}" ]]; then
+                git commit -m 'Bot Updating Templated Files'
-                  mkdir -p ${TEMPDIR}/repo
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
-                  git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
-                  cd ${TEMPDIR}/repo/${LS_REPO}
+                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
-                  git checkout -f master
+                echo "Deleting old and deprecated templates"
-                  for i in ${TEMPLATES_TO_DELETE}; do
+                rm -Rf ${TEMPDIR}
-                    git rm "${i}"
+                exit 0
-                  done
+              else
-                  git commit -m 'Bot Updating Templated Files'
+                echo "No templates to delete"
-                  git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
+              fi
-                  git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
+              # Stage 3 - Update templates
-                  echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
+              CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
-                  echo "Deleting old and deprecated templates"
+              cd ${TEMPDIR}/docker-${CONTAINER_NAME}
-                  rm -Rf ${TEMPDIR}
+              NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
-                  exit 0
+              if [[ "${CURRENTHASH}" != "${NEWHASH}" ]] || ! grep -q '.jenkins-external' "${WORKSPACE}/.gitignore" 2>/dev/null; then
-                else
+                mkdir -p ${TEMPDIR}/repo
-                  echo "No templates to delete"
+                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
-                fi
+                cd ${TEMPDIR}/repo/${LS_REPO}
-                # Stage 3 - Update templates
+                git checkout -f master
-                CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
                 cd ${TEMPDIR}/docker-${CONTAINER_NAME}
-                NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
+                mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows
-                if [[ "${CURRENTHASH}" != "${NEWHASH}" ]] || ! grep -q '.jenkins-external' "${WORKSPACE}/.gitignore" 2>/dev/null; then
+                mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE
-                  mkdir -p ${TEMPDIR}/repo
+                cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || :
-                  git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
+                cp --parents readme-vars.yml ${TEMPDIR}/repo/${LS_REPO}/ || :
-                  cd ${TEMPDIR}/repo/${LS_REPO}
+                cd ${TEMPDIR}/repo/${LS_REPO}/
-                  git checkout -f master
+                if ! grep -q '.jenkins-external' .gitignore 2>/dev/null; then
-                  cd ${TEMPDIR}/docker-${CONTAINER_NAME}
+                  echo ".jenkins-external" >> .gitignore
-                  mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows
+                  git add .gitignore
-                  mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE
+                fi
-                  cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || :
+                git add readme-vars.yml ${TEMPLATED_FILES}
-                  cp --parents readme-vars.yml ${TEMPDIR}/repo/${LS_REPO}/ || :
+                git commit -m 'Bot Updating Templated Files'
-                  cd ${TEMPDIR}/repo/${LS_REPO}/
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
-                  if ! grep -q '.jenkins-external' .gitignore 2>/dev/null; then
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
-                    echo ".jenkins-external" >> .gitignore
+                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
-                    git add .gitignore
+              else
-                  fi
+                echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
-                  git add readme-vars.yml ${TEMPLATED_FILES}
+              fi
-                  git commit -m 'Bot Updating Templated Files'
+              mkdir -p ${TEMPDIR}/docs
-                  git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
+              git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation
-                  git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
+              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
-                  echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
+                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
+                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} || \
+                  (MAXWAIT="10" && echo "Push to docs failed, trying again in ${MAXWAIT} seconds" && \
+                  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})
+              fi
+              mkdir -p ${TEMPDIR}/unraid
+              git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates
+              git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates
+              if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-logo.png ]]; then
+                sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-logo.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml
+              elif [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then
+                sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml
+              fi
+              if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then
+                cd ${TEMPDIR}/unraid/templates/
+                GH_TEMPLATES_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||')
+                if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then
+                  echo "Image is on the ignore list, marking Unraid template as deprecated"
+                  cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
+                  git add -u unraid/${CONTAINER_NAME}.xml
+                  git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || :
+                  git commit -m 'Bot Moving Deprecated Unraid Template' || :
                 else
-                  echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
+                  cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
+                  git add unraid/${CONTAINER_NAME}.xml
+                  git commit -m 'Bot Updating Unraid Template'
                 fi
-                mkdir -p ${TEMPDIR}/docs
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} --rebase
-                git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} || \
-                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
+                  (MAXWAIT="10" && echo "Push to unraid templates failed, trying again in ${MAXWAIT} seconds" && \
-                  cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/docs/docker-documentation/docs/images/
+                  sleep $((RANDOM % MAXWAIT)) && \
-                  cd ${TEMPDIR}/docs/docker-documentation
+                  git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} --rebase && \
-                  GH_DOCS_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||')
+                  git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH})
-                  git add docs/images/docker-${CONTAINER_NAME}.md
+              fi
-                  git commit -m 'Bot Updating Documentation'
+              # Stage 4 - Sync Readme to Docker Hub
-                  git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH}
+              if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]]; then
-                  git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH}
+                if [[ $(cat ${TEMPDIR}/docker-${CONTAINER_NAME}/README.md | wc -m) > 25000 ]]; then
-                fi
+                  echo "Readme is longer than 25,000 characters. Syncing the lite version to Docker Hub"
-                mkdir -p ${TEMPDIR}/unraid
+                  DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/README.lite"
-                git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates
-                git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates
-                if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-logo.png ]]; then
-                  sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-logo.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml
-                elif [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then
-                  sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml
-                fi
-                if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then
-                  cd ${TEMPDIR}/unraid/templates/
-                  GH_TEMPLATES_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||')
-                  if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then
-                    echo "Image is on the ignore list, marking Unraid template as deprecated"
-                    cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
-                    git add -u unraid/${CONTAINER_NAME}.xml
-                    git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || :
-                    git commit -m 'Bot Moving Deprecated Unraid Template' || :
-                  else
-                    cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
-                    git add unraid/${CONTAINER_NAME}.xml
-                    git commit -m 'Bot Updating Unraid Template'
-                  fi
-                  git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH}
-                  git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH}
-                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
-                    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
-                  DH_TOKEN=$(curl -d '{"username":"'${DOCKERUSER}'", "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 PATCH \
-                    -d "{\\"full_description\\":$(jq -Rsa . ${DH_README_SYNC_PATH})}" \
-                    https://hub.docker.com/v2/repositories/${DOCKERHUB_IMAGE} || :
                 else
-                  echo "Not the default Github branch. Skipping readme sync to Docker Hub."
+                  echo "Syncing readme to Docker Hub"
+                  DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/README.md"
                 fi
-                rm -Rf ${TEMPDIR}'''
+                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')
-          script{
+                curl -s \
-            env.FILES_UPDATED = sh(
+                  -H "Authorization: JWT ${DH_TOKEN}" \
-              script: '''cat /tmp/${COMMIT_SHA}-${BUILD_NUMBER}''',
+                  -H "Content-Type: application/json" \
-              returnStdout: true).trim()
+                  -X PATCH \
-          }
+                  -d "{\\"full_description\\":$(jq -Rsa . ${DH_README_SYNC_PATH})}" \
+                  https://hub.docker.com/v2/repositories/${DOCKERHUB_IMAGE} || :
+              else
+                echo "Not the default Github branch. Skipping readme sync to Docker Hub."
+              fi
+              rm -Rf ${TEMPDIR}'''
+        script{
+          env.FILES_UPDATED = sh(
+            script: '''cat /tmp/${COMMIT_SHA}-${BUILD_NUMBER}''',
+            returnStdout: true).trim()
         }
       }
     }
@@ -703,12 +704,6 @@ pipeline {
       }
       steps {
         withCredentials([
-          [
-            $class: 'UsernamePasswordMultiBinding',
-            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
-            usernameVariable: 'DOCKERUSER',
-            passwordVariable: 'DOCKERPASS'
-          ],
           [
             $class: 'UsernamePasswordMultiBinding',
             credentialsId: 'Quay.io-Robot',
@@ -719,7 +714,7 @@ pipeline {
           retry(5) {
             sh '''#! /bin/bash
                   set -e
-                  echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
+                  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
@@ -750,12 +745,6 @@ pipeline {
       }
       steps {
         withCredentials([
-          [
-            $class: 'UsernamePasswordMultiBinding',
-            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
-            usernameVariable: 'DOCKERUSER',
-            passwordVariable: 'DOCKERPASS'
-          ],
           [
             $class: 'UsernamePasswordMultiBinding',
             credentialsId: 'Quay.io-Robot',
@@ -766,7 +755,7 @@ pipeline {
           retry(5) {
             sh '''#! /bin/bash
                   set -e
-                  echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
+                  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

package_versions.txt

@@ -15,18 +15,18 @@ NAME                                    VERSION
 @vscode/iconv-lite-umd                  0.7.0                                    npm     
 @vscode/proxy-agent                     0.18.2                                   npm     
 @vscode/ripgrep                         1.15.9                                   npm     
-@vscode/spdlog                          0.13.12                                  npm     
+@vscode/spdlog                          0.14.0                                   npm     
 @vscode/vscode-languagedetection        1.0.21                                   npm     
 @vscode/windows-process-tree            0.5.0                                    npm     
 @vscode/windows-registry                1.1.0                                    npm     
-@xterm/addon-canvas                     0.6.0-beta.14                            npm     
+@xterm/addon-canvas                     0.6.0-beta.20                            npm     
-@xterm/addon-image                      0.7.0-beta.12                            npm     
+@xterm/addon-image                      0.7.0-beta.18                            npm     
-@xterm/addon-search                     0.14.0-beta.14                           npm     
+@xterm/addon-search                     0.14.0-beta.20                           npm     
-@xterm/addon-serialize                  0.12.0-beta.14                           npm     
+@xterm/addon-serialize                  0.12.0-beta.20                           npm     
-@xterm/addon-unicode11                  0.7.0-beta.14                            npm     
+@xterm/addon-unicode11                  0.7.0-beta.20                            npm     
-@xterm/addon-webgl                      0.17.0-beta.14                           npm     
+@xterm/addon-webgl                      0.17.0-beta.20                           npm     
-@xterm/headless                         5.4.0-beta.14                            npm     
+@xterm/headless                         5.4.0-beta.20                            npm     
-@xterm/xterm                            5.4.0-beta.14                            npm     
+@xterm/xterm                            5.4.0-beta.20                            npm     
 abbrev                                  1.1.1                                    npm     
 accepts                                 1.3.8                                    npm     
 adduser                                 3.118ubuntu5                             deb     
@@ -69,7 +69,7 @@ charenc                                 0.0.2
 chownr                                  1.1.4                                    npm     
 chownr                                  2.0.0                                    npm     
 clojure                                 1.0.0                                    npm     
-code-server                             4.20.0                                   npm     
+code-server                             4.21.1                                   npm     
 coffeescript                            1.0.0                                    npm     
 color-support                           1.1.3                                    npm     
 compressible                            2.0.18                                   npm     
@@ -137,7 +137,7 @@ file-uri-to-path                        1.0.0
 fill-range                              7.0.1                                    npm     
 finalhandler                            1.1.2                                    npm     
 findutils                               4.8.0-1ubuntu3                           deb     
-follow-redirects                        1.15.3                                   npm     
+follow-redirects                        1.15.4                                   npm     
 forwarded                               0.2.0                                    npm     
 fresh                                   0.5.2                                    npm     
 fs-constants                            1.0.0                                    npm     
@@ -186,7 +186,7 @@ http-proxy-agent                        7.0.0
 httpolyglot                             0.1.2                                    npm     
 https-proxy-agent                       5.0.1                                    npm     
 https-proxy-agent                       7.0.2                                    npm     
-i18next                                 23.7.6                                   npm     
+i18next                                 23.8.2                                   npm     
 iconv-lite                              0.4.24                                   npm     
 ieee754                                 1.2.1                                    npm     
 inflight                                1.0.6                                    npm     
@@ -209,7 +209,7 @@ jake                                    1.0.0
 java                                    1.0.0                                    npm     
 javascript                              1.0.0                                    npm     
 jq                                      1.6-2.1ubuntu3                           deb     
-js-debug                                1.85.0                                   npm     
+js-debug                                1.86.1                                   npm     
 js-debug-companion                      1.1.2                                    npm     
 js-yaml                                 4.1.0                                    npm     
 jschardet                               3.0.0                                    npm     
@@ -266,8 +266,8 @@ libkeyutils1                            1.6.1-2ubuntu3
 libkrb5-3                               1.19.2-2ubuntu0.2                        deb     
 libkrb5support0                         1.19.2-2ubuntu0.2                        deb     
 libksba8                                1.6.0-2ubuntu0.2                         deb     
-libldap-2.5-0                           2.5.16+dfsg-0ubuntu0.22.04.1             deb     
+libldap-2.5-0                           2.5.16+dfsg-0ubuntu0.22.04.2             deb     
-libldap-common                          2.5.16+dfsg-0ubuntu0.22.04.1             deb     
+libldap-common                          2.5.16+dfsg-0ubuntu0.22.04.2             deb     
 liblz4-1                                1.9.3-2build2                            deb     
 liblzma5                                5.2.5-2ubuntu1                           deb     
 libmd0                                  1.0.4-1build1                            deb     
@@ -302,7 +302,7 @@ libsepol2                               3.3-1build1
 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.2                   deb     
+libssh-4                                0.9.6-2ubuntu0.22.04.3                   deb     
 libssl3                                 3.0.2-0ubuntu1.10                        deb     
 libstdc++6                              12.3.0-1ubuntu1~22.04                    deb     
 libsystemd0                             249.11-0ubuntu3.9                        deb     
@@ -323,7 +323,7 @@ libxmuu1                                2:1.1.3-3
 libxxhash0                              0.8.1-1                                  deb     
 libzstd1                                1.4.8+dfsg-3build1                       deb     
 limiter                                 2.1.0                                    npm     
-locales                                 2.35-0ubuntu3.5                          deb     
+locales                                 2.35-0ubuntu3.6                          deb     
 log                                     1.0.0                                    npm     
 login                                   1:4.8.1-2ubuntu2.1                       deb     
 logsave                                 1.46.5-2ubuntu1.1                        deb     
@@ -372,7 +372,7 @@ netbase                                 6.3
 netcat                                  1.218-4ubuntu1                           deb     
 netcat-openbsd                          1.218-4ubuntu1                           deb     
 netmask                                 2.0.2                                    npm     
-node                                    18.15.0                                  binary  
+node                                    18.17.1                                  binary  
 node-abi                                3.8.0                                    npm     
 node-addon-api                          3.2.1                                    npm     
 node-addon-api                          4.3.0                                    npm     
@@ -390,7 +390,7 @@ on-finished                             2.3.0
 on-headers                              1.0.2                                    npm     
 once                                    1.4.0                                    npm     
 openssh-client                          1:8.9p1-3ubuntu0.6                       deb     
-openssl                                 3.0.2-0ubuntu1.12                        deb     
+openssl                                 3.0.2-0ubuntu1.14                        deb     
 os-tmpdir                               1.0.2                                    npm     
 pac-proxy-agent                         7.0.1                                    npm     
 pac-resolver                            7.0.0                                    npm     
@@ -497,7 +497,7 @@ type-is                                 1.6.18
 typescript                              1.0.0                                    npm     
 typescript                              5.3.2                                    npm     
 typescript-language-features            1.0.0                                    npm     
-tzdata                                  2023c-0ubuntu0.22.04.2                   deb     
+tzdata                                  2023d-0ubuntu0.22.04                     deb     
 ubuntu-keyring                          2021.03.26                               deb     
 universalify                            0.1.2                                    npm     
 unpipe                                  1.0.0                                    npm     
@@ -512,10 +512,10 @@ vscode-extensions                       0.0.1
 vscode-html-languageserver              1.0.0                                    npm     
 vscode-js-profile-table                 1.0.8                                    npm     
 vscode-json-languageserver              1.3.4                                    npm     
-vscode-markdown-languageserver          0.4.0-alpha.8                            npm     
+vscode-markdown-languageserver          0.4.0                                    npm     
 vscode-oniguruma                        1.7.0                                    npm     
 vscode-regexpp                          3.1.0                                    npm     
-vscode-reh                              1.85.1                                   npm     
+vscode-reh                              1.86.1                                   npm     
 vscode-textmate                         9.0.0                                    npm     
 vscode-theme-seti                       1.0.0                                    npm     
 webidl-conversions                      3.0.1                                    npm