Bot Updating Templated Files

.github/workflows/external_trigger.yml

@@ -11,15 +11,17 @@ jobs:
 
       - name: External Trigger
         if: github.ref == 'refs/heads/master'
+        env:
+          SKIP_EXTERNAL_TRIGGER: ${{ vars.SKIP_EXTERNAL_TRIGGER }}
         run: |
           printf "# External trigger for docker-code-server\n\n" >> $GITHUB_STEP_SUMMARY
-          if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_CODE_SERVER_MASTER }}" ]; then
+          if grep -q "^code-server_master" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
             echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-            echo "> Github secret \`PAUSE_EXTERNAL_TRIGGER_CODE_SERVER_MASTER\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
+            echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`code-server_master\`; skipping trigger." >> $GITHUB_STEP_SUMMARY
             exit 0
           fi
           echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
-          echo "> External trigger running off of master branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_CODE_SERVER_MASTER\`" >> $GITHUB_STEP_SUMMARY
+          echo "> External trigger running off of master branch. To disable this trigger, add \`code-server_master\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY
           printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY
           EXT_RELEASE=$(curl -u ${{ secrets.CR_USER }}:${{ secrets.CR_PAT }} -sX GET https://api.github.com/repos/coder/code-server/releases/latest | jq -r '.tag_name' | sed 's|^v||')
           echo "Type is \`custom_version_command\`" >> $GITHUB_STEP_SUMMARY
@@ -78,26 +80,38 @@ jobs:
             echo "New version \`${EXT_RELEASE}\` found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY
             exit 0
           else
-            printf "\n## Trigger new build\n\n" >> $GITHUB_STEP_SUMMARY
+            if [[ "${artifacts_found}" == "false" ]]; then
-            echo "New version \`${EXT_RELEASE}\` found; old version was \`${IMAGE_VERSION}\`. Triggering new build" >> $GITHUB_STEP_SUMMARY
+              echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-            response=$(curl -iX POST \
+              echo "> New version detected, but not all artifacts are published yet; skipping trigger" >> $GITHUB_STEP_SUMMARY
-              https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-code-server/job/master/buildWithParameters?PACKAGE_CHECK=false \
+              FAILURE_REASON="New version ${EXT_RELEASE} for code-server tag latest is detected, however not all artifacts are uploaded to upstream release yet. Will try again later."
-              --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
+              curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
-            echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY
+                "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}],
-            echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY
+                "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
-            sleep 10
+            else
-            buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
+              printf "\n## Trigger new build\n\n" >> $GITHUB_STEP_SUMMARY
-            buildurl="${buildurl%$'\r'}"
+              echo "New version \`${EXT_RELEASE}\` found; old version was \`${IMAGE_VERSION}\`. Triggering new build" >> $GITHUB_STEP_SUMMARY
-            echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY
+              if "${artifacts_found}" == "true" ]]; then
-            echo "Attempting to change the Jenkins job description" >> $GITHUB_STEP_SUMMARY
+                echo "All artifacts seem to be uploaded." >> $GITHUB_STEP_SUMMARY
-            curl -iX POST \
+              fi
-              "${buildurl}submitDescription" \
+              response=$(curl -iX POST \
-              --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \
+                https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-code-server/job/master/buildWithParameters?PACKAGE_CHECK=false \
-              --data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
+                --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
-              --data-urlencode "Submit=Submit"
+              echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY
-            echo "**** Notifying Discord ****"
+              echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY
-            TRIGGER_REASON="A version change was detected for code-server tag latest. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}"
+              sleep 10
-            curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
+              buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
-              "description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}],
+              buildurl="${buildurl%$'\r'}"
-              "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
+              echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY
+              echo "Attempting to change the Jenkins job description" >> $GITHUB_STEP_SUMMARY
+              curl -iX POST \
+                "${buildurl}submitDescription" \
+                --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \
+                --data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
+                --data-urlencode "Submit=Submit"
+              echo "**** Notifying Discord ****"
+              TRIGGER_REASON="A version change was detected for code-server tag latest. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}"
+              curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
+                "description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}],
+                "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
+            fi
           fi

.github/workflows/package_trigger.yml

@@ -1,42 +0,0 @@
-name: Package Trigger Main
-
-on:
-  workflow_dispatch:
-
-jobs:
-  package-trigger-master:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4.1.1
-
-      - name: Package Trigger
-        if: github.ref == 'refs/heads/master'
-        run: |
-          printf "# Package trigger for docker-code-server\n\n" >> $GITHUB_STEP_SUMMARY
-          if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_CODE_SERVER_MASTER }}" ]; then
-            echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-            echo "> Github secret \`PAUSE_PACKAGE_TRIGGER_CODE_SERVER_MASTER\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
-            exit 0
-          fi
-          if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-code-server/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then
-            echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-            echo "> There already seems to be an active build on Jenkins; skipping package trigger" >> $GITHUB_STEP_SUMMARY
-            exit 0
-          fi
-          echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
-          echo "> Package trigger running off of master branch. To disable, set a Github secret named \`PAUSE_PACKAGE_TRIGGER_CODE_SERVER_MASTER\`" >> $GITHUB_STEP_SUMMARY
-          response=$(curl -iX POST \
-            https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-code-server/job/master/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'})" >> $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
-          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"

.github/workflows/package_trigger_scheduler.yml

@@ -14,6 +14,8 @@ jobs:
           fetch-depth: '0'
 
       - name: Package Trigger Scheduler
+        env:
+          SKIP_PACKAGE_TRIGGER: ${{ vars.SKIP_PACKAGE_TRIGGER }}
         run: |
           printf "# Package trigger scheduler for docker-code-server\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
@@ -24,27 +26,57 @@ jobs:
               continue
             fi
             printf "\n## Evaluating \`%s\`\n\n" ${br} >> $GITHUB_STEP_SUMMARY
-            ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-code-server/${br}/jenkins-vars.yml | yq -r '.ls_branch')
+            JENKINS_VARS=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-code-server/${br}/jenkins-vars.yml)
-            if [ "${br}" == "${ls_branch}" ]; then
+            if [[ "${br}" == $(yq -r '.ls_branch' <<< "${JENKINS_VARS}") ]]; then
               echo "Branch appears to be live; checking workflow." >> $GITHUB_STEP_SUMMARY
-              if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-code-server/${br}/.github/workflows/package_trigger.yml > /dev/null 2>&1; then
+              if [[ $(yq -r '.skip_package_check' <<< "${JENKINS_VARS}") == "true" ]]; then
-                echo "Triggering package trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY
+                echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-                triggered_branches="${triggered_branches}${br} "
+                echo "> Skipping branch ${br} due to \`skip_package_check\` being set in \`jenkins-vars.yml\`." >> $GITHUB_STEP_SUMMARY
-                curl -iX POST \
+                skipped_branches="${skipped_branches}${br} "
-                  -H "Authorization: token ${{ secrets.CR_PAT }}" \
+              elif grep -q "^code-server_${br}" <<< "${SKIP_PACKAGE_TRIGGER}"; then
-                  -H "Accept: application/vnd.github.v3+json" \
+                echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-                  -d "{\"ref\":\"refs/heads/${br}\"}" \
+                echo "> Github organizational variable \`SKIP_PACKAGE_TRIGGER\` contains \`code-server_${br}\`; skipping trigger." >> $GITHUB_STEP_SUMMARY
-                  https://api.github.com/repos/linuxserver/docker-code-server/actions/workflows/package_trigger.yml/dispatches
+                skipped_branches="${skipped_branches}${br} "
-                sleep 30
+              elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-code-server/job/${br}/lastBuild/api/json | jq -r '.building') == "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 "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 \`code-server_%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-code-server/job/${br}/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'})" >> $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
+                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"
+                sleep 20
               fi
             else
               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} ****"
+          if [[ -n "${triggered_branches}" ]] || [[ -n "${skipped_branches}" ]]; then
-          echo "**** Notifying Discord ****"
+            if [[ -n "${triggered_branches}" ]]; then
-          curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
+              NOTIFY_BRANCHES="**Triggered:** ${triggered_branches} \n"
-            "description": "**Package Check Build(s) Triggered for code-server** \n**Branch(es):** '"${triggered_branches}"' \n**Build URL:** '"https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-code-server/activity/"' \n"}],
+            fi
-            "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
+            if [[ -n "${skipped_branches}" ]]; then
+              NOTIFY_BRANCHES="${NOTIFY_BRANCHES}**Skipped:** ${skipped_branches} \n"
+            fi
+            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 code-server** \n'"${NOTIFY_BRANCHES}"'**Build URL:** '"https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-code-server/activity/"' \n"}],
+              "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
+          fi

Jenkinsfile

@@ -81,7 +81,7 @@ 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'
         }
         sh '''#! /bin/bash
               echo "The default github branch detected as ${GH_DEFAULT_BRANCH}" '''
@@ -311,7 +311,7 @@ pipeline {
                 echo "Jenkinsfile is up to date."
               fi
               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"
+              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}"
@@ -719,6 +719,14 @@ 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} --platform=arm64
@@ -731,6 +739,7 @@ pipeline {
                 -e DOCKER_LOGS_TIMEOUT=\"${CI_DELAY}\" \
                 -e TAGS=\"${CI_TAGS}\" \
                 -e META_TAG=\"${META_TAG}\" \
+                -e RELEASE_TAG=\"latest\" \
                 -e PORT=\"${CI_PORT}\" \
                 -e SSL=\"${CI_SSL}\" \
                 -e BASE=\"${DIST_IMAGE}\" \
@@ -740,6 +749,7 @@ pipeline {
                 -e WEB_SCREENSHOT=\"${CI_WEB}\" \
                 -e WEB_AUTH=\"${CI_AUTH}\" \
                 -e WEB_PATH=\"${CI_WEBPATH}\" \
+                -e NODE_NAME=\"${NODE_NAME}\" \
                 -t ghcr.io/linuxserver/ci:latest \
                 python3 test_build.py'''
         }
@@ -1007,17 +1017,45 @@ EOF
             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{
-        else if (currentBuild.currentResult == "SUCCESS"){
+          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,\
+            if (env.GITHUBIMAGE =~ /lspipepr/){
-                 "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"}],\
+              env.JOB_WEBHOOK_STATUS='Success'
-                 "username": "Jenkins"}' ${BUILDS_DISCORD} '''
+              env.JOB_WEBHOOK_COLOUR=3957028
-        }
+              env.JOB_WEBHOOK_FOOTER='PR Build'
-        else {
+            }else if (env.GITHUBIMAGE =~ /lsiodev/){
-          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,\
+              env.JOB_WEBHOOK_STATUS='Success'
-                 "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"}],\
+              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} '''
         }
       }

README.md

@@ -281,7 +281,8 @@ Below are the instructions for updating containers:
 
 ### Image Update Notifications - Diun (Docker Image Update Notifier)
 
-**tip**: We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported.
+>[!TIP]
+>We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported.
 
 ## Building locally
 
@@ -306,6 +307,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **09.10.24:** - Manage permissions in /config/.ssh according to file type
 * **19.08.24:** - Rebase to Ubuntu Noble.
 * **01.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)
 * **05.10.22:** - Install recommended deps to maintain parity with the older images.

package_versions.txt

@@ -13,20 +13,22 @@ NAME                                    VERSION                            TYPE
 @tootallnate/quickjs-emscripten         0.23.0                             npm                      
 @vscode/deviceid                        0.1.1                              npm                      
 @vscode/iconv-lite-umd                  0.7.0                              npm                      
-@vscode/proxy-agent                     0.22.0                             npm                      
+@vscode/proxy-agent                     0.23.0                             npm                      
 @vscode/ripgrep                         1.15.9                             npm                      
 @vscode/spdlog                          0.15.0                             npm                      
+@vscode/tree-sitter-wasm                0.0.2                              npm                      
 @vscode/vscode-languagedetection        1.0.21                             npm                      
 @vscode/windows-process-tree            0.6.0                              npm                      
 @vscode/windows-registry                1.1.0                              npm                      
-@xterm/addon-clipboard                  0.2.0-beta.34                      npm                      
+@xterm/addon-clipboard                  0.2.0-beta.35                      npm                      
-@xterm/addon-image                      0.9.0-beta.51                      npm                      
+@xterm/addon-image                      0.9.0-beta.52                      npm                      
-@xterm/addon-search                     0.16.0-beta.51                     npm                      
+@xterm/addon-search                     0.16.0-beta.52                     npm                      
-@xterm/addon-serialize                  0.14.0-beta.51                     npm                      
+@xterm/addon-serialize                  0.14.0-beta.52                     npm                      
-@xterm/addon-unicode11                  0.9.0-beta.51                      npm                      
+@xterm/addon-unicode11                  0.9.0-beta.52                      npm                      
-@xterm/addon-webgl                      0.19.0-beta.51                     npm                      
+@xterm/addon-webgl                      0.19.0-beta.52                     npm                      
-@xterm/headless                         5.6.0-beta.51                      npm                      
+@xterm/headless                         5.6.0-beta.52                      npm                      
-@xterm/xterm                            5.6.0-beta.51                      npm                      
+@xterm/xterm                            5.6.0-beta.52                      npm                      
+OpenConsole.exe                         1.20.240626001                     dotnet  (+1 duplicate)   
 abbrev                                  1.1.1                              npm                      
 accepts                                 1.3.8                              npm                      
 adduser                                 3.137ubuntu1                       deb                      
@@ -65,20 +67,20 @@ builtin-notebook-renderers              1.0.0                              npm
 bytes                                   3.0.0                              npm                      
 bytes                                   3.1.2                              npm                      
 ca-certificates                         20240203                           deb                      
-call-bind                               1.0.2                              npm                      
 call-bind                               1.0.7                              npm                      
 catatonit                               0.1.7-1                            deb                      
 charenc                                 0.0.2                              npm                      
 chownr                                  1.1.4                              npm                      
 chownr                                  2.0.0                              npm                      
 clojure                                 1.0.0                              npm                      
-code-server                             4.92.2                             npm                      
+code-server                             4.93.1                             npm                      
 coffeescript                            1.0.0                              npm                      
 color-support                           1.1.3                              npm                      
 compressible                            2.0.18                             npm                      
 compression                             1.7.4                              npm                      
 concat-map                              0.0.1                              npm                      
 configuration-editing                   1.0.0                              npm                      
+conpty.dll                              1.20.240626001                     dotnet  (+1 duplicate)   
 console-control-strings                 1.1.0                              npm                      
 content-disposition                     0.5.4                              npm                      
 content-type                            1.0.5                              npm                      
@@ -95,7 +97,7 @@ crypt                                   0.0.2                              npm
 csharp                                  1.0.0                              npm                      
 css                                     1.0.0                              npm                      
 css-language-features                   1.0.0                              npm                      
-curl                                    8.5.0-2ubuntu10.3                  deb                      
+curl                                    8.5.0-2ubuntu10.4                  deb                      
 dart                                    1.0.0                              npm                      
 dash                                    0.5.12-6ubuntu5                    deb                      
 data-uri-to-buffer                      5.0.1                              npm                      
@@ -154,7 +156,7 @@ fs-extra                                8.1.0                              npm
 fs-minipass                             2.1.0                              npm                      
 fs.realpath                             1.0.0                              npm                      
 fsharp                                  1.0.0                              npm                      
-function-bind                           1.1.1                              npm     (+2 duplicates)  
+function-bind                           1.1.1                              npm     (+1 duplicate)   
 function-bind                           1.1.2                              npm                      
 gauge                                   3.0.2                              npm                      
 gcc-14-base                             14-20240412-0ubuntu1               deb                      
@@ -205,7 +207,7 @@ httpolyglot                             0.1.2                              npm
 https-proxy-agent                       5.0.1                              npm                      
 https-proxy-agent                       7.0.2                              npm                      
 https-proxy-agent                       7.0.4                              npm                      
-i18next                                 23.11.3                            npm                      
+i18next                                 23.14.0                            npm                      
 iconv-lite                              0.5.2                              npm                      
 ieee754                                 1.2.1                              npm                      
 inflight                                1.0.6                              npm                      
@@ -230,7 +232,7 @@ java                                    1.0.0                              npm
 javascript                              1.0.0                              npm                      
 jq                                      1.7.1-3build1                      deb                      
 js-base64                               3.7.7                              npm                      
-js-debug                                1.92.0                             npm                      
+js-debug                                1.93.0                             npm                      
 js-debug-companion                      1.1.3                              npm                      
 js-yaml                                 4.1.0                              npm                      
 jsbn                                    1.1.0                              npm                      
@@ -241,14 +243,14 @@ jsonfile                                4.0.0                              npm
 jsonfile                                6.1.0                              npm                      
 julia                                   1.0.0                              npm                      
 just-performance                        4.3.0                              npm                      
-kerberos                                2.1.1-alpha.0                      npm                      
+kerberos                                2.1.1                              npm                      
 keyboxd                                 2.4.4-2ubuntu17                    deb                      
 krb5-locales                            1.20.1-6ubuntu2.1                  deb                      
 latex                                   1.0.0                              npm                      
 less                                    1.0.0                              npm                      
 less                                    590-2ubuntu2.1                     deb                      
 libacl1                                 2.3.2-1build1                      deb                      
-libapparmor1                            4.0.1really4.0.0-beta3-0ubuntu0.1  deb                      
+libapparmor1                            4.0.1really4.0.1-0ubuntu0.24.04.3  deb                      
 libapt-pkg6.0t64                        2.7.14build2                       deb                      
 libassuan0                              2.5.6-1build1                      deb                      
 libatomic1                              14-20240412-0ubuntu1               deb                      
@@ -266,8 +268,8 @@ libcap2                                 1:2.66-5ubuntu2                    deb
 libcbor0.10                             0.10.2-1.2ubuntu2                  deb                      
 libcom-err2                             1.47.0-2.4~exp1ubuntu4.1           deb                      
 libcrypt1                               1:4.4.36-4build1                   deb                      
-libcurl3t64-gnutls                      8.5.0-2ubuntu10.3                  deb                      
+libcurl3t64-gnutls                      8.5.0-2ubuntu10.4                  deb                      
-libcurl4t64                             8.5.0-2ubuntu10.3                  deb                      
+libcurl4t64                             8.5.0-2ubuntu10.4                  deb                      
 libdb5.3t64                             5.3.28+dfsg2-7                     deb                      
 libdebconfclient0                       0.271ubuntu3                       deb                      
 libedit2                                3.1-20230828-1build1               deb                      
@@ -310,7 +312,7 @@ libpam-runtime                          1.5.3-5ubuntu5.1                   deb
 libpam0g                                1.5.3-5ubuntu5.1                   deb                      
 libpcre2-8-0                            10.42-4ubuntu2                     deb                      
 libperl5.38t64                          5.38.2-3.2build2                   deb                      
-libproc2-0                              2:4.0.4-4ubuntu3                   deb                      
+libproc2-0                              2:4.0.4-4ubuntu3.1                 deb                      
 libpsl5t64                              0.21.2-1.1build1                   deb                      
 libreadline8t64                         8.2-4build1                        deb                      
 librtmp1                                2.4+20151223.gitfa8646d.1-2build7  deb                      
@@ -363,7 +365,7 @@ media-typer                             0.3.0                              npm
 merge-conflict                          1.0.0                              npm                      
 merge-descriptors                       1.0.1                              npm                      
 methods                                 1.1.2                              npm                      
-micromatch                              4.0.5                              npm                      
+micromatch                              4.0.8                              npm                      
 microsoft-authentication                0.0.1                              npm                      
 mime-db                                 1.52.0                             npm                      
 mime-types                              2.1.35                             npm                      
@@ -389,7 +391,7 @@ net-tools                               2.10-0.1ubuntu4                    deb
 netbase                                 6.4                                deb                      
 netcat-openbsd                          1.226-1ubuntu2                     deb                      
 netmask                                 2.0.2                              npm                      
-node                                    20.11.1                            binary                   
+node                                    20.15.1                            binary                   
 node-abi                                3.8.0                              npm                      
 node-addon-api                          3.2.1                              npm                      
 node-addon-api                          6.1.0                              npm                      
@@ -397,13 +399,12 @@ node-addon-api                          7.0.0                              npm
 node-addon-api                          7.1.0                              npm                      
 node-fetch                              2.7.0                              npm                      
 node-gyp-build                          4.8.1                              npm                      
-node-pty                                1.1.0-beta11                       npm                      
+node-pty                                1.1.0-beta21                       npm                      
 nopt                                    5.0.0                              npm                      
 npm                                     1.0.1                              npm                      
 npmlog                                  5.0.1                              npm                      
 nw-pre-gyp-module-test                  0.0.1                              npm                      
 object-assign                           4.1.1                              npm                      
-object-inspect                          1.12.3                             npm                      
 object-inspect                          1.13.1                             npm                      
 objective-c                             1.0.0                              npm                      
 on-finished                             2.4.1                              npm                      
@@ -431,7 +432,7 @@ picomatch                               2.3.1                              npm
 pinentry-curses                         1.2.1-3ubuntu5                     deb                      
 powershell                              1.0.0                              npm                      
 prebuild-install                        7.1.2                              npm                      
-procps                                  2:4.0.4-4ubuntu3                   deb                      
+procps                                  2:4.0.4-4ubuntu3.1                 deb                      
 proxy-addr                              2.0.7                              npm                      
 proxy-agent                             6.4.0                              npm                      
 proxy-from-env                          1.1.0                              npm     (+1 duplicate)   
@@ -440,7 +441,7 @@ pug                                     1.0.0                              npm
 pump                                    3.0.0                              npm                      
 python                                  1.0.0                              npm                      
 qs                                      6.11.0                             npm     (+1 duplicate)   
-qs                                      6.12.1                             npm                      
+qs                                      6.13.0                             npm                      
 r                                       1.0.0                              npm                      
 range-parser                            1.2.1                              npm                      
 raw-body                                3.0.0-beta.1                       npm                      
@@ -476,7 +477,6 @@ set-function-length                     1.2.2                              npm
 setprototypeof                          1.2.0                              npm                      
 shaderlab                               1.0.0                              npm                      
 shellscript                             1.0.0                              npm                      
-side-channel                            1.0.4                              npm                      
 side-channel                            1.0.6                              npm                      
 signal-exit                             3.0.7                              npm                      
 simple-browser                          1.0.0                              npm                      
@@ -542,15 +542,15 @@ vscode-js-profile-table                 1.0.9                              npm
 vscode-json-languageserver              1.3.4                              npm                      
 vscode-oniguruma                        1.7.0                              npm                      
 vscode-regexpp                          3.1.0                              npm                      
-vscode-reh                              1.92.2                             npm                      
+vscode-reh                              1.93.1                             npm                      
-vscode-textmate                         9.0.0                              npm                      
+vscode-textmate                         9.1.0                              npm                      
 vscode-theme-seti                       1.0.0                              npm                      
 webidl-conversions                      3.0.1                              npm                      
 whatwg-url                              5.0.0                              npm                      
 which                                   2.0.2                              npm                      
 wide-align                              1.1.5                              npm                      
 wrappy                                  1.0.2                              npm     (+1 duplicate)   
-ws                                      8.17.1                             npm                      
+ws                                      8.18.0                             npm                      
 xauth                                   1:1.1.2-1build1                    deb                      
 xdg-basedir                             4.0.0                              npm                      
 xml                                     1.0.0                              npm                      

readme-vars.yml

@@ -47,6 +47,7 @@ app_setup_block: |
   How to create the [hashed password](https://github.com/cdr/code-server/blob/master/docs/FAQ.md#can-i-store-my-password-hashed).
 # changelog
 changelogs:
+  - {date: "09.10.24:", desc: "Manage permissions in /config/.ssh according to file type"}
   - {date: "19.08.24:", desc: "Rebase to Ubuntu Noble."}
   - {date: "01.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"}
   - {date: "05.10.22:", desc: "Install recommended deps to maintain parity with the older images."}

root/etc/s6-overlay/s6-rc.d/init-code-server/run

@@ -31,5 +31,7 @@ find /config -path /config/workspace -prune -o -exec chown abc:abc {} +
 chown abc:abc /config/workspace
 chmod 700 /config/.ssh
 if [[ -n "$(ls -A /config/.ssh)" ]]; then
-    chmod 600 /config/.ssh/*
+    find /config/.ssh/ -type d -exec chmod 700 '{}' \;
+    find /config/.ssh/ -type f -exec chmod 600 '{}' \;
+    find /config/.ssh/ -type f -iname '*.pub' -exec chmod 644 '{}' \;
 fi