Bot Updating Package Versions

.editorconfig

@@ -15,6 +15,6 @@ trim_trailing_whitespace = false
 indent_style = space
 indent_size = 2
 
-[{**.sh,root/etc/s6-overlay/s6-rc.d/**,root/etc/cont-init.d/**,root/etc/services.d/**}]
+[{**.sh,root/etc/cont-init.d/**,root/etc/services.d/**}]
 indent_style = space
 indent_size = 4

.github/CONTRIBUTING.md

@@ -24,7 +24,7 @@
 ## Readme
 
 If you would like to change our readme, please __**do not**__ directly edit the readme, as it is auto-generated on each commit.
-Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-code-server/edit/master/readme-vars.yml).
+Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-code-server/edit/focal/readme-vars.yml).
 
 These variables are used in a template for our [Jenkins Builder](https://github.com/linuxserver/docker-jenkins-builder) as part of an ansible play.
 Most of these variables are also carried over to [docs.linuxserver.io](https://docs.linuxserver.io/images/docker-code-server)
@@ -115,7 +115,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Update the changelog
 
-If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-code-server/tree/master/root), add an entry to the changelog
+If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-code-server/tree/focal/root), add an entry to the changelog
 
 ```yml
 changelogs:

.github/ISSUE_TEMPLATE/issue.bug.md

@@ -0,0 +1,40 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+[linuxserverurl]: https://linuxserver.io
+[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
+
+<!--- If you are new to Docker or this application our issue tracker is **ONLY** used for reporting bugs or requesting features. Please use [our discord server](https://discord.gg/YWrKVTn) for general support. --->
+
+<!--- Provide a general summary of the bug in the Title above -->
+
+------------------------------
+
+## Expected Behavior
+<!--- Tell us what should happen -->
+
+## Current Behavior
+<!--- Tell us what happens instead of the expected behavior -->
+
+## Steps to Reproduce
+<!--- Provide a link to a live example, or an unambiguous set of steps to -->
+<!--- reproduce this bug. Include code to reproduce, if relevant -->
+1.
+2.
+3.
+4.
+
+## Environment
+**OS:**
+**CPU architecture:** x86_64/arm32/arm64
+**How docker service was installed:**
+<!--- ie. from the official docker repo, from the distro repo, nas OS provided, etc. -->
+<!--- Providing context helps us come up with a solution that is most useful in the real world -->
+
+## Command used to create docker container (run/create/compose/screenshot)
+<!--- Provide your docker create/run command or compose yaml snippet, or a screenshot of settings if using a gui to create the container -->
+
+## Docker logs
+<!--- Provide a full docker log, output of "docker logs code-server" -->

.github/ISSUE_TEMPLATE/issue.bug.yml

@@ -1,77 +0,0 @@
-# Based on the issue template
-name: Bug report
-description: Create a report to help us improve
-title: "[BUG] <title>"
-labels: [Bug]
-body:
-  - type: checkboxes
-    attributes:
-      label: Is there an existing issue for this?
-      description: Please search to see if an issue already exists for the bug you encountered.
-      options:
-        - label: I have searched the existing issues
-          required: true
-  - type: textarea
-    attributes:
-      label: Current Behavior
-      description: Tell us what happens instead of the expected behavior.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Expected Behavior
-      description: Tell us what should happen.
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Steps To Reproduce
-      description: Steps to reproduce the behavior.
-      placeholder: |
-        1. In this environment...
-        2. With this config...
-        3. Run '...'
-        4. See error...
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Environment
-      description: |
-        examples:
-          - **OS**: Ubuntu 20.04
-          - **How docker service was installed**: distro's packagemanager
-      value: |
-        - OS:
-        - How docker service was installed:
-      render: markdown
-    validations:
-      required: false
-  - type: dropdown
-    attributes:
-      label: CPU architecture
-      options:
-        - x86-64
-        - arm64
-        - armhf
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Docker creation
-      description: |
-        Command used to create docker container
-        Provide your docker create/run command or compose yaml snippet, or a screenshot of settings if using a gui to create the container
-      render: bash
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      description: |
-        Provide a full docker log, output of "docker logs linuxserver.io"
-      label: Container logs
-      placeholder: |
-        Output of `docker logs linuxserver.io`
-      render: bash
-    validations:
-      required: true

.github/ISSUE_TEMPLATE/issue.feature.md

@@ -0,0 +1,25 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+[linuxserverurl]: https://linuxserver.io
+[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
+
+<!--- If you are new to Docker or this application our issue tracker is **ONLY** used for reporting bugs or requesting features. Please use [our discord server](https://discord.gg/YWrKVTn) for general support. --->
+
+<!--- If this acts as a feature request please ask yourself if this modification is something the whole userbase will benefit from --->
+<!--- If this is a specific change for corner case functionality or plugins please look at making a Docker Mod or local script  https://blog.linuxserver.io/2019/09/14/customizing-our-containers/ -->
+
+<!--- Provide a general summary of the request in the Title above -->
+
+------------------------------
+
+## Desired Behavior
+<!--- Tell us what should happen -->
+
+## Current Behavior
+<!--- Tell us what happens instead of the expected behavior -->
+
+## Alternatives Considered
+<!--- Tell us what other options you have tried or considered -->

.github/ISSUE_TEMPLATE/issue.feature.yml

@@ -1,31 +0,0 @@
-# Based on the issue template
-name: Feature request
-description: Suggest an idea for this project
-title: "[FEAT] <title>"
-labels: [enhancement]
-body:
-  - type: checkboxes
-    attributes:
-      label: Is this a new feature request?
-      description: Please search to see if a feature request already exists.
-      options:
-        - label: I have searched the existing issues
-          required: true
-  - type: textarea
-    attributes:
-      label: Wanted change
-      description: Tell us what you want to happen.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Reason for change
-      description: Justify your request, why do you want it, what is the benefit.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Proposed code change
-      description: Do you have a potential code change in mind?
-    validations:
-      required: false

.github/PULL_REQUEST_TEMPLATE.md

@@ -21,7 +21,7 @@
 
 ------------------------------
 
- - [ ] I have read the [contributing](https://github.com/linuxserver/docker-code-server/blob/master/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications
+ - [ ] I have read the [contributing](https://github.com/linuxserver/docker-code-server/blob/focal/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications
 
 ------------------------------
 

.github/workflows/call_issue_pr_tracker.yml

@@ -1,16 +0,0 @@
-name: Issue & PR Tracker
-
-on:
-  issues:
-    types: [opened,reopened,labeled,unlabeled,closed]
-  pull_request_target:
-    types: [opened,reopened,review_requested,review_request_removed,labeled,unlabeled,closed]
-  pull_request_review:
-    types: [submitted,edited,dismissed]
-
-jobs:
-  manage-project:
-    permissions:
-      issues: write
-    uses: linuxserver/github-workflows/.github/workflows/issue-pr-tracker.yml@v1
-    secrets: inherit

.github/workflows/call_issues_cron.yml

@@ -1,13 +0,0 @@
-name: Mark stale issues and pull requests
-on:
-  schedule:
-    - cron:  '31 1 * * *'
-  workflow_dispatch:
-
-jobs:
-  stale:
-    permissions:
-      issues: write
-      pull-requests: write
-    uses: linuxserver/github-workflows/.github/workflows/issues-cron.yml@v1
-    secrets: inherit

.github/workflows/external_trigger.yml

@@ -4,26 +4,24 @@ on:
   workflow_dispatch:
 
 jobs:
-  external-trigger-master:
+  external-trigger-focal:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v2.3.3
 
       - name: External Trigger
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/focal'
         run: |
-          if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_CODE_SERVER_MASTER }}" ]; then
+          if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_CODE_SERVER_FOCAL }}" ]; then
-            echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_CODE_SERVER_MASTER is set; skipping trigger. ****"
+            echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_CODE_SERVER_FOCAL is set; skipping trigger. ****"
-            echo "Github secret \`PAUSE_EXTERNAL_TRIGGER_CODE_SERVER_MASTER\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
             exit 0
           fi
-          echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_CODE_SERVER_MASTER\". ****"
+          echo "**** External trigger running off of focal branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_CODE_SERVER_FOCAL\". ****"
-          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 "**** Retrieving external version ****"
-          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||')
+          EXT_RELEASE=$(curl -sX GET https://registry.yarnpkg.com/code-server | jq -r '."dist-tags".latest' | sed 's|^|v|')
           if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
             echo "**** Can't retrieve external version, exiting ****"
-            FAILURE_REASON="Can't retrieve external version for code-server branch master"
+            FAILURE_REASON="Can't retrieve external version for code-server branch focal"
             GHA_TRIGGER_URL="https://github.com/linuxserver/docker-code-server/actions/runs/${{ github.run_id }}"
             curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680,
               "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n**Trigger URL:** '"${GHA_TRIGGER_URL}"' \n"}],
@@ -32,10 +30,9 @@ jobs:
           fi
           EXT_RELEASE=$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g')
           echo "**** External version: ${EXT_RELEASE} ****"
-          echo "External version: ${EXT_RELEASE}" >> $GITHUB_STEP_SUMMARY
           echo "**** Retrieving last pushed version ****"
           image="linuxserver/code-server"
-          tag="latest"
+          tag="focal"
           token=$(curl -sX GET \
             "https://ghcr.io/token?scope=repository%3Alinuxserver%2Fcode-server%3Apull" \
             | jq -r '.token')
@@ -51,37 +48,29 @@ jobs:
               | jq -r '.config.digest')
           image_info=$(curl -sL \
             --header "Authorization: Bearer ${token}" \
-            "https://ghcr.io/v2/${image}/blobs/${digest}")
+            "https://ghcr.io/v2/${image}/blobs/${digest}" \
-          if [[ $(echo $image_info | jq -r '.container_config') == "null" ]]; then
+            | jq -r '.container_config')
-            image_info=$(echo $image_info | jq -r '.config')
-          else
-            image_info=$(echo $image_info | jq -r '.container_config')
-          fi
           IMAGE_RELEASE=$(echo ${image_info} | jq -r '.Labels.build_version' | awk '{print $3}')
           IMAGE_VERSION=$(echo ${IMAGE_RELEASE} | awk -F'-ls' '{print $1}')
           if [ -z "${IMAGE_VERSION}" ]; then
             echo "**** Can't retrieve last pushed version, exiting ****"
-            FAILURE_REASON="Can't retrieve last pushed version for code-server tag latest"
+            FAILURE_REASON="Can't retrieve last pushed version for code-server tag focal"
             curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680,
               "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}],
               "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
             exit 1
           fi
           echo "**** Last pushed version: ${IMAGE_VERSION} ****"
-          echo "Last pushed version: ${IMAGE_VERSION}" >> $GITHUB_STEP_SUMMARY
           if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then
             echo "**** Version ${EXT_RELEASE} already pushed, exiting ****"
-            echo "Version ${EXT_RELEASE} already pushed, exiting" >> $GITHUB_STEP_SUMMARY
             exit 0
-          elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-code-server/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then
+          elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-code-server/job/focal/lastBuild/api/json | jq -r '.building') == "true" ]; then
             echo "**** New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting ****"
-            echo "New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY
             exit 0
           else
             echo "**** New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build ****"
-            echo "New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build" >> $GITHUB_STEP_SUMMARY
             response=$(curl -iX POST \
-              https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-code-server/job/master/buildWithParameters?PACKAGE_CHECK=false \
+              https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-code-server/job/focal/buildWithParameters?PACKAGE_CHECK=false \
               --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 ****"
@@ -89,7 +78,6 @@ jobs:
             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" \
@@ -97,7 +85,7 @@ jobs:
               --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}"
+            TRIGGER_REASON="A version change was detected for code-server tag focal. 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 }}

.github/workflows/external_trigger_scheduler.yml

@@ -2,14 +2,14 @@ name: External Trigger Scheduler
 
 on:
   schedule:
-    - cron:  '32 * * * *'
+    - cron:  '41 * * * *'
   workflow_dispatch:
 
 jobs:
   external-trigger-scheduler:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v2.3.3
         with:
           fetch-depth: '0'
 
@@ -17,18 +17,18 @@ jobs:
         run: |
           echo "**** Branches found: ****"
           git for-each-ref --format='%(refname:short)' refs/remotes
+          echo "**** Pulling the yq docker image ****"
+          docker pull ghcr.io/linuxserver/yq
           for br in $(git for-each-ref --format='%(refname:short)' refs/remotes)
           do
             br=$(echo "$br" | sed 's|origin/||g')
             echo "**** Evaluating branch ${br} ****"
-            ls_jenkins_vars=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-code-server/${br}/jenkins-vars.yml)
+            ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-code-server/${br}/jenkins-vars.yml \
-            ls_branch=$(echo "${ls_jenkins_vars}" | yq -r '.ls_branch')
+              | docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch)
-            ls_trigger=$(echo "${ls_jenkins_vars}" | yq -r '.external_type')
+            if [ "$br" == "$ls_branch" ]; then
-            if [[ "${br}" == "${ls_branch}" ]] && [[ "${ls_trigger}" != "os" ]]; then
+              echo "**** Branch ${br} appears to be live; checking workflow. ****"
-              echo "**** Branch ${br} appears to be live and trigger is not os; checking workflow. ****"
               if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-code-server/${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
                 curl -iX POST \
                   -H "Authorization: token ${{ secrets.CR_PAT }}" \
                   -H "Accept: application/vnd.github.v3+json" \
@@ -36,10 +36,8 @@ jobs:
                   https://api.github.com/repos/linuxserver/docker-code-server/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
               fi
             else
-              echo "**** ${br} is either a dev branch, or has no external version; skipping trigger. ****"
+              echo "**** ${br} appears to be a dev branch; skipping trigger. ****"
-              echo "Skipping branch ${br} due to being detected as dev branch or having no external version." >> $GITHUB_STEP_SUMMARY
             fi
           done

.github/workflows/greetings.yml

@@ -8,6 +8,6 @@ jobs:
     steps:
     - uses: actions/first-interaction@v1
       with:
-        issue-message: 'Thanks for opening your first issue here! Be sure to follow the relevant issue templates, or risk having this issue marked as invalid.'
+        issue-message: 'Thanks for opening your first issue here! Be sure to follow the [bug](https://github.com/linuxserver/docker-code-server/blob/focal/.github/ISSUE_TEMPLATE/issue.bug.md) or [feature](https://github.com/linuxserver/docker-code-server/blob/focal/.github/ISSUE_TEMPLATE/issue.feature.md) issue templates!'
-        pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-code-server/blob/master/.github/PULL_REQUEST_TEMPLATE.md)!'
+        pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-code-server/blob/focal/.github/PULL_REQUEST_TEMPLATE.md)!'
         repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/package_trigger.yml

@@ -4,28 +4,25 @@ on:
   workflow_dispatch:
 
 jobs:
-  package-trigger-master:
+  package-trigger-focal:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v2.3.3
 
       - name: Package Trigger
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/focal'
         run: |
-          if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_CODE_SERVER_MASTER }}" ]; then
+          if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_CODE_SERVER_FOCAL }}" ]; then
-            echo "**** Github secret PAUSE_PACKAGE_TRIGGER_CODE_SERVER_MASTER is set; skipping trigger. ****"
+            echo "**** Github secret PAUSE_PACKAGE_TRIGGER_CODE_SERVER_FOCAL is set; skipping trigger. ****"
-            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
+          if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-code-server/job/focal/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 master branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_CODE_SERVER_MASTER\". ****"
+          echo "**** Package trigger running off of focal branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_CODE_SERVER_FOCAL\". ****"
-          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 \
+            https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-code-server/job/focal/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 ****"
@@ -33,7 +30,6 @@ jobs:
           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" \

.github/workflows/package_trigger_scheduler.yml

@@ -2,14 +2,14 @@ name: Package Trigger Scheduler
 
 on:
   schedule:
-    - cron:  '0 20 * * 6'
+    - cron:  '00 12 * * 0'
   workflow_dispatch:
 
 jobs:
   package-trigger-scheduler:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v2.3.3
         with:
           fetch-depth: '0'
 
@@ -17,16 +17,18 @@ jobs:
         run: |
           echo "**** Branches found: ****"
           git for-each-ref --format='%(refname:short)' refs/remotes
+          echo "**** Pulling the yq docker image ****"
+          docker pull ghcr.io/linuxserver/yq
           for br in $(git for-each-ref --format='%(refname:short)' 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-code-server/${br}/jenkins-vars.yml | yq -r '.ls_branch')
+            ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-code-server/${br}/jenkins-vars.yml \
+              | docker run --rm -i --entrypoint yq ghcr.io/linuxserver/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-code-server/${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 }}" \
@@ -36,11 +38,9 @@ jobs:
                 sleep 30
               else
                 echo "**** Workflow doesn't exist; skipping trigger. ****"
-                echo "Skipping branch ${br} due to no package trigger workflow present." >> $GITHUB_STEP_SUMMARY
               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} ****"

.github/workflows/permissions.yml

@@ -1,10 +0,0 @@
-name: Permission check
-on:
-  pull_request_target:
-    paths:
-      - '**/run'
-      - '**/finish'
-      - '**/check'
-jobs:
-  permission_check:
-    uses: linuxserver/github-workflows/.github/workflows/init-svc-executable-permissions.yml@v1

.github/workflows/stale.yml

@@ -0,0 +1,23 @@
+name: Mark stale issues and pull requests
+
+on:
+  schedule:
+  - cron: "30 1 * * *"
+
+jobs:
+  stale:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/stale@v3
+      with:
+        stale-issue-message: "This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions."
+        stale-pr-message: "This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions."
+        stale-issue-label: 'no-issue-activity'
+        stale-pr-label: 'no-pr-activity'
+        days-before-stale: 30
+        days-before-close: 365
+        exempt-issue-labels: 'awaiting-approval,work-in-progress'
+        exempt-pr-labels: 'awaiting-approval,work-in-progress'
+        repo-token: ${{ secrets.GITHUB_TOKEN }}

Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy
+FROM ghcr.io/linuxserver/baseimage-ubuntu:focal
 
 # set version label
 ARG BUILD_DATE
@@ -8,32 +8,54 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="aptalca"
 
 # environment settings
-ARG DEBIAN_FRONTEND="noninteractive"
 ENV HOME="/config"
 
 RUN \
-  echo "**** install runtime dependencies ****" && \
+  echo "**** install node repo ****" && \
   apt-get update && \
+  apt-get install -y \
+    gnupg && \
+  curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
+  echo 'deb https://deb.nodesource.com/node_14.x focal main' \
+    > /etc/apt/sources.list.d/nodesource.list && \
+  curl -s https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
+  echo 'deb https://dl.yarnpkg.com/debian/ stable main' \
+    > /etc/apt/sources.list.d/yarn.list && \
+  echo "**** install build dependencies ****" && \
+  apt-get update && \
+  apt-get install -y \
+    build-essential \
+    libsecret-1-dev \
+    libx11-dev \
+    libxkbfile-dev \
+    pkg-config \
+    python3 && \
+  echo "**** install runtime dependencies ****" && \
   apt-get install -y \
     git \
     jq \
-    libatomic1 \
     nano \
     net-tools \
-    netcat \
+    nodejs \
-    sudo && \
+    sudo \
+    yarn && \
   echo "**** install code-server ****" && \
   if [ -z ${CODE_RELEASE+x} ]; then \
-    CODE_RELEASE=$(curl -sX GET https://api.github.com/repos/coder/code-server/releases/latest \
+    CODE_RELEASE=$(curl -sX GET https://registry.yarnpkg.com/code-server \
-      | awk '/tag_name/{print $4;exit}' FS='[""]' | sed 's|^v||'); \
+    | jq -r '."dist-tags".latest' | sed 's|^|v|'); \
   fi && \
-  mkdir -p /app/code-server && \
+  CODE_VERSION=$(echo "$CODE_RELEASE" | awk '{print substr($1,2); }') && \
-  curl -o \
+  npm config set python python3 \
-    /tmp/code-server.tar.gz -L \
+  yarn config set network-timeout 600000 -g && \
-    "https://github.com/coder/code-server/releases/download/v${CODE_RELEASE}/code-server-${CODE_RELEASE}-linux-amd64.tar.gz" && \
+  yarn --production --verbose --frozen-lockfile global add code-server@"$CODE_VERSION" && \
-  tar xf /tmp/code-server.tar.gz -C \
+  yarn cache clean && \
-    /app/code-server --strip-components=1 && \
   echo "**** clean up ****" && \
+  apt-get purge --auto-remove -y \
+    build-essential \
+    libx11-dev \
+    libxkbfile-dev \
+    libsecret-1-dev \
+    pkg-config && \
   apt-get clean && \
   rm -rf \
     /config/* \

Dockerfile.aarch64

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-focal
 
 # set version label
 ARG BUILD_DATE
@@ -8,32 +8,54 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="aptalca"
 
 # environment settings
-ARG DEBIAN_FRONTEND="noninteractive"
 ENV HOME="/config"
 
 RUN \
-  echo "**** install runtime dependencies ****" && \
+  echo "**** install node repo ****" && \
   apt-get update && \
+  apt-get install -y \
+    gnupg && \
+  curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
+  echo 'deb https://deb.nodesource.com/node_14.x focal main' \
+    > /etc/apt/sources.list.d/nodesource.list && \
+  curl -s https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
+  echo 'deb https://dl.yarnpkg.com/debian/ stable main' \
+    > /etc/apt/sources.list.d/yarn.list && \
+  echo "**** install build dependencies ****" && \
+  apt-get update && \
+  apt-get install -y \
+    build-essential \
+    libsecret-1-dev \
+    libx11-dev \
+    libxkbfile-dev \
+    pkg-config \
+    python3 && \
+  echo "**** install runtime dependencies ****" && \
   apt-get install -y \
     git \
     jq \
-    libatomic1 \
     nano \
     net-tools \
-    netcat \
+    nodejs \
-    sudo && \
+    sudo \
+    yarn && \
   echo "**** install code-server ****" && \
   if [ -z ${CODE_RELEASE+x} ]; then \
-    CODE_RELEASE=$(curl -sX GET https://api.github.com/repos/coder/code-server/releases/latest \
+    CODE_RELEASE=$(curl -sX GET https://registry.yarnpkg.com/code-server \
-      | awk '/tag_name/{print $4;exit}' FS='[""]' | sed 's|^v||'); \
+    | jq -r '."dist-tags".latest' | sed 's|^|v|'); \
   fi && \
-  mkdir -p /app/code-server && \
+  CODE_VERSION=$(echo "$CODE_RELEASE" | awk '{print substr($1,2); }') && \
-  curl -o \
+  npm config set python python3 \
-    /tmp/code-server.tar.gz -L \
+  yarn config set network-timeout 600000 -g && \
-    "https://github.com/coder/code-server/releases/download/v${CODE_RELEASE}/code-server-${CODE_RELEASE}-linux-arm64.tar.gz" && \
+  yarn --production --verbose --frozen-lockfile global add code-server@"$CODE_VERSION" && \
-  tar xf /tmp/code-server.tar.gz -C \
+  yarn cache clean && \
-    /app/code-server --strip-components=1 && \
   echo "**** clean up ****" && \
+  apt-get purge --auto-remove -y \
+    build-essential \
+    libx11-dev \
+    libxkbfile-dev \
+    libsecret-1-dev \
+    pkg-config && \
   apt-get clean && \
   rm -rf \
     /config/* \

Dockerfile.armhf

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-jammy
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-focal
 
 # set version label
 ARG BUILD_DATE
@@ -8,32 +8,54 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="aptalca"
 
 # environment settings
-ARG DEBIAN_FRONTEND="noninteractive"
 ENV HOME="/config"
 
 RUN \
-  echo "**** install runtime dependencies ****" && \
+  echo "**** install node repo ****" && \
   apt-get update && \
+  apt-get install -y \
+    gnupg && \
+  curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
+  echo 'deb https://deb.nodesource.com/node_14.x focal main' \
+    > /etc/apt/sources.list.d/nodesource.list && \
+  curl -s https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
+  echo 'deb https://dl.yarnpkg.com/debian/ stable main' \
+    > /etc/apt/sources.list.d/yarn.list && \
+  echo "**** install build dependencies ****" && \
+  apt-get update && \
+  apt-get install -y \
+    build-essential \
+    libsecret-1-dev \
+    libx11-dev \
+    libxkbfile-dev \
+    pkg-config \
+    python3 && \
+  echo "**** install runtime dependencies ****" && \
   apt-get install -y \
     git \
     jq \
-    libatomic1 \
     nano \
     net-tools \
-    netcat \
+    nodejs \
-    sudo && \
+    sudo \
+    yarn && \
   echo "**** install code-server ****" && \
   if [ -z ${CODE_RELEASE+x} ]; then \
-    CODE_RELEASE=$(curl -sX GET https://api.github.com/repos/coder/code-server/releases/latest \
+    CODE_RELEASE=$(curl -sX GET https://registry.yarnpkg.com/code-server \
-      | awk '/tag_name/{print $4;exit}' FS='[""]' | sed 's|^v||'); \
+    | jq -r '."dist-tags".latest' | sed 's|^|v|'); \
   fi && \
-  mkdir -p /app/code-server && \
+  CODE_VERSION=$(echo "$CODE_RELEASE" | awk '{print substr($1,2); }') && \
-  curl -o \
+  npm config set python python3 \
-    /tmp/code-server.tar.gz -L \
+  yarn config set network-timeout 600000 -g && \
-    "https://github.com/coder/code-server/releases/download/v${CODE_RELEASE}/code-server-${CODE_RELEASE}-linux-armv7l.tar.gz" && \
+  yarn --production --verbose --frozen-lockfile global add code-server@"$CODE_VERSION" && \
-  tar xf /tmp/code-server.tar.gz -C \
+  yarn cache clean && \
-    /app/code-server --strip-components=1 && \
   echo "**** clean up ****" && \
+  apt-get purge --auto-remove -y \
+    build-essential \
+    libx11-dev \
+    libxkbfile-dev \
+    libsecret-1-dev \
+    pkg-config && \
   apt-get clean && \
   rm -rf \
     /config/* \

Jenkinsfile

@@ -39,16 +39,10 @@ pipeline {
     // Setup all the basic environment variables needed for the build
     stage("Set ENV Variables base"){
       steps{
-        sh '''#! /bin/bash
-              containers=$(docker ps -aq)
-              if [[ -n "${containers}" ]]; then
-                docker stop ${containers}
-              fi
-              docker system prune -af --volumes || : '''
         script{
           env.EXIT_STATUS = ''
           env.LS_RELEASE = sh(
-            script: '''docker run --rm quay.io/skopeo/stable:v1 inspect docker://ghcr.io/${LS_USER}/${CONTAINER_NAME}:latest 2>/dev/null | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
+            script: '''docker run --rm ghcr.io/linuxserver/alexeiled-skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':focal 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
             returnStdout: true).trim()
           env.LS_RELEASE_NOTES = sh(
             script: '''cat readme-vars.yml | awk -F \\" '/date: "[0-9][0-9].[0-9][0-9].[0-9][0-9]:/ {print $4;exit;}' | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''',
@@ -62,7 +56,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.md ./.github/ISSUE_TEMPLATE/issue.feature.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml'
         }
         script{
           env.LS_RELEASE_NUMBER = sh(
@@ -110,7 +104,7 @@ pipeline {
       steps{
         script{
           env.EXT_RELEASE = sh(
-            script: ''' curl -sX GET https://api.github.com/repos/coder/code-server/releases/latest | jq -r '.tag_name' | sed 's|^v||' ''',
+            script: ''' curl -sX GET https://registry.yarnpkg.com/code-server | jq -r '."dist-tags".latest' | sed 's|^|v|' ''',
             returnStdout: true).trim()
             env.RELEASE_LINK = 'custom_command'
         }
@@ -124,11 +118,12 @@ pipeline {
             script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g' ''',
             returnStdout: true).trim()
 
-          def semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)\.(\d+)/
+          env.SEMVER = (new Date()).format('YYYY.MM.dd')
+          def semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)\.(\d+)$/
           if (semver.find()) {
             env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${semver[0][3]}"
           } else {
-            semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)(?:\.(\d+))?(.*)/
+            semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)(?:\.(\d+))?(.*)$/
             if (semver.find()) {
               if (semver[0][3]) {
                 env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${semver[0][3]}"
@@ -138,22 +133,14 @@ pipeline {
             }
           }
 
-          if (env.SEMVER != null) {
+          println("SEMVER: ${env.SEMVER}")
-            if (BRANCH_NAME != "master" && BRANCH_NAME != "main") {
-              env.SEMVER = "${env.SEMVER}-${BRANCH_NAME}"
-            }
-            println("SEMVER: ${env.SEMVER}")
-          } else {
-            println("No SEMVER detected")
-          }
-
         }
       }
     }
-    // If this is a master build use live docker endpoints
+    // If this is a focal build use live docker endpoints
     stage("Set ENV live build"){
       when {
-        branch "master"
+        branch "focal"
         environment name: 'CHANGE_ID', value: ''
       }
       steps {
@@ -163,20 +150,20 @@ pipeline {
           env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME
           env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME
           if (env.MULTIARCH == 'true') {
-            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
+            env.CI_TAGS = 'amd64-focal-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-focal-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-focal-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
           } else {
-            env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
+            env.CI_TAGS = 'focal-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
           }
           env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
-          env.META_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
+          env.META_TAG = 'focal-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
-          env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
+          env.EXT_RELEASE_TAG = 'focal-version-' + env.EXT_RELEASE_CLEAN
         }
       }
     }
     // If this is a dev build use dev docker endpoints
     stage("Set ENV dev build"){
       when {
-        not {branch "master"}
+        not {branch "focal"}
         environment name: 'CHANGE_ID', value: ''
       }
       steps {
@@ -186,13 +173,13 @@ pipeline {
           env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
           env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME
           if (env.MULTIARCH == 'true') {
-            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
+            env.CI_TAGS = 'amd64-focal-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-focal-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-focal-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
           } else {
-            env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
+            env.CI_TAGS = 'focal-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
           }
           env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
-          env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
+          env.META_TAG = 'focal-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
-          env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
+          env.EXT_RELEASE_TAG = 'focal-version-' + env.EXT_RELEASE_CLEAN
           env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/'
         }
       }
@@ -209,13 +196,13 @@ pipeline {
           env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
           env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME
           if (env.MULTIARCH == 'true') {
-            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
+            env.CI_TAGS = 'amd64-focal-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-focal-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-focal-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
           } else {
-            env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
+            env.CI_TAGS = 'focal-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
           }
-          env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
+          env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
-          env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
+          env.META_TAG = 'focal-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
-          env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
+          env.EXT_RELEASE_TAG = 'focal-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/'
         }
@@ -234,23 +221,26 @@ pipeline {
           script{
             env.SHELLCHECK_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/shellcheck-result.xml'
           }
-          sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-jenkins-builder/master/checkrun.sh | /bin/bash'''
+          sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-shellcheck/master/checkrun.sh | /bin/bash'''
           sh '''#! /bin/bash
+                set -e
+                docker pull ghcr.io/linuxserver/lsiodev-spaces-file-upload:latest
                 docker run --rm \
-                  -v ${WORKSPACE}:/mnt \
+                -e DESTINATION=\"${IMAGE}/${META_TAG}/shellcheck-result.xml\" \
-                  -e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \
+                -e FILE_NAME="shellcheck-result.xml" \
-                  -e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \
+                -e MIMETYPE="text/xml" \
-                  ghcr.io/linuxserver/baseimage-alpine:3.17 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
+                -v ${WORKSPACE}:/mnt \
-                    apk add --no-cache py3-pip && \
+                -e SECRET_KEY=\"${S3_SECRET}\" \
-                    pip install s3cmd && \
+                -e ACCESS_KEY=\"${S3_KEY}\" \
-                    s3cmd put --no-preserve --acl-public -m text/xml /mnt/shellcheck-result.xml s3://ci-tests.linuxserver.io/${IMAGE}/${META_TAG}/shellcheck-result.xml" || :'''
+                -t ghcr.io/linuxserver/lsiodev-spaces-file-upload:latest \
+                python /upload.py'''
         }
       }
     }
     // Use helper containers to render templated files
     stage('Update-Templates') {
       when {
-        branch "master"
+        branch "focal"
         environment name: 'CHANGE_ID', value: ''
         expression {
           env.CONTAINER_NAME != null
@@ -261,13 +251,13 @@ 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=master -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest 
+              docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=focal -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest 
               # 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}
                 cd ${TEMPDIR}/repo/${LS_REPO}
-                git checkout -f master
+                git checkout -f focal
                 cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/
                 git add Jenkinsfile
                 git commit -m 'Bot Updating Templated Files'
@@ -280,7 +270,7 @@ pipeline {
                 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"
+              OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md"
               for i in ${OLD_TEMPLATES}; do
                 if [[ -f "${i}" ]]; then
                   TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
@@ -290,14 +280,14 @@ pipeline {
                 mkdir -p ${TEMPDIR}/repo
                 git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
                 cd ${TEMPDIR}/repo/${LS_REPO}
-                git checkout -f master
+                git checkout -f focal
                 for i in ${TEMPLATES_TO_DELETE}; do
                   git rm "${i}"
                 done
                 git commit -m 'Bot Updating Templated Files'
                 git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
                 echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
-                echo "Deleting old and deprecated templates"
+                echo "Deleting old templates"
                 rm -Rf ${TEMPDIR}
                 exit 0
               else
@@ -311,7 +301,7 @@ pipeline {
                 mkdir -p ${TEMPDIR}/repo
                 git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
                 cd ${TEMPDIR}/repo/${LS_REPO}
-                git checkout -f master
+                git checkout -f focal
                 cd ${TEMPDIR}/docker-${CONTAINER_NAME}
                 mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows
                 mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE
@@ -342,17 +332,13 @@ pipeline {
               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}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -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/
                 if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then
-                  echo "Image is on the ignore list, marking Unraid template as deprecated"
+                  echo "Image is on the ignore list, removing Unraid template"
-                  cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
+                  git rm unraid/${CONTAINER_NAME}.xml || :
-                  git add -u unraid/${CONTAINER_NAME}.xml
+                  git commit -m 'Bot Removing Deprecated Unraid Template' || :
-                  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
@@ -371,7 +357,7 @@ pipeline {
     // Exit the build if the Templated files were just updated
     stage('Template-exit') {
       when {
-        branch "master"
+        branch "focal"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'FILES_UPDATED', value: 'true'
         expression {
@@ -384,26 +370,6 @@ pipeline {
         }
       }
     }
-    // If this is a master build check the S6 service file perms
-    stage("Check S6 Service file Permissions"){
-      when {
-        branch "master"
-        environment name: 'CHANGE_ID', value: ''
-        environment name: 'EXIT_STATUS', value: ''
-      }
-      steps {
-        script{
-          sh '''#! /bin/bash
-            WRONG_PERM=$(find ./  -path "./.git" -prune -o \\( -name "run" -o -name "finish" -o -name "check" \\) -not -perm -u=x,g=x,o=x -print)
-            if [[ -n "${WRONG_PERM}" ]]; then
-              echo "The following S6 service files are missing the executable bit; canceling the faulty build: ${WRONG_PERM}"
-              exit 1
-            else
-              echo "S6 service file perms look good."
-            fi '''
-        }
-      }
-    }
     /* #######################
            GitLab Mirroring
        ####################### */
@@ -430,15 +396,16 @@ pipeline {
     // Add package to Scarf.sh and set permissions
     stage("Scarf.sh package registry"){
       when {
-        branch "master"
+        branch "focal"
         environment name: 'EXIT_STATUS', value: ''
       }
       steps{
         sh '''#! /bin/bash
-              PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/organizations/linuxserver-ci/packages | jq -r '.[] | select(.name=="linuxserver/code-server") | .uuid' || :)
+              set -e
+              PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/packages | jq -r '.[] | select(.name=="linuxserver/code-server") | .uuid')
               if [ -z "${PACKAGE_UUID}" ]; then
                 echo "Adding package to Scarf.sh"
-                curl -sX POST https://scarf.sh/api/v1/organizations/linuxserver-ci/packages \
+                PACKAGE_UUID=$(curl -sX POST https://scarf.sh/api/v1/packages \
                   -H "Authorization: Bearer ${SCARF_TOKEN}" \
                   -H "Content-Type: application/json" \
                   -d '{"name":"linuxserver/code-server",\
@@ -446,10 +413,22 @@ pipeline {
                        "libraryType":"docker",\
                        "website":"https://github.com/linuxserver/docker-code-server",\
                        "backendUrl":"https://ghcr.io/linuxserver/code-server",\
-                       "publicUrl":"https://lscr.io/linuxserver/code-server"}' || :
+                       "publicUrl":"https://lscr.io/linuxserver/code-server"}' \
+                  | jq -r .uuid)
               else
                 echo "Package already exists on Scarf.sh"
               fi
+              echo "Setting permissions on Scarf.sh for package ${PACKAGE_UUID}"
+              curl -X POST https://scarf.sh/api/v1/packages/${PACKAGE_UUID}/permissions \
+                -H "Authorization: Bearer ${SCARF_TOKEN}" \
+                -H "Content-Type: application/json" \
+                -d '[{"userQuery":"Spad","permissionLevel":"admin"},\
+                     {"userQuery":"roxedus","permissionLevel":"admin"},\
+                     {"userQuery":"nemchik","permissionLevel":"admin"},\
+                     {"userQuery":"driz","permissionLevel":"admin"},\
+                     {"userQuery":"aptalca","permissionLevel":"admin"},\
+                     {"userQuery":"saarg","permissionLevel":"admin"},\
+                     {"userQuery":"Stark","permissionLevel":"admin"}]'
            '''
       } 
     }
@@ -466,8 +445,7 @@ pipeline {
       }
       steps {
         echo "Running on node: ${NODE_NAME}"
-        sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile"
+        sh "docker build \
-        sh "docker buildx build \
           --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
           --label \"org.opencontainers.image.authors=linuxserver.io\" \
           --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-code-server/packages\" \
@@ -480,7 +458,7 @@ pipeline {
           --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
           --label \"org.opencontainers.image.title=Code-server\" \
           --label \"org.opencontainers.image.description=[Code-server](https://coder.com) is VS Code running on a remote server, accessible through the browser.  - Code on your Chromebook, tablet, and laptop with a consistent dev environment.  - If you have a Windows or Mac workstation, more easily develop for Linux.  - Take advantage of large cloud servers to speed up tests, compilations, downloads, and more.  - Preserve battery life when you're on the go.  - All intensive computation runs on your server.  - You're no longer running excess instances of Chrome.\" \
-          --no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \
+          --no-cache --pull -t ${IMAGE}:${META_TAG} \
           --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
       }
     }
@@ -497,8 +475,7 @@ pipeline {
         stage('Build X86') {
           steps {
             echo "Running on node: ${NODE_NAME}"
-            sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile"
+            sh "docker build \
-            sh "docker buildx build \
               --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
               --label \"org.opencontainers.image.authors=linuxserver.io\" \
               --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-code-server/packages\" \
@@ -511,7 +488,7 @@ pipeline {
               --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
               --label \"org.opencontainers.image.title=Code-server\" \
               --label \"org.opencontainers.image.description=[Code-server](https://coder.com) is VS Code running on a remote server, accessible through the browser.  - Code on your Chromebook, tablet, and laptop with a consistent dev environment.  - If you have a Windows or Mac workstation, more easily develop for Linux.  - Take advantage of large cloud servers to speed up tests, compilations, downloads, and more.  - Preserve battery life when you're on the go.  - All intensive computation runs on your server.  - You're no longer running excess instances of Chrome.\" \
-              --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \
+              --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} \
               --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
           }
         }
@@ -525,8 +502,7 @@ pipeline {
             sh '''#! /bin/bash
                   echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
                '''
-            sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile.armhf"
+            sh "docker build \
-            sh "docker buildx build \
               --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
               --label \"org.opencontainers.image.authors=linuxserver.io\" \
               --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-code-server/packages\" \
@@ -539,18 +515,15 @@ pipeline {
               --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
               --label \"org.opencontainers.image.title=Code-server\" \
               --label \"org.opencontainers.image.description=[Code-server](https://coder.com) is VS Code running on a remote server, accessible through the browser.  - Code on your Chromebook, tablet, and laptop with a consistent dev environment.  - If you have a Windows or Mac workstation, more easily develop for Linux.  - Take advantage of large cloud servers to speed up tests, compilations, downloads, and more.  - Preserve battery life when you're on the go.  - All intensive computation runs on your server.  - You're no longer running excess instances of Chrome.\" \
-              --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} --platform=linux/arm/v7 \
+              --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \
               --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
             sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
             retry(5) {
               sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
             }
-            sh '''#! /bin/bash
+            sh '''docker rmi \
-                  containers=$(docker ps -aq)
+                  ${IMAGE}:arm32v7-${META_TAG} \
-                  if [[ -n "${containers}" ]]; then
+                  ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
-                    docker stop ${containers}
-                  fi
-                  docker system prune -af --volumes || : '''
           }
         }
         stage('Build ARM64') {
@@ -563,8 +536,7 @@ pipeline {
             sh '''#! /bin/bash
                   echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
                '''
-            sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile.aarch64"
+            sh "docker build \
-            sh "docker buildx build \
               --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
               --label \"org.opencontainers.image.authors=linuxserver.io\" \
               --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-code-server/packages\" \
@@ -577,18 +549,15 @@ pipeline {
               --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
               --label \"org.opencontainers.image.title=Code-server\" \
               --label \"org.opencontainers.image.description=[Code-server](https://coder.com) is VS Code running on a remote server, accessible through the browser.  - Code on your Chromebook, tablet, and laptop with a consistent dev environment.  - If you have a Windows or Mac workstation, more easily develop for Linux.  - Take advantage of large cloud servers to speed up tests, compilations, downloads, and more.  - Preserve battery life when you're on the go.  - All intensive computation runs on your server.  - You're no longer running excess instances of Chrome.\" \
-              --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \
+              --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \
               --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
+            sh '''docker rmi \
-                  containers=$(docker ps -aq)
+                  ${IMAGE}:arm64v8-${META_TAG} \
-                  if [[ -n "${containers}" ]]; then
+                  ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
-                    docker stop ${containers}
-                  fi
-                  docker system prune -af --volumes || : '''
           }
         }
       }
@@ -596,7 +565,7 @@ pipeline {
     // Take the image we just built and dump package versions for comparison
     stage('Update-packages') {
       when {
-        branch "master"
+        branch "focal"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'EXIT_STATUS', value: ''
       }
@@ -609,17 +578,31 @@ pipeline {
               else
                 LOCAL_CONTAINER=${IMAGE}:${META_TAG}
               fi
-              touch ${TEMPDIR}/package_versions.txt
+              if [ "${DIST_IMAGE}" == "alpine" ]; then
-              docker run --rm \
+                docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
-                -v /var/run/docker.sock:/var/run/docker.sock:ro \
+                  apk info -v > /tmp/package_versions.txt && \
-                -v ${TEMPDIR}:/tmp \
+                  sort -o /tmp/package_versions.txt  /tmp/package_versions.txt && \
-                ghcr.io/anchore/syft:latest \
+                  chmod 777 /tmp/package_versions.txt'
-                ${LOCAL_CONTAINER} -o table=/tmp/package_versions.txt
+              elif [ "${DIST_IMAGE}" == "ubuntu" ]; then
+                docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
+                  apt list -qq --installed | sed "s#/.*now ##g" | cut -d" " -f1 > /tmp/package_versions.txt && \
+                  sort -o /tmp/package_versions.txt  /tmp/package_versions.txt && \
+                  chmod 777 /tmp/package_versions.txt'
+              elif [ "${DIST_IMAGE}" == "fedora" ]; then
+                docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
+                  rpm -qa > /tmp/package_versions.txt && \
+                  sort -o /tmp/package_versions.txt  /tmp/package_versions.txt && \
+                  chmod 777 /tmp/package_versions.txt'
+              elif [ "${DIST_IMAGE}" == "arch" ]; then
+                docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
+                  pacman -Q > /tmp/package_versions.txt && \
+                  chmod 777 /tmp/package_versions.txt'
+              fi
               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"
               if [ "${NEW_PACKAGE_TAG}" != "${PACKAGE_TAG}" ]; then
                 git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/${LS_REPO}
-                git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f master
+                git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f focal
                 cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/
                 cd ${TEMPDIR}/${LS_REPO}/
                 wait
@@ -643,12 +626,19 @@ pipeline {
     // Exit the build if the package file was just updated
     stage('PACKAGE-exit') {
       when {
-        branch "master"
+        branch "focal"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'PACKAGE_UPDATED', value: 'true'
         environment name: 'EXIT_STATUS', value: ''
       }
       steps {
+        sh '''#! /bin/bash
+              echo "Packages were updated. Cleaning up the image and exiting."
+              if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
+                docker rmi ${IMAGE}:amd64-${META_TAG}
+              else
+                docker rmi ${IMAGE}:${META_TAG}
+              fi'''
         script{
           env.EXIT_STATUS = 'ABORTED'
         }
@@ -657,7 +647,7 @@ pipeline {
     // Exit the build if this is just a package check and there are no changes to push
     stage('PACKAGECHECK-exit') {
       when {
-        branch "master"
+        branch "focal"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'PACKAGE_UPDATED', value: 'false'
         environment name: 'EXIT_STATUS', value: ''
@@ -666,6 +656,13 @@ pipeline {
         }
       }
       steps {
+        sh '''#! /bin/bash
+              echo "There are no package updates. Cleaning up the image and exiting."
+              if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
+                docker rmi ${IMAGE}:amd64-${META_TAG}
+              else
+                docker rmi ${IMAGE}:${META_TAG}
+              fi'''
         script{
           env.EXIT_STATUS = 'ABORTED'
         }
@@ -687,7 +684,6 @@ pipeline {
         ]) {
           script{
             env.CI_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/index.html'
-            env.CI_JSON_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/report.json'
           }
           sh '''#! /bin/bash
                 set -e
@@ -714,8 +710,10 @@ pipeline {
                 -e WEB_SCREENSHOT=\"${CI_WEB}\" \
                 -e WEB_AUTH=\"${CI_AUTH}\" \
                 -e WEB_PATH=\"${CI_WEBPATH}\" \
+                -e DO_REGION="ams3" \
+                -e DO_BUCKET="lsio-ci" \
                 -t ghcr.io/linuxserver/ci:latest \
-                python3 test_build.py'''
+                python /ci/ci.py'''
         }
       }
     }
@@ -752,20 +750,25 @@ pipeline {
                   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}:latest
+                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:focal
                     docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG}
-                    if [ -n "${SEMVER}" ]; then
+                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER}
-                      docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER}
+                    docker push ${PUSHIMAGE}:focal
-                    fi
-                    docker push ${PUSHIMAGE}:latest
                     docker push ${PUSHIMAGE}:${META_TAG}
                     docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG}
-                    if [ -n "${SEMVER}" ]; then
+                    docker push ${PUSHIMAGE}:${SEMVER}
-                     docker push ${PUSHIMAGE}:${SEMVER}
-                    fi
                   done
                '''
           }
+          sh '''#! /bin/bash
+                for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do
+                  docker rmi \
+                  ${DELETEIMAGE}:${META_TAG} \
+                  ${DELETEIMAGE}:${EXT_RELEASE_TAG} \
+                  ${DELETEIMAGE}:focal \
+                  ${DELETEIMAGE}:${SEMVER} || :
+                done
+             '''
         }
       }
     }
@@ -799,43 +802,39 @@ pipeline {
                   echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
                   if [ "${CI}" == "false" ]; then
                     docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
-                    docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
                     docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
+                    docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
                     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-latest
-                    docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
                     docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG}
-                    docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-latest
-                    docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
                     docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
-                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest
+                    docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-focal
+                    docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-focal
+                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-focal
+                    docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
+                    docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
                     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}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER}
+                    docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER}
-                      docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER}
+                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${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-latest
                     docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
-                    docker push ${MANIFESTIMAGE}:arm32v7-latest
-                    docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
                     docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
-                    docker push ${MANIFESTIMAGE}:arm64v8-latest
+                    docker push ${MANIFESTIMAGE}:amd64-focal
+                    docker push ${MANIFESTIMAGE}:arm32v7-focal
+                    docker push ${MANIFESTIMAGE}:arm64v8-focal
+                    docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
+                    docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
                     docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
-                    if [ -n "${SEMVER}" ]; then
+                    docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
-                      docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
+                    docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER}
-                      docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER}
+                    docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
-                      docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
+                    docker manifest push --purge ${MANIFESTIMAGE}:focal || :
-                    fi
+                    docker manifest create ${MANIFESTIMAGE}:focal ${MANIFESTIMAGE}:amd64-focal ${MANIFESTIMAGE}:arm32v7-focal ${MANIFESTIMAGE}:arm64v8-focal
-                    docker manifest push --purge ${MANIFESTIMAGE}:latest || :
+                    docker manifest annotate ${MANIFESTIMAGE}:focal ${MANIFESTIMAGE}:arm32v7-focal --os linux --arch arm
-                    docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest
+                    docker manifest annotate ${MANIFESTIMAGE}:focal ${MANIFESTIMAGE}:arm64v8-focal --os linux --arch arm64 --variant v8
-                    docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm
-                    docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8
                     docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || :
                     docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
                     docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm
@@ -844,28 +843,44 @@ pipeline {
                     docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
                     docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm
                     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 push --purge ${MANIFESTIMAGE}:${SEMVER} || :
+                    docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
-                      docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
+                    docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm
-                      docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm
+                    docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
-                      docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
+                    docker manifest push --purge ${MANIFESTIMAGE}:focal
-                    fi
-                    docker manifest push --purge ${MANIFESTIMAGE}:latest
                     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} 
-                      docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} 
-                    fi
                   done
                '''
           }
+          sh '''#! /bin/bash
+                for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do
+                  docker rmi \
+                  ${DELETEIMAGE}:amd64-${META_TAG} \
+                  ${DELETEIMAGE}:amd64-focal \
+                  ${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \
+                  ${DELETEIMAGE}:amd64-${SEMVER} \
+                  ${DELETEIMAGE}:arm32v7-${META_TAG} \
+                  ${DELETEIMAGE}:arm32v7-focal \
+                  ${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \
+                  ${DELETEIMAGE}:arm32v7-${SEMVER} \
+                  ${DELETEIMAGE}:arm64v8-${META_TAG} \
+                  ${DELETEIMAGE}:arm64v8-focal \
+                  ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} \
+                  ${DELETEIMAGE}:arm64v8-${SEMVER} || :
+                done
+                docker rmi \
+                ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \
+                ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :
+             '''
         }
       }
     }
     // If this is a public release tag it in the LS Github
     stage('Github-Tag-Push-Release') {
       when {
-        branch "master"
+        branch "focal"
         expression {
           env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
         }
@@ -877,14 +892,14 @@ pipeline {
         sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
         -d '{"tag":"'${META_TAG}'",\
              "object": "'${COMMIT_SHA}'",\
-             "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to master",\
+             "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to focal",\
              "type": "commit",\
              "tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' '''
         echo "Pushing New release for Tag"
         sh '''#! /bin/bash
               echo "Updating to ${EXT_RELEASE_CLEAN}" > releasebody.json
               echo '{"tag_name":"'${META_TAG}'",\
-                     "target_commitish": "master",\
+                     "target_commitish": "focal",\
                      "name": "'${META_TAG}'",\
                      "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Remote Changes:**\\n\\n' > start
               printf '","draft": false,"prerelease": false}' >> releasebody.json
@@ -929,78 +944,12 @@ pipeline {
     stage('Pull Request Comment') {
       when {
         not {environment name: 'CHANGE_ID', value: ''}
+        environment name: 'CI', value: 'true'
         environment name: 'EXIT_STATUS', value: ''
       }
       steps {
-        sh '''#! /bin/bash
+        sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/issues/${PULL_REQUEST}/comments \
-            # Function to retrieve JSON data from URL
+        -d '{"body": "I am a bot, here are the test results for this PR: \\n'${CI_URL}' \\n'${SHELLCHECK_URL}'"}' '''
-            get_json() {
-              local url="$1"
-              local response=$(curl -s "$url")
-              if [ $? -ne 0 ]; then
-                echo "Failed to retrieve JSON data from $url"
-                return 1
-              fi
-              local json=$(echo "$response" | jq .)
-              if [ $? -ne 0 ]; then
-                echo "Failed to parse JSON data from $url"
-                return 1
-              fi
-              echo "$json"
-            }
-
-            build_table() {
-              local data="$1"
-
-              # Get the keys in the JSON data
-              local keys=$(echo "$data" | jq -r 'to_entries | map(.key) | .[]')
-
-              # Check if keys are empty
-              if [ -z "$keys" ]; then
-                echo "JSON report data does not contain any keys or the report does not exist."
-                return 1
-              fi
-
-              # Build table header
-              local header="| Tag | Passed |\\n| --- | --- |\\n"
-
-              # Loop through the JSON data to build the table rows
-              local rows=""
-              for build in $keys; do
-                local status=$(echo "$data" | jq -r ".[\\"$build\\"].test_success")
-                if [ "$status" = "true" ]; then
-                  status="✅"
-                else
-                  status="❌"
-                fi
-                local row="| "$build" | "$status" |\\n"
-                rows="${rows}${row}"
-              done
-
-              local table="${header}${rows}"
-              local escaped_table=$(echo "$table" | sed 's/\"/\\\\"/g')
-              echo "$escaped_table"
-            }
-
-            if [[ "${CI}" = "true" ]]; then
-              # Retrieve JSON data from URL
-              data=$(get_json "$CI_JSON_URL")
-              # Create table from JSON data
-              table=$(build_table "$data")
-              echo -e "$table"
-
-              curl -X POST -H "Authorization: token $GITHUB_TOKEN" \
-                -H "Accept: application/vnd.github.v3+json" \
-                "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \
-                -d "{\\"body\\": \\"I am a bot, here are the test results for this PR: \\n${CI_URL}\\n${SHELLCHECK_URL}\\n${table}\\"}"
-            else
-              curl -X POST -H "Authorization: token $GITHUB_TOKEN" \
-                -H "Accept: application/vnd.github.v3+json" \
-                "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \
-                -d "{\\"body\\": \\"I am a bot, here is the pushed image/manifest for this PR: \\n\\n\\`${GITHUBIMAGE}:${META_TAG}\\`\\"}"
-            fi
-            '''
-
       }
     }
   }
@@ -1014,26 +963,18 @@ pipeline {
           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,\
+          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.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,\
+          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.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"}],\
                  "username": "Jenkins"}' ${BUILDS_DISCORD} '''
         }
       }
     }
     cleanup {
-      sh '''#! /bin/bash
-            echo "Performing docker system prune!!"
-            containers=$(docker ps -aq)
-            if [[ -n "${containers}" ]]; then
-              docker stop ${containers}
-            fi
-            docker system prune -af --volumes || :
-         '''
       cleanWs()
     }
   }

README.md

@@ -1,5 +1,5 @@
 <!-- DO NOT EDIT THIS FILE MANUALLY  -->
-<!-- Please read the https://github.com/linuxserver/docker-code-server/blob/master/.github/CONTRIBUTING.md -->
+<!-- Please read the https://github.com/linuxserver/docker-code-server/blob/focal/.github/CONTRIBUTING.md -->
 
 [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io)
 
@@ -29,7 +29,6 @@ Find us at:
 
 # [linuxserver/code-server](https://github.com/linuxserver/docker-code-server)
 
-[![Scarf.io pulls](https://scarf.sh/installs-badge/linuxserver-ci/linuxserver%2Fcode-server?color=94398d&label-color=555555&logo-color=ffffff&style=for-the-badge&package-type=docker)](https://scarf.sh/gateway/linuxserver-ci/docker/linuxserver%2Fcode-server)
 [![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-code-server.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-code-server)
 [![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-code-server.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-code-server/releases)
 [![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-code-server/packages)
@@ -37,7 +36,7 @@ Find us at:
 [![Quay.io](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Quay.io)](https://quay.io/repository/linuxserver.io/code-server)
 [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/code-server.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/code-server)
 [![Docker Stars](https://img.shields.io/docker/stars/linuxserver/code-server.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/code-server)
-[![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-code-server%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-code-server/job/master/)
+[![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-code-server%2Fjob%2Ffocal%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-code-server/job/focal/)
 [![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Fci-tests.linuxserver.io%2Flinuxserver%2Fcode-server%2Flatest%2Fci-status.yml)](https://ci-tests.linuxserver.io/linuxserver/code-server/latest/index.html)
 
 [Code-server](https://coder.com) is VS Code running on a remote server, accessible through the browser.
@@ -52,17 +51,26 @@ Find us at:
 
 ## Supported Architectures
 
-We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
+Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
 
-Simply pulling `lscr.io/linuxserver/code-server:latest` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
+Simply pulling `lscr.io/linuxserver/code-server` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
 
 The architectures supported by this image are:
 
-| Architecture | Available | Tag |
+| Architecture | Tag |
-| :----: | :----: | ---- |
+| :----: | --- |
-| x86-64 | ✅ | amd64-\<version tag\> |
+| x86-64 | amd64-latest |
-| arm64 | ✅ | arm64v8-\<version tag\> |
+| arm64 | arm64v8-latest |
-| armhf | ✅ | arm32v7-\<version tag\> |
+| armhf | arm32v7-latest |
+
+## Version Tags
+
+This image provides various versions that are available via tags. `latest` tag usually provides the latest stable version. Others are considered under development and caution must be exercised when using them.
+
+| Tag | Description |
+| :----: | --- |
+| latest | Stable releases |
+| focal | Stable releases, on a focal baseiamge |
 
 ## Application Setup
 
@@ -90,18 +98,17 @@ Here are some example snippets to help you get started creating a container.
 version: "2.1"
 services:
   code-server:
-    image: lscr.io/linuxserver/code-server:latest
+    image: lscr.io/linuxserver/code-server
     container_name: code-server
     environment:
       - PUID=1000
       - PGID=1000
-      - TZ=Etc/UTC
+      - TZ=Europe/London
       - PASSWORD=password #optional
       - HASHED_PASSWORD= #optional
       - SUDO_PASSWORD=password #optional
       - SUDO_PASSWORD_HASH= #optional
       - PROXY_DOMAIN=code-server.my.domain #optional
-      - DEFAULT_WORKSPACE=/config/workspace #optional
     volumes:
       - /path/to/appdata/config:/config
     ports:
@@ -116,18 +123,16 @@ docker run -d \
   --name=code-server \
   -e PUID=1000 \
   -e PGID=1000 \
-  -e TZ=Etc/UTC \
+  -e TZ=Europe/London \
   -e PASSWORD=password `#optional` \
   -e HASHED_PASSWORD= `#optional` \
   -e SUDO_PASSWORD=password `#optional` \
   -e SUDO_PASSWORD_HASH= `#optional` \
   -e PROXY_DOMAIN=code-server.my.domain `#optional` \
-  -e DEFAULT_WORKSPACE=/config/workspace `#optional` \
   -p 8443:8443 \
   -v /path/to/appdata/config:/config \
   --restart unless-stopped \
-  lscr.io/linuxserver/code-server:latest
+  lscr.io/linuxserver/code-server
-
 ```
 
 ## Parameters
@@ -139,13 +144,12 @@ Container images are configured using parameters passed at runtime (such as thos
 | `-p 8443` | web gui |
 | `-e PUID=1000` | for UserID - see below for explanation |
 | `-e PGID=1000` | for GroupID - see below for explanation |
-| `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). |
+| `-e TZ=Europe/London` | Specify a timezone to use EG Europe/London |
 | `-e PASSWORD=password` | Optional web gui password, if `PASSWORD` or `HASHED_PASSWORD` is not provided, there will be no auth. |
 | `-e HASHED_PASSWORD=` | Optional web gui password, overrides `PASSWORD`, instructions on how to create it is below. |
 | `-e SUDO_PASSWORD=password` | If this optional variable is set, user will have sudo access in the code-server terminal with the specified password. |
 | `-e SUDO_PASSWORD_HASH=` | Optionally set sudo password via hash (takes priority over `SUDO_PASSWORD` var). Format is `$type$salt$hashed`. |
 | `-e PROXY_DOMAIN=code-server.my.domain` | If this optional variable is set, this domain will be proxied for subdomain proxying. See [Documentation](https://github.com/cdr/code-server/blob/master/docs/FAQ.md#sub-domains) |
-| `-e DEFAULT_WORKSPACE=/config/workspace` | If this optional variable is set, code-server will open this directory by default |
 | `-v /config` | Contains all relevant configuration files. |
 
 ## Environment variables from files (Docker secrets)
@@ -191,7 +195,7 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to
 * container version number
   * `docker inspect -f '{{ index .Config.Labels "build_version" }}' code-server`
 * image version number
-  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/code-server:latest`
+  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/code-server`
 
 ## Updating Info
 
@@ -209,7 +213,7 @@ Below are the instructions for updating containers:
 
 ### Via Docker Run
 
-* Update the image: `docker pull lscr.io/linuxserver/code-server:latest`
+* Update the image: `docker pull lscr.io/linuxserver/code-server`
 * Stop the running container: `docker stop code-server`
 * Delete the container: `docker rm code-server`
 * Recreate a new container with the same docker run parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved)
@@ -257,13 +261,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
-* **05.10.22:** - Install recommended deps to maintain parity with the older images.
+* **12.07.21:** - Rebase to focal
-* **29.09.22:** - Rebase to jammy, switch to s6v3. Fix chown logic to skip `/config/workspace` contents.
-* **20.02.22:** - Install using the official tarballs.
-* **29.12.21:** - Add `install-extension` as a helper for mods to install extensions.
-* **06.12.21:** - Add `DEFAULT_WORKSPACE` env var.
-* **29.11.21:** - Rebase to Ubuntu focal.
-* **16.09.21:** - Fix slow `chown` on large workspace (contents of workspace folder no longer chowned).
 * **11.07.21:** - Bump node to 14 to fix builds
 * **08.05.21:** - Fix doc link
 * **04.02.20:** - Allow setting gui password via hash using env var `HASHED_PASSWORD`.

jenkins-vars.yml

@@ -3,10 +3,10 @@
 # jenkins variables
 project_name: docker-code-server
 external_type: na
-custom_version_command: "curl -sX GET https://api.github.com/repos/coder/code-server/releases/latest | jq -r '.tag_name' | sed 's|^v||'"
+custom_version_command: "curl -sX GET https://registry.yarnpkg.com/code-server | jq -r '.\"dist-tags\".latest' | sed 's|^|v|'"
 release_type: stable
-release_tag: latest
+release_tag: focal
-ls_branch: master
+ls_branch: focal
 repo_vars:
   - CONTAINER_NAME = 'code-server'
   - BUILD_VERSION_ARG = 'CODE_RELEASE'

package_versions.txt

@@ -1,649 +1,190 @@
-NAME                                    VERSION                                  TYPE   
+adduser3.118ubuntu2
-1to2                                    1.0.0                                    npm     
+apt2.0.6
-@babel/runtime                          7.20.7                                   npm     
+apt-utils2.0.6
-@coder/logger                           3.0.0                                    npm     
+base-files11ubuntu5.4
-@google-cloud/common                    3.10.0                                   npm     
+base-passwd3.5.47
-@google-cloud/logging                   9.9.0                                    npm     
+bash5.0-6ubuntu1.1
-@google-cloud/paginator                 3.0.7                                    npm     
+bsdutils1:2.34-0.1ubuntu9.1
-@google-cloud/projectify                2.1.1                                    npm     
+bzip21.0.8-2
-@google-cloud/promisify                 2.0.4                                    npm     
+ca-certificates20210119~20.04.2
-@grpc/grpc-js                           1.6.12                                   npm     
+coreutils8.30-3ubuntu2
-@grpc/proto-loader                      0.6.13                                   npm     
+curl7.68.0-1ubuntu2.7
-@grpc/proto-loader                      0.7.7                                    npm     
+dash0.5.10.2-6
-@mapbox/node-pre-gyp                    1.0.10                                   npm     
+debconf1.5.73
-@microsoft/1ds-core-js                  3.2.3                                    npm     
+debianutils4.9.1
-@microsoft/1ds-post-js                  3.2.3                                    npm     
+diffutils1:3.7-3
-@microsoft/applicationinsights-core-js  2.8.4                                    npm     
+dirmngr2.2.19-3ubuntu2.1
-@microsoft/applicationinsights-shims    2.0.1                                    npm     
+dpkg1.19.7ubuntu3
-@microsoft/dynamicproto-js              1.1.6                                    npm     
+e2fsprogs1.45.5-2ubuntu1
-@parcel/watcher                         2.1.0                                    npm     
+fdisk2.34-0.1ubuntu9.1
-@phc/format                             1.0.0                                    npm     
+file1:5.38-4
-@protobufjs/aspromise                   1.1.2                                    npm     
+findutils4.7.0-1ubuntu1
-@protobufjs/base64                      1.1.2                                    npm     
+gcc-10-base10.3.0-1ubuntu1~20.04
-@protobufjs/codegen                     2.0.4                                    npm     
+git1:2.25.1-1ubuntu3.2
-@protobufjs/eventemitter                1.1.0                                    npm     
+git-man1:2.25.1-1ubuntu3.2
-@protobufjs/fetch                       1.1.0                                    npm     
+gnupg2.2.19-3ubuntu2.1
-@protobufjs/float                       1.0.2                                    npm     
+gnupg-l10n2.2.19-3ubuntu2.1
-@protobufjs/inquire                     1.1.0                                    npm     
+gnupg-utils2.2.19-3ubuntu2.1
-@protobufjs/path                        1.1.2                                    npm     
+gpg2.2.19-3ubuntu2.1
-@protobufjs/pool                        1.1.0                                    npm     
+gpg-agent2.2.19-3ubuntu2.1
-@protobufjs/utf8                        1.1.0                                    npm     
+gpgconf2.2.19-3ubuntu2.1
-@tootallnate/once                       1.1.2                                    npm     
+gpgsm2.2.19-3ubuntu2.1
-@tootallnate/once                       2.0.0                                    npm     
+gpgv2.2.19-3ubuntu2.1
-@types/long                             4.0.2                                    npm     
+gpg-wks-client2.2.19-3ubuntu2.1
-@types/node                             16.18.18                                 npm     
+gpg-wks-server2.2.19-3ubuntu2.1
-@vscode/iconv-lite-umd                  0.7.0                                    npm     
+grep3.4-1
-@vscode/proxy-agent                     0.13.2                                   npm     
+gzip1.10-0ubuntu4
-@vscode/ripgrep                         1.15.3                                   npm     
+hostname3.23
-@vscode/spdlog                          0.13.10                                  npm     
+init-system-helpers1.57
-@vscode/vscode-languagedetection        1.0.21                                   npm     
+jq1.6-1ubuntu0.20.04.1
-abbrev                                  1.1.1                                    npm     
+krb5-locales1.17-6ubuntu4.1
-abort-controller                        3.0.0                                    npm     
+less551-1ubuntu0.1
-accepts                                 1.3.7                                    npm     
+libacl12.2.53-6
-acorn                                   8.8.2                                    npm     
+libapt-pkg6.02.0.6
-acorn-walk                              8.2.0                                    npm     
+libasn1-8-heimdal7.7.0+dfsg-1ubuntu1
-adduser                                 3.118ubuntu5                             deb     
+libassuan02.5.3-7ubuntu2
-agent-base                              4.2.0                                    npm     
+libattr11:2.4.48-5
-agent-base                              4.3.0                                    npm     
+libaudit11:2.8.5-2ubuntu6
-agent-base                              6.0.2                                    npm     
+libaudit-common1:2.8.5-2ubuntu6
-agent-base                              7.1.0                                    npm     
+libblkid12.34-0.1ubuntu9.1
-ansi-regex                              2.1.1                                    npm     
+libbrotli11.0.7-6ubuntu0.1
-ansi-regex                              5.0.1                                    npm     
+libbsd00.10.0-1
-ansi-styles                             4.3.0                                    npm     
+libbz2-1.01.0.8-2
-aproba                                  1.2.0                                    npm     
+libc62.31-0ubuntu9.2
-aproba                                  2.0.0                                    npm     
+libcap-ng00.7.9-2.1build1
-apt                                     2.4.9                                    deb     
+libc-bin2.31-0ubuntu9.2
-apt-utils                               2.4.9                                    deb     
+libcbor0.60.6.0-0ubuntu1
-are-we-there-yet                        1.1.7                                    npm     
+libcom-err21.45.5-2ubuntu1
-are-we-there-yet                        2.0.0                                    npm     
+libcrypt11:4.4.10-10ubuntu4
-argon2                                  0.30.3                                   npm     
+libcurl3-gnutls7.68.0-1ubuntu2.7
-argparse                                2.0.1                                    npm     
+libcurl47.68.0-1ubuntu2.7
-array-flatten                           2.1.1                                    npm     
+libdb5.35.3.28+dfsg1-0.6ubuntu2
-arrify                                  2.0.1                                    npm     
+libdebconfclient00.251ubuntu1
-ast-types                               0.13.4                                   npm     
+libedit23.1-20191231-1
-balanced-match                          1.0.2                                    npm     
+liberror-perl0.17029-1
-base-files                              12ubuntu4.3                              deb     
+libexpat12.2.9-1build1
-base-passwd                             3.5.52build1                             deb     
+libext2fs21.45.5-2ubuntu1
-base64-js                               1.5.1                                    npm     
+libfdisk12.34-0.1ubuntu9.1
-bash                                    5.1-6ubuntu1                             deb     
+libffi73.3-4
-basic-ftp                               5.0.3                                    npm     
+libfido2-11.3.1-1ubuntu2
-bat                                     1.0.0                                    npm     
+libgcc-s110.3.0-1ubuntu1~20.04
-beep-boop                               1.2.3                                    npm     
+libgcrypt201.8.5-5ubuntu1.1
-bignumber.js                            9.1.1                                    npm     
+libgdbm61.18.1-5
-bindings                                1.5.0                                    npm     
+libgdbm-compat41.18.1-5
-bl                                      4.1.0                                    npm     
+libgmp102:6.2.0+dfsg-4
-body-parser                             1.19.0                                   npm     
+libgnutls303.6.13-2ubuntu1.6
-brace-expansion                         1.1.11                                   npm     
+libgpg-error01.37-1
-braces                                  3.0.2                                    npm     
+libgssapi3-heimdal7.7.0+dfsg-1ubuntu1
-bsdutils                                1:2.37.2-4ubuntu3                        deb     
+libgssapi-krb5-21.17-6ubuntu4.1
-buffer                                  5.7.1                                    npm     
+libhcrypto4-heimdal7.7.0+dfsg-1ubuntu1
-buffer-alloc                            1.2.0                                    npm     
+libheimbase1-heimdal7.7.0+dfsg-1ubuntu1
-buffer-alloc-unsafe                     1.1.0                                    npm     
+libheimntlm0-heimdal7.7.0+dfsg-1ubuntu1
-buffer-crc32                            0.2.13                                   npm     
+libhogweed53.5.1+really3.5.1-2ubuntu0.2
-buffer-equal-constant-time              1.0.1                                    npm     
+libhx509-5-heimdal7.7.0+dfsg-1ubuntu1
-buffer-fill                             1.0.0                                    npm     
+libidn2-02.2.0-2
-builtin-notebook-renderers              1.0.0                                    npm     
+libjq11.6-1ubuntu0.20.04.1
-bytes                                   3.0.0                                    npm     
+libk5crypto31.17-6ubuntu4.1
-bytes                                   3.1.0                                    npm     
+libkeyutils11.6-6ubuntu1
-ca-certificates                         20230311ubuntu0.22.04.1                  deb     
+libkrb5-26-heimdal7.7.0+dfsg-1ubuntu1
-call-bind                               1.0.2                                    npm     
+libkrb5-31.17-6ubuntu4.1
-charenc                                 0.0.2                                    npm     
+libkrb5support01.17-6ubuntu4.1
-chownr                                  1.1.4                                    npm     
+libksba81.3.5-2
-chownr                                  2.0.0                                    npm     
+libldap-2.4-22.4.49+dfsg-2ubuntu1.8
-cliui                                   7.0.4                                    npm     
+libldap-common2.4.49+dfsg-2ubuntu1.8
-cliui                                   8.0.1                                    npm     
+liblz4-11.9.2-2ubuntu0.20.04.1
-clojure                                 1.0.0                                    npm     
+liblzma55.2.4-1ubuntu1
-code-point-at                           1.1.0                                    npm     
+libmagic11:5.38-4
-code-server                             4.14.1                                   npm     
+libmagic-mgc1:5.38-4
-coffeescript                            1.0.0                                    npm     
+libmount12.34-0.1ubuntu9.1
-color-convert                           2.0.1                                    npm     
+libmpdec22.4.2-3
-color-name                              1.1.4                                    npm     
+libncurses66.2-0ubuntu2
-color-support                           1.1.3                                    npm     
+libncursesw66.2-0ubuntu2
-compressible                            2.0.18                                   npm     
+libnettle73.5.1+really3.5.1-2ubuntu0.2
-compression                             1.7.4                                    npm     
+libnghttp2-141.40.0-1build1
-concat-map                              0.0.1                                    npm     
+libnpth01.6-1
-configuration-editing                   1.0.0                                    npm     
+libonig56.9.4-1
-console-control-strings                 1.1.0                                    npm     
+libp11-kit00.23.20-1ubuntu0.1
-content-disposition                     0.5.3                                    npm     
+libpam0g1.3.1-5ubuntu4.3
-content-type                            1.0.4                                    npm     
+libpam-modules1.3.1-5ubuntu4.3
-cookie                                  0.4.0                                    npm     
+libpam-modules-bin1.3.1-5ubuntu4.3
-cookie-parser                           1.4.5                                    npm     
+libpam-runtime1.3.1-5ubuntu4.3
-cookie-signature                        1.0.6                                    npm     
+libpcre2-8-010.34-7
-core-util-is                            1.0.2                                    npm     
+libpcre32:8.39-12build1
-coreutils                               8.32-4.1ubuntu1                          deb     
+libperl5.305.30.0-9ubuntu0.2
-cpp                                     1.0.0                                    npm     
+libprocps82:3.3.16-1ubuntu2.3
-crypt                                   0.0.2                                    npm     
+libpsl50.21.0-1ubuntu1
-csharp                                  1.0.0                                    npm     
+libpython3.8-minimal3.8.10-0ubuntu1~20.04.1
-css                                     1.0.0                                    npm     
+libpython3.8-stdlib3.8.10-0ubuntu1~20.04.1
-css-language-features                   1.0.0                                    npm     
+libpython3-stdlib3.8.2-0ubuntu2
-curl                                    7.81.0-1ubuntu1.10                       deb     
+libreadline88.0-4
-dart                                    1.0.0                                    npm     
+libroken18-heimdal7.7.0+dfsg-1ubuntu1
-dash                                    0.5.11+git20210903+057cd650a4ed-3build1  deb     
+librtmp12.4+20151223.gitfa8646d.1-2build1
-data-uri-to-buffer                      5.0.1                                    npm     
+libsasl2-22.1.27+dfsg-2
-debconf                                 1.5.79ubuntu1                            deb     
+libsasl2-modules2.1.27+dfsg-2
-debianutils                             5.5-1ubuntu2                             deb     
+libsasl2-modules-db2.1.27+dfsg-2
-debug                                   2.6.9                                    npm     
+libseccomp22.5.1-1ubuntu1~20.04.1
-debug                                   3.1.0                                    npm     
+libselinux13.0-1build2
-debug                                   4.1.1                                    npm     
+libsemanage13.0-1build2
-debug                                   4.3.1                                    npm     
+libsemanage-common3.0-1build2
-debug                                   4.3.4                                    npm     
+libsepol13.0-1
-debug-auto-launch                       1.0.0                                    npm     
+libsmartcols12.34-0.1ubuntu9.1
-debug-server-ready                      1.0.0                                    npm     
+libsqlite3-03.31.1-4ubuntu0.2
-decompress-response                     6.0.0                                    npm     
+libss21.45.5-2ubuntu1
-deep-extend                             0.6.0                                    npm     
+libssh-40.9.3-2ubuntu2.2
-deep-is                                 0.1.4                                    npm     
+libssl1.11.1.1f-1ubuntu2.8
-degenerator                             4.0.2                                    npm     
+libstdc++610.3.0-1ubuntu1~20.04
-delegates                               1.0.0                                    npm     
+libsystemd0245.4-4ubuntu3.13
-depd                                    1.1.2                                    npm     
+libtasn1-64.16.0-2
-destroy                                 1.0.4                                    npm     
+libtinfo66.2-0ubuntu2
-detect-libc                             2.0.1                                    npm     
+libudev1245.4-4ubuntu3.13
-diff                                    1.0.0                                    npm     
+libunistring20.9.10-2
-diffutils                               1:3.8-0ubuntu2                           deb     
+libuuid12.34-0.1ubuntu9.1
-dirmngr                                 2.2.27-3ubuntu2.1                        deb     
+libwind0-heimdal7.7.0+dfsg-1ubuntu1
-docker                                  1.0.0                                    npm     
+libx11-62:1.6.9-2ubuntu1.2
-dot-prop                                6.0.1                                    npm     
+libx11-data2:1.6.9-2ubuntu1.2
-dpkg                                    1.21.1ubuntu2.2                          deb     
+libxau61:1.0.9-0ubuntu1
-duplexify                               4.1.2                                    npm     
+libxcb11.14-2
-e2fsprogs                               1.46.5-2ubuntu1.1                        deb     
+libxdmcp61:1.1.3-0ubuntu1
-ecdsa-sig-formatter                     1.0.11                                   npm     
+libxext62:1.3.4-0ubuntu1
-ee-first                                1.1.1                                    npm     
+libxmuu12:1.1.3-0ubuntu1
-emmet                                   1.0.0                                    npm     
+libzstd11.4.4+dfsg-3ubuntu0.1
-emoji-regex                             8.0.0                                    npm     
+locales2.31-0ubuntu9.2
-encodeurl                               1.0.2                                    npm     
+login1:4.8.1-1ubuntu5.20.04.1
-end-of-stream                           1.4.4                                    npm     
+logsave1.45.5-2ubuntu1
-ent                                     2.2.0                                    npm     
+lsb-base11.1.0ubuntu2
-env-paths                               2.2.1                                    npm     
+mawk1.3.4.20200120-2
-es6-promise                             4.2.4                                    npm     
+mime-support3.64ubuntu1
-es6-promisify                           5.0.0                                    npm     
+mount2.34-0.1ubuntu9.1
-es6-promisify                           6.1.1                                    npm     
+nano4.8-1ubuntu1
-escalade                                3.1.1                                    npm     
+ncurses-base6.2-0ubuntu2
-escape-html                             1.0.3                                    npm     
+ncurses-bin6.2-0ubuntu2
-escodegen                               1.14.3                                   npm     
+netbase6.1
-esprima                                 4.0.1                                    npm     
+net-tools1.60+git20180626.aebd88e-1ubuntu1
-estraverse                              4.3.0                                    npm     
+nodejs14.18.1-deb-1nodesource1
-esutils                                 2.0.3                                    npm     
+openssh-client1:8.2p1-4ubuntu0.3
-etag                                    1.8.1                                    npm     
+openssl1.1.1f-1ubuntu2.8
-event-target-shim                       5.0.1                                    npm     
+passwd1:4.8.1-1ubuntu5.20.04.1
-eventemitter3                           4.0.7                                    npm     
+patch2.7.6-6
-eventid                                 2.0.1                                    npm     
+perl5.30.0-9ubuntu0.2
-expand-template                         2.0.3                                    npm     
+perl-base5.30.0-9ubuntu0.2
-express                                 5.0.0-alpha.8                            npm     
+perl-modules-5.305.30.0-9ubuntu0.2
-extend                                  3.0.2                                    npm     
+pinentry-curses1.1.0-3build1
-extension-editing                       1.0.0                                    npm     
+procps2:3.3.16-1ubuntu2.3
-fast-levenshtein                        2.0.6                                    npm     
+publicsuffix20200303.0012-1
-fast-text-encoding                      1.0.6                                    npm     
+python33.8.2-0ubuntu2
-fd-slicer                               1.1.0                                    npm     
+python3.83.8.10-0ubuntu1~20.04.1
-file-uri-to-path                        1.0.0                                    npm     
+python3.8-minimal3.8.10-0ubuntu1~20.04.1
-fill-range                              7.0.1                                    npm     
+python3-minimal3.8.2-0ubuntu2
-finalhandler                            1.1.2                                    npm     
+readline-common8.0-4
-findutils                               4.8.0-1ubuntu3                           deb     
+sed4.7-1
-follow-redirects                        1.14.8                                   npm     
+sensible-utils0.0.12+nmu1
-forwarded                               0.1.2                                    npm     
+sudo1.8.31-1ubuntu1.2
-fresh                                   0.5.2                                    npm     
+sysvinit-utils2.96-2.1ubuntu1
-fs-constants                            1.0.0                                    npm     
+tar1.30+dfsg-7ubuntu0.20.04.1
-fs-extra                                8.1.0                                    npm     
+tzdata2021e-0ubuntu0.20.04
-fs-minipass                             2.1.0                                    npm     
+ubuntu-keyring2020.02.11.4
-fs.realpath                             1.0.0                                    npm     
+util-linux2.34-0.1ubuntu9.1
-fsharp                                  1.0.0                                    npm     
+xauth1:1.1-0ubuntu1
-function-bind                           1.1.1                                    npm     
+xz-utils5.2.4-1ubuntu1
-gauge                                   2.7.4                                    npm     
+yarn1.22.15-1
-gauge                                   3.0.2                                    npm     
+zlib1g1:1.2.11.dfsg-2ubuntu1.2
-gaxios                                  4.3.3                                    npm     
-gcc-12-base                             12.1.0-2ubuntu1~22.04                    deb     
-gcp-metadata                            4.3.1                                    npm     
-get-caller-file                         2.0.5                                    npm     
-get-intrinsic                           1.1.1                                    npm     
-get-uri                                 6.0.1                                    npm     
-git                                     1.0.0                                    npm     
-git                                     1:2.34.1-1ubuntu1.9                      deb     
-git-base                                1.0.0                                    npm     
-git-man                                 1:2.34.1-1ubuntu1.9                      deb     
-github                                  0.0.1                                    npm     
-github-authentication                   0.0.2                                    npm     
-github-from-package                     0.0.0                                    npm     
-glob                                    7.2.3                                    npm     
-gnupg                                   2.2.27-3ubuntu2.1                        deb     
-gnupg-l10n                              2.2.27-3ubuntu2.1                        deb     
-gnupg-utils                             2.2.27-3ubuntu2.1                        deb     
-go                                      1.0.0                                    npm     
-google-auth-library                     7.14.1                                   npm     
-google-gax                              2.30.5                                   npm     
-google-p12-pem                          3.1.4                                    npm     
-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     
-graceful-fs                             4.2.8                                    npm     
-grep                                    3.7-1build1                              deb     
-groovy                                  1.0.0                                    npm     
-grunt                                   1.0.0                                    npm     
-gtoken                                  5.3.2                                    npm     
-gulp                                    1.0.0                                    npm     
-gzip                                    1.10-4ubuntu4.1                          deb     
-handlebars                              1.0.0                                    npm     
-has                                     1.0.3                                    npm     
-has-symbols                             1.0.2                                    npm     
-has-unicode                             2.0.1                                    npm     
-hlsl                                    1.0.0                                    npm     
-hostname                                3.23ubuntu2                              deb     
-html                                    1.0.0                                    npm     
-html-language-features                  1.0.0                                    npm     
-http-errors                             1.7.2                                    npm     
-http-errors                             1.7.3                                    npm     
-http-proxy                              1.18.1                                   npm     
-http-proxy-agent                        2.1.0                                    npm     
-http-proxy-agent                        4.0.1                                    npm     
-http-proxy-agent                        5.0.0                                    npm     
-http-proxy-agent                        7.0.0                                    npm     
-httpolyglot                             0.1.2                                    npm     
-https-proxy-agent                       2.2.4                                    npm     
-https-proxy-agent                       5.0.0                                    npm     
-https-proxy-agent                       5.0.1                                    npm     
-https-proxy-agent                       7.0.0                                    npm     
-i18next                                 22.5.1                                   npm     
-iconv-lite                              0.4.24                                   npm     
-ieee754                                 1.2.1                                    npm     
-inflight                                1.0.6                                    npm     
-inherits                                2.0.3                                    npm     
-inherits                                2.0.4                                    npm     
-ini                                     1.0.0                                    npm     
-ini                                     1.3.8                                    npm     
-init-system-helpers                     1.62                                     deb     
-ip                                      1.1.5                                    npm     
-ip                                      2.0.0                                    npm     
-ipaddr.js                               1.9.1                                    npm     
-ipynb                                   1.0.0                                    npm     
-is-buffer                               1.1.6                                    npm     
-is-extglob                              2.1.1                                    npm     
-is-fullwidth-code-point                 1.0.0                                    npm     
-is-fullwidth-code-point                 3.0.0                                    npm     
-is-glob                                 4.0.3                                    npm     
-is-number                               7.0.0                                    npm     
-is-obj                                  2.0.0                                    npm     
-is-stream                               2.0.1                                    npm     
-is-stream-ended                         0.1.4                                    npm     
-isarray                                 1.0.0                                    npm     
-isexe                                   2.0.0                                    npm     
-jake                                    1.0.0                                    npm     
-java                                    1.0.0                                    npm     
-javascript                              1.0.0                                    npm     
-jq                                      1.6-2.1ubuntu3                           deb     
-js-debug                                1.78.0                                   npm     
-js-debug-companion                      1.0.18                                   npm     
-js-yaml                                 4.1.0                                    npm     
-jschardet                               3.0.0                                    npm     
-json                                    1.0.0                                    npm     
-json-bigint                             1.0.0                                    npm     
-json-language-features                  1.0.0                                    npm     
-jsonfile                                4.0.0                                    npm     
-julia                                   1.0.0                                    npm     
-just-performance                        4.3.0                                    npm     
-jwa                                     2.0.0                                    npm     
-jws                                     4.0.0                                    npm     
-keytar                                  7.9.0                                    npm     
-latex                                   1.0.0                                    npm     
-less                                    1.0.0                                    npm     
-less                                    590-1ubuntu0.22.04.1                     deb     
-levn                                    0.3.0                                    npm     
-libacl1                                 2.3.1-1                                  deb     
-libapt-pkg6.0                           2.4.9                                    deb     
-libassuan0                              2.5.5-1build1                            deb     
-libatomic1                              12.1.0-2ubuntu1~22.04                    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     
-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     
-libcap-ng0                              0.7.9-2.2build3                          deb     
-libcap2                                 1:2.44-1build3                           deb     
-libcbor0.8                              0.8.0-2ubuntu1                           deb     
-libcom-err2                             1.46.5-2ubuntu1.1                        deb     
-libcrypt1                               1:4.4.27-1                               deb     
-libcurl3-gnutls                         7.81.0-1ubuntu1.10                       deb     
-libcurl4                                7.81.0-1ubuntu1.10                       deb     
-libdb5.3                                5.3.28+dfsg1-0.8ubuntu3                  deb     
-libdebconfclient0                       0.261ubuntu1                             deb     
-libedit2                                3.1-20210910-1build1                     deb     
-liberror-perl                           0.17029-1                                deb     
-libexpat1                               2.4.7-1ubuntu0.2                         deb     
-libext2fs2                              1.46.5-2ubuntu1.1                        deb     
-libffi8                                 3.4.2-4                                  deb     
-libfido2-1                              1.10.0-1                                 deb     
-libgcc-s1                               12.1.0-2ubuntu1~22.04                    deb     
-libgcrypt20                             1.9.4-3ubuntu3                           deb     
-libgdbm-compat4                         1.23-1                                   deb     
-libgdbm6                                1.23-1                                   deb     
-libgmp10                                2:6.2.1+dfsg-3ubuntu1                    deb     
-libgnutls30                             3.7.3-4ubuntu1.2                         deb     
-libgpg-error0                           1.43-3                                   deb     
-libgssapi-krb5-2                        1.19.2-2ubuntu0.2                        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     
-libkeyutils1                            1.6.1-2ubuntu3                           deb     
-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.14+dfsg-0ubuntu0.22.04.2             deb     
-libldap-common                          2.5.14+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     
-libmount1                               2.37.2-4ubuntu3                          deb     
-libncurses6                             6.3-2ubuntu0.1                           deb     
-libncursesw6                            6.3-2ubuntu0.1                           deb     
-libnettle8                              3.7.3-1build2                            deb     
-libnghttp2-14                           1.43.0-1build3                           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     
-libpcre2-8-0                            10.39-3ubuntu0.1                         deb     
-libpcre3                                2:8.39-13ubuntu0.22.04.1                 deb     
-libperl5.34                             5.34.0-3ubuntu1.2                        deb     
-libprocps8                              2:3.3.17-6ubuntu2                        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     
-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.1                        deb     
-libss2                                  1.46.5-2ubuntu1.1                        deb     
-libssh-4                                0.9.6-2ubuntu0.22.04.1                   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     
-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     
-libunistring2                           1.0-1                                    deb     
-libuuid1                                2.37.2-4ubuntu3                          deb     
-libx11-6                                2:1.7.5-1ubuntu0.2                       deb     
-libx11-data                             2:1.7.5-1ubuntu0.2                       deb     
-libxau6                                 1:1.0.9-1build5                          deb     
-libxcb1                                 1.14-3ubuntu3                            deb     
-libxdmcp6                               1:1.1.3-0ubuntu5                         deb     
-libxext6                                2:1.3.4-1build1                          deb     
-libxmuu1                                2:1.1.3-3                                deb     
-libxxhash0                              0.8.1-1                                  deb     
-libzstd1                                1.4.8+dfsg-3build1                       deb     
-limiter                                 2.1.0                                    npm     
-locales                                 2.35-0ubuntu3.1                          deb     
-lodash.camelcase                        4.3.0                                    npm     
-log                                     1.0.0                                    npm     
-login                                   1:4.8.1-2ubuntu2.1                       deb     
-logsave                                 1.46.5-2ubuntu1.1                        deb     
-long                                    4.0.0                                    npm     
-long                                    5.2.3                                    npm     
-lru-cache                               6.0.0                                    npm     
-lru-cache                               7.18.3                                   npm     
-lsb-base                                11.1.0ubuntu4                            deb     
-lua                                     1.0.0                                    npm     
-make                                    1.0.0                                    npm     
-make-dir                                3.1.0                                    npm     
-markdown                                1.0.0                                    npm     
-markdown-language-features              1.0.0                                    npm     
-markdown-math                           1.0.0                                    npm     
-mawk                                    1.3.4.20200120-3                         deb     
-md5                                     2.3.0                                    npm     
-media-preview                           1.0.0                                    npm     
-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     
-microsoft-authentication                0.0.1                                    npm     
-mime                                    1.6.0                                    npm     
-mime-db                                 1.47.0                                   npm     
-mime-types                              2.1.30                                   npm     
-mimic-response                          3.1.0                                    npm     
-minimatch                               3.1.2                                    npm     
-minimist                                1.2.6                                    npm     
-minipass                                3.1.3                                    npm     
-minizlib                                2.1.2                                    npm     
-mkdirp                                  0.5.6                                    npm     
-mkdirp                                  1.0.4                                    npm     
-mkdirp-classic                          0.5.3                                    npm     
-mount                                   2.37.2-4ubuntu3                          deb     
-ms                                      2.0.0                                    npm     
-ms                                      2.1.1                                    npm     
-ms                                      2.1.2                                    npm     
-nan                                     2.17.0                                   npm     
-nano                                    6.2-1                                    deb     
-napi-build-utils                        1.0.2                                    npm     
-native-watchdog                         1.4.2                                    npm     
-ncurses-base                            6.3-2ubuntu0.1                           deb     
-ncurses-bin                             6.3-2ubuntu0.1                           deb     
-negotiator                              0.6.2                                    npm     
-net-tools                               1.60+git20181103.0eebece-1ubuntu5        deb     
-netbase                                 6.3                                      deb     
-netcat                                  1.218-4ubuntu1                           deb     
-netcat-openbsd                          1.218-4ubuntu1                           deb     
-netmask                                 2.0.2                                    npm     
-node                                    16.20.0                                  binary  
-node-abi                                3.8.0                                    npm     
-node-addon-api                          3.2.1                                    npm     
-node-addon-api                          4.3.0                                    npm     
-node-addon-api                          5.0.0                                    npm     
-node-fetch                              2.6.7                                    npm     
-node-forge                              1.3.1                                    npm     
-node-forge-flash                        0.0.0                                    npm     
-node-gyp-build                          4.3.0                                    npm     
-node-pty                                0.11.0-beta32                            npm     
-nopt                                    5.0.0                                    npm     
-npm                                     1.0.1                                    npm     
-npmlog                                  4.1.2                                    npm     
-npmlog                                  5.0.1                                    npm     
-number-is-nan                           1.0.1                                    npm     
-nw-pre-gyp-module-test                  0.0.1                                    npm     
-object-assign                           4.1.1                                    npm     
-object-hash                             3.0.0                                    npm     
-object-inspect                          1.10.2                                   npm     
-objective-c                             1.0.0                                    npm     
-on-finished                             2.3.0                                    npm     
-on-headers                              1.0.2                                    npm     
-once                                    1.4.0                                    npm     
-openssh-client                          1:8.9p1-3ubuntu0.1                       deb     
-openssl                                 3.0.2-0ubuntu1.10                        deb     
-optionator                              0.8.3                                    npm     
-os-tmpdir                               1.0.2                                    npm     
-pac-proxy-agent                         6.0.3                                    npm     
-pac-resolver                            6.0.1                                    npm     
-parseurl                                1.3.3                                    npm     
-passwd                                  1:4.8.1-2ubuntu2.1                       deb     
-patch                                   2.7.6-7build2                            deb     
-path-is-absolute                        1.0.1                                    npm     
-path-to-regexp                          0.1.7                                    npm     
-pem                                     1.14.4                                   npm     
-pend                                    1.2.0                                    npm     
-perl                                    1.0.0                                    npm     
-perl                                    5.34.0-3ubuntu1.2                        deb     
-perl-base                               5.34.0-3ubuntu1.2                        deb     
-perl-modules-5.34                       5.34.0-3ubuntu1.2                        deb     
-php                                     1.0.0                                    npm     
-php-language-features                   1.0.0                                    npm     
-picomatch                               2.3.1                                    npm     
-pinentry-curses                         1.1.1-1build2                            deb     
-powershell                              1.0.0                                    npm     
-prebuild-install                        7.0.1                                    npm     
-prelude-ls                              1.1.2                                    npm     
-process-nextick-args                    2.0.1                                    npm     
-procps                                  2:3.3.17-6ubuntu2                        deb     
-proto3-json-serializer                  0.1.9                                    npm     
-protobufjs                              6.11.3                                   npm     
-protobufjs                              7.2.3                                    npm     
-proxy-addr                              2.0.6                                    npm     
-proxy-agent                             6.2.1                                    npm     
-proxy-from-env                          1.1.0                                    npm     
-publicsuffix                            20211207.1025-1                          deb     
-pug                                     1.0.0                                    npm     
-pump                                    3.0.0                                    npm     
-pumpify                                 2.0.1                                    npm     
-python                                  1.0.0                                    npm     
-qs                                      6.11.0                                   npm     
-qs                                      6.7.0                                    npm     
-r                                       1.0.0                                    npm     
-range-parser                            1.2.1                                    npm     
-raw-body                                2.4.0                                    npm     
-razor                                   1.0.0                                    npm     
-rc                                      1.2.8                                    npm     
-readable-stream                         2.3.7                                    npm     
-readable-stream                         3.6.0                                    npm     
-readline-common                         8.1.2-1                                  deb     
-references-view                         1.0.0                                    npm     
-regenerator-runtime                     0.13.11                                  npm     
-require-directory                       2.1.1                                    npm     
-requires-port                           1.0.0                                    npm     
-restructuredtext                        1.0.0                                    npm     
-retry-request                           4.2.2                                    npm     
-rimraf                                  3.0.2                                    npm     
-rotating-file-stream                    3.1.0                                    npm     
-router                                  2.0.0-alpha.1                            npm     
-ruby                                    1.0.0                                    npm     
-rust                                    1.0.0                                    npm     
-safe-buffer                             5.1.2                                    npm     
-safe-buffer                             5.2.1                                    npm     
-safe-compare                            1.1.4                                    npm     
-safer-buffer                            2.1.2                                    npm     
-scss                                    1.0.0                                    npm     
-search-result                           1.0.0                                    npm     
-sed                                     4.8-1ubuntu2                             deb     
-semver                                  6.3.0                                    npm     
-semver                                  7.3.5                                    npm     
-semver                                  7.3.8                                    npm     
-send                                    0.17.1                                   npm     
-sensible-utils                          0.0.17                                   deb     
-serve-static                            1.14.1                                   npm     
-set-blocking                            2.0.0                                    npm     
-setprototypeof                          1.1.0                                    npm     
-setprototypeof                          1.1.1                                    npm     
-shaderlab                               1.0.0                                    npm     
-shellscript                             1.0.0                                    npm     
-side-channel                            1.0.4                                    npm     
-signal-exit                             3.0.6                                    npm     
-signal-exit                             3.0.7                                    npm     
-simple-browser                          1.0.0                                    npm     
-simple-concat                           1.0.1                                    npm     
-simple-get                              4.0.1                                    npm     
-smart-buffer                            4.1.0                                    npm     
-smart-buffer                            4.2.0                                    npm     
-socks                                   2.6.1                                    npm     
-socks                                   2.7.1                                    npm     
-socks-proxy-agent                       5.0.0                                    npm     
-socks-proxy-agent                       8.0.1                                    npm     
-source-map                              0.6.1                                    npm     
-sql                                     1.0.0                                    npm     
-statuses                                1.5.0                                    npm     
-stream-events                           1.0.5                                    npm     
-stream-shift                            1.0.1                                    npm     
-string-width                            1.0.2                                    npm     
-string-width                            4.2.2                                    npm     
-string-width                            4.2.3                                    npm     
-string_decoder                          1.1.1                                    npm     
-string_decoder                          1.3.0                                    npm     
-strip-ansi                              3.0.1                                    npm     
-strip-ansi                              6.0.1                                    npm     
-strip-json-comments                     2.0.1                                    npm     
-stubs                                   3.0.0                                    npm     
-sudo                                    1.9.9-1ubuntu2.4                         deb     
-swift                                   1.0.0                                    npm     
-sysvinit-utils                          3.01-1ubuntu1                            deb     
-tar                                     1.34+dfsg-1ubuntu0.1.22.04.1             deb     
-tar                                     6.1.11                                   npm     
-tar-fs                                  2.1.1                                    npm     
-tar-stream                              2.2.0                                    npm     
-tas-client-umd                          0.1.8                                    npm     
-teeny-request                           7.2.0                                    npm     
-theme-abyss                             1.0.0                                    npm     
-theme-defaults                          1.0.0                                    npm     
-theme-kimbie-dark                       1.0.0                                    npm     
-theme-monokai                           1.0.0                                    npm     
-theme-monokai-dimmed                    1.0.0                                    npm     
-theme-quietlight                        1.0.0                                    npm     
-theme-red                               1.0.0                                    npm     
-theme-solarized-dark                    1.0.0                                    npm     
-theme-solarized-light                   1.0.0                                    npm     
-theme-tomorrow-night-blue               1.0.0                                    npm     
-to-regex-range                          5.0.1                                    npm     
-toidentifier                            1.0.0                                    npm     
-tr46                                    0.0.3                                    npm     
-tslib                                   2.3.1                                    npm     
-tunnel-agent                            0.6.0                                    npm     
-type-check                              0.3.2                                    npm     
-type-is                                 1.6.18                                   npm     
-typescript                              1.0.0                                    npm     
-typescript                              5.1.3                                    npm     
-typescript-language-features            1.0.0                                    npm     
-tzdata                                  2023c-0ubuntu0.22.04.2                   deb     
-ubuntu-keyring                          2021.03.26                               deb     
-universalify                            0.1.2                                    npm     
-unpipe                                  1.0.0                                    npm     
-usrmerge                                25ubuntu2                                deb     
-util-deprecate                          1.0.2                                    npm     
-util-linux                              2.37.2-4ubuntu3                          deb     
-utils-merge                             1.0.1                                    npm     
-uuid                                    8.3.2                                    npm     
-vary                                    1.1.2                                    npm     
-vb                                      1.0.0                                    npm     
-vm2                                     3.9.19                                   npm     
-vscode-css-languageserver               1.0.0                                    npm     
-vscode-extensions                       0.0.1                                    npm     
-vscode-html-languageserver              1.0.0                                    npm     
-vscode-js-profile-table                 1.0.3                                    npm     
-vscode-json-languageserver              1.3.4                                    npm     
-vscode-markdown-languageserver          0.4.0-alpha.2                            npm     
-vscode-oniguruma                        1.7.0                                    npm     
-vscode-regexpp                          3.1.0                                    npm     
-vscode-reh                              1.79.2                                   npm     
-vscode-textmate                         9.0.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     
-word-wrap                               1.2.3                                    npm     
-wrap-ansi                               7.0.0                                    npm     
-wrappy                                  1.0.2                                    npm     
-ws                                      8.13.0                                   npm     
-xauth                                   1:1.1-1build2                            deb     
-xdg-basedir                             4.0.0                                    npm     
-xml                                     1.0.0                                    npm     
-xterm                                   5.2.0-beta.49                            npm     
-xterm-addon-canvas                      0.4.0-beta.14                            npm     
-xterm-addon-image                       0.4.0                                    npm     
-xterm-addon-search                      0.12.0-beta.5                            npm     
-xterm-addon-serialize                   0.10.0-beta.2                            npm     
-xterm-addon-unicode11                   0.5.0                                    npm     
-xterm-addon-webgl                       0.15.0-beta.15                           npm     
-xterm-headless                          5.2.0-beta.49                            npm     
-y18n                                    5.0.8                                    npm     
-yallist                                 4.0.0                                    npm     
-yaml                                    1.0.0                                    npm     
-yargs                                   16.2.0                                   npm     
-yargs                                   17.7.2                                   npm     
-yargs-parser                            20.2.9                                   npm     
-yargs-parser                            21.1.1                                   npm     
-yauzl                                   2.10.0                                   npm     
-yazl                                    2.4.3                                    npm     
-zlib1g                                  1:1.2.11.dfsg-2ubuntu9.2                 deb     

readme-vars.yml

@@ -26,9 +26,10 @@ available_architectures:
   - { arch: "{{ arch_armhf }}", tag: "arm32v7-latest"}
 
 # development version
-development_versions: false
+development_versions: true
 development_versions_items:
   - { tag: "latest", desc: "Stable releases" }
+  - { tag: "focal", desc: "Stable releases, on a focal baseiamge" }
 
 # container parameters
 common_param_env_vars_enabled: true
@@ -51,7 +52,6 @@ opt_param_env_vars:
   - { env_var: "SUDO_PASSWORD", env_value: "password", desc: "If this optional variable is set, user will have sudo access in the code-server terminal with the specified password." }
   - { env_var: "SUDO_PASSWORD_HASH", env_value: "", desc: "Optionally set sudo password via hash (takes priority over `SUDO_PASSWORD` var). Format is `$type$salt$hashed`." }
   - { env_var: "PROXY_DOMAIN", env_value: "code-server.my.domain", desc: "If this optional variable is set, this domain will be proxied for subdomain proxying. See [Documentation](https://github.com/cdr/code-server/blob/master/docs/FAQ.md#sub-domains)" }
-  - { env_var: "DEFAULT_WORKSPACE", env_value: "/config/workspace", desc: "If this optional variable is set, code-server will open this directory by default" }
 
 optional_block_1: false
 optional_block_1_items: ""
@@ -75,13 +75,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
-  - { date: "05.10.22:", desc: "Install recommended deps to maintain parity with the older images." }
+  - { date: "12.07.21:", desc: "Rebase to focal" }
-  - { date: "29.09.22:", desc: "Rebase to jammy, switch to s6v3. Fix chown logic to skip `/config/workspace` contents." }
-  - { date: "20.02.22:", desc: "Install using the official tarballs." }
-  - { date: "29.12.21:", desc: "Add `install-extension` as a helper for mods to install extensions." }
-  - { date: "06.12.21:", desc: "Add `DEFAULT_WORKSPACE` env var." }
-  - { date: "29.11.21:", desc: "Rebase to Ubuntu focal." }
-  - { date: "16.09.21:", desc: "Fix slow `chown` on large workspace (contents of workspace folder no longer chowned)." }
   - { date: "11.07.21:", desc: "Bump node to 14 to fix builds" }
   - { date: "08.05.21:", desc: "Fix doc link" }
   - { date: "04.02.20:", desc: "Allow setting gui password via hash using env var `HASHED_PASSWORD`." }

root/etc/cont-init.d/30-config

@@ -17,15 +17,6 @@ if [ -n "${SUDO_PASSWORD}" ] || [ -n "${SUDO_PASSWORD_HASH}" ]; then
     fi
 fi
 
-[[ ! -f /config/.bashrc ]] && \
+# permissions
-    cp /root/.bashrc /config/.bashrc
+chown -R abc:abc \
-[[ ! -f /config/.profile ]] && \
+    /config
-    cp /root/.profile /config/.profile
-
-# fix permissions (ignore contents of /config/workspace)
-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/*
-fi

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

@@ -1 +0,0 @@
-oneshot

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

@@ -1 +0,0 @@
-/etc/s6-overlay/s6-rc.d/init-code-server/run

root/etc/s6-overlay/s6-rc.d/svc-code-server/notification-fd

@@ -1 +0,0 @@
-3

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

@@ -1,26 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-if [ -n "${PASSWORD}" ] || [ -n "${HASHED_PASSWORD}" ]; then
-    AUTH="password"
-else
-    AUTH="none"
-    echo "starting with no password"
-fi
-
-if [ -z ${PROXY_DOMAIN+x} ]; then
-    PROXY_DOMAIN_ARG=""
-else
-    PROXY_DOMAIN_ARG="--proxy-domain=${PROXY_DOMAIN}"
-fi
-
-exec \
-    s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z 127.0.0.1 8443" \
-        s6-setuidgid abc \
-            /app/code-server/bin/code-server \
-                --bind-addr 0.0.0.0:8443 \
-                --user-data-dir /config/data \
-                --extensions-dir /config/extensions \
-                --disable-telemetry \
-                --auth "${AUTH}" \
-                "${PROXY_DOMAIN_ARG}" \
-                "${DEFAULT_WORKSPACE:-/config/workspace}"

root/etc/s6-overlay/s6-rc.d/svc-code-server/type

@@ -1 +0,0 @@
-longrun

root/etc/services.d/code-server/run

@@ -0,0 +1,25 @@
+#!/usr/bin/with-contenv bash
+
+if [ -n "${PASSWORD}" ] || [ -n "${HASHED_PASSWORD}" ]; then
+    AUTH="password"
+else
+    AUTH="none"
+    echo "starting with no password"
+fi
+
+if [ -z ${PROXY_DOMAIN+x} ]; then
+    PROXY_DOMAIN_ARG=""
+else
+    PROXY_DOMAIN_ARG="--proxy-domain=${PROXY_DOMAIN}"
+fi
+
+exec \
+    s6-setuidgid abc \
+        /usr/local/bin/code-server \
+            --bind-addr 0.0.0.0:8443 \
+            --user-data-dir /config/data \
+            --extensions-dir /config/extensions \
+            --disable-telemetry \
+            --auth "${AUTH}" \
+            "${PROXY_DOMAIN_ARG}" \
+            /config/workspace

root/usr/local/bin/install-extension

@@ -1,10 +0,0 @@
-#!/usr/bin/with-contenv bash
-# shellcheck shell=bash
-
-_install=(/app/code-server/bin/code-server "--extensions-dir" "/config/extensions" "--install-extension")
-
-if [ "$(whoami)" == "abc" ]; then
-    "${_install[@]}" "$@"
-else
-    s6-setuidgid abc "${_install[@]}" "$@"
-fi