11 changed files with 201 additions and 198 deletions
--- a/.github/workflows/external_trigger.yml
+++ b/.github/workflows/external_trigger.yml
@ -18,7 +18,7 @@ jobs:
          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 "**** 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"
--- a/44
+++ b/44
@ -12,49 +12,55 @@ ENV HOME="/config"

 RUN \
  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 \
-    nodejs && \
+    libx11-dev \
+    libxkbfile-dev \
+    pkg-config \
+    python3 && \
  echo "**** install runtime dependencies ****" && \
  apt-get install -y \
    git \
    jq \
-    libatomic1 \
    nano \
    net-tools \
-    sudo && \
+    nodejs \
+    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 \
-    | awk '/tag_name/{print $4;exit}' FS='[""]' | sed 's|^v||'); \
-  fi && \
-  mkdir -p /app/code-server && \
-  curl -o \
-    /tmp/code-server.tar.gz -L \
-    "https://github.com/coder/code-server/releases/download/v${CODE_RELEASE}/code-server-${CODE_RELEASE}-linux-amd64.tar.gz" && \
-  tar xf /tmp/code-server.tar.gz -C \
-    /app/code-server --strip-components=1 && \
-  echo "**** patch 4.0.2 ****" && \
-  if [ "${CODE_RELEASE}" = "4.0.2" ] && [ "$(uname -m)" !=  "x86_64" ]; then \
-    cd /app/code-server && \
-    npm i --production @node-rs/argon2; \
+    CODE_RELEASE=$(curl -sX GET https://registry.yarnpkg.com/code-server \
+    | jq -r '."dist-tags".latest' | sed 's|^|v|'); \
  fi && \
+  CODE_VERSION=$(echo "$CODE_RELEASE" | awk '{print substr($1,2); }') && \
+  npm config set python python3 && \
+  yarn config set network-timeout 600000 -g && \
+  yarn --production --verbose --frozen-lockfile global add code-server@"$CODE_VERSION" && \
+  yarn cache clean && \
  echo "**** clean up ****" && \
  apt-get purge --auto-remove -y \
    build-essential \
-    nodejs && \
+    libx11-dev \
+    libxkbfile-dev \
+    libsecret-1-dev \
+    pkg-config && \
  apt-get clean && \
  rm -rf \
    /config/* \
    /tmp/* \
    /var/lib/apt/lists/* \
-    /var/tmp/* \
-    /etc/apt/sources.list.d/nodesource.list
+    /var/tmp/*

 # add local files
 COPY /root /
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@ -12,49 +12,55 @@ ENV HOME="/config"

 RUN \
  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 \
-    nodejs && \
+    libx11-dev \
+    libxkbfile-dev \
+    pkg-config \
+    python3 && \
  echo "**** install runtime dependencies ****" && \
  apt-get install -y \
    git \
    jq \
-    libatomic1 \
    nano \
    net-tools \
-    sudo && \
+    nodejs \
+    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 \
-    | awk '/tag_name/{print $4;exit}' FS='[""]' | sed 's|^v||'); \
-  fi && \
-  mkdir -p /app/code-server && \
-  curl -o \
-    /tmp/code-server.tar.gz -L \
-    "https://github.com/coder/code-server/releases/download/v${CODE_RELEASE}/code-server-${CODE_RELEASE}-linux-arm64.tar.gz" && \
-  tar xf /tmp/code-server.tar.gz -C \
-    /app/code-server --strip-components=1 && \
-  echo "**** patch 4.0.2 ****" && \
-  if [ "${CODE_RELEASE}" = "4.0.2" ] && [ "$(uname -m)" !=  "x86_64" ]; then \
-    cd /app/code-server && \
-    npm i --production @node-rs/argon2; \
+    CODE_RELEASE=$(curl -sX GET https://registry.yarnpkg.com/code-server \
+    | jq -r '."dist-tags".latest' | sed 's|^|v|'); \
  fi && \
+  CODE_VERSION=$(echo "$CODE_RELEASE" | awk '{print substr($1,2); }') && \
+  npm config set python python3 && \
+  yarn config set network-timeout 600000 -g && \
+  yarn --production --verbose --frozen-lockfile global add code-server@"$CODE_VERSION" && \
+  yarn cache clean && \
  echo "**** clean up ****" && \
  apt-get purge --auto-remove -y \
    build-essential \
-    nodejs && \
+    libx11-dev \
+    libxkbfile-dev \
+    libsecret-1-dev \
+    pkg-config && \
  apt-get clean && \
  rm -rf \
    /config/* \
    /tmp/* \
    /var/lib/apt/lists/* \
-    /var/tmp/* \
-    /etc/apt/sources.list.d/nodesource.list
+    /var/tmp/*

 # add local files
 COPY /root /
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@ -12,49 +12,55 @@ ENV HOME="/config"

 RUN \
  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 \
-    nodejs && \
+    libx11-dev \
+    libxkbfile-dev \
+    pkg-config \
+    python3 && \
  echo "**** install runtime dependencies ****" && \
  apt-get install -y \
    git \
    jq \
-    libatomic1 \
    nano \
    net-tools \
-    sudo && \
+    nodejs \
+    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 \
-    | awk '/tag_name/{print $4;exit}' FS='[""]' | sed 's|^v||'); \
-  fi && \
-  mkdir -p /app/code-server && \
-  curl -o \
-    /tmp/code-server.tar.gz -L \
-    "https://github.com/coder/code-server/releases/download/v${CODE_RELEASE}/code-server-${CODE_RELEASE}-linux-armv7l.tar.gz" && \
-  tar xf /tmp/code-server.tar.gz -C \
-    /app/code-server --strip-components=1 && \
-  echo "**** patch 4.0.2 ****" && \
-  if [ "${CODE_RELEASE}" = "4.0.2" ] && [ "$(uname -m)" !=  "x86_64" ]; then \
-    cd /app/code-server && \
-    npm i --production @node-rs/argon2; \
+    CODE_RELEASE=$(curl -sX GET https://registry.yarnpkg.com/code-server \
+    | jq -r '."dist-tags".latest' | sed 's|^|v|'); \
  fi && \
+  CODE_VERSION=$(echo "$CODE_RELEASE" | awk '{print substr($1,2); }') && \
+  npm config set python python3 && \
+  yarn config set network-timeout 600000 -g && \
+  yarn --production --verbose --frozen-lockfile global add code-server@"$CODE_VERSION" && \
+  yarn cache clean && \
  echo "**** clean up ****" && \
  apt-get purge --auto-remove -y \
    build-essential \
-    nodejs && \
+    libx11-dev \
+    libxkbfile-dev \
+    libsecret-1-dev \
+    pkg-config && \
  apt-get clean && \
  rm -rf \
    /config/* \
    /tmp/* \
    /var/lib/apt/lists/* \
-    /var/tmp/* \
-    /etc/apt/sources.list.d/nodesource.list
+    /var/tmp/*

 # add local files
 COPY /root /
--- a/98
+++ b/98
@ -104,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'
        }
@ -118,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]}"
@ -132,15 +133,7 @@ pipeline {
            }
          }

-          if (env.SEMVER != null) {
-            if (BRANCH_NAME != "master" && BRANCH_NAME != "main") {
-              env.SEMVER = "${env.SEMVER}-${BRANCH_NAME}"
-            }
-            println("SEMVER: ${env.SEMVER}")
-          } else {
-            println("No SEMVER detected")
-          }
-
+          println("SEMVER: ${env.SEMVER}")
        }
      }
    }
@ -343,11 +336,9 @@ pipeline {
              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"
-                  cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
-                  git add -u unraid/${CONTAINER_NAME}.xml
-                  git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || :
-                  git commit -m 'Bot Moving Deprecated Unraid Template' || :
+                  echo "Image is on the ignore list, removing Unraid template"
+                  git rm unraid/${CONTAINER_NAME}.xml || :
+                  git commit -m 'Bot Removing Deprecated Unraid Template' || :
                else
                  cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
                  git add unraid/${CONTAINER_NAME}.xml
@ -411,10 +402,10 @@ pipeline {
      steps{
        sh '''#! /bin/bash
              set -e
-              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')
+              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",\
@ -422,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"}]'
           '''
      } 
    }
@ -749,15 +752,11 @@ pipeline {
                    docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest
                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG}
-                    if [ -n "${SEMVER}" ]; then
-                      docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER}
-                    fi
+                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER}
                    docker push ${PUSHIMAGE}:latest
                    docker push ${PUSHIMAGE}:${META_TAG}
                    docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG}
-                    if [ -n "${SEMVER}" ]; then
-                     docker push ${PUSHIMAGE}:${SEMVER}
-                    fi
+                    docker push ${PUSHIMAGE}:${SEMVER}
                  done
               '''
          }
@ -766,10 +765,8 @@ pipeline {
                  docker rmi \
                  ${DELETEIMAGE}:${META_TAG} \
                  ${DELETEIMAGE}:${EXT_RELEASE_TAG} \
-                  ${DELETEIMAGE}:latest || :
-                  if [ -n "${SEMVER}" ]; then
-                    docker rmi ${DELETEIMAGE}:${SEMVER} || :
-                  fi
+                  ${DELETEIMAGE}:latest \
+                  ${DELETEIMAGE}:${SEMVER} || :
                done
             '''
        }
@ -819,11 +816,9 @@ pipeline {
                    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}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER}
-                      docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
-                    fi
+                    docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER}
+                    docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER}
+                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
                    docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
                    docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
                    docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
@ -833,11 +828,9 @@ pipeline {
                    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}:arm32v7-${SEMVER}
-                      docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
-                    fi
+                    docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
+                    docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER}
+                    docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
                    docker manifest push --purge ${MANIFESTIMAGE}:latest || :
                    docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest
                    docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm
@ -850,18 +843,14 @@ 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 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}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
-                    fi
+                    docker manifest push --purge ${MANIFESTIMAGE}:${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}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
                    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} 
-                    fi
+                    docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} 
                  done
               '''
          }
@ -871,18 +860,15 @@ pipeline {
                  ${DELETEIMAGE}:amd64-${META_TAG} \
                  ${DELETEIMAGE}:amd64-latest \
                  ${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \
+                  ${DELETEIMAGE}:amd64-${SEMVER} \
                  ${DELETEIMAGE}:arm32v7-${META_TAG} \
                  ${DELETEIMAGE}:arm32v7-latest \
                  ${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \
+                  ${DELETEIMAGE}:arm32v7-${SEMVER} \
                  ${DELETEIMAGE}:arm64v8-${META_TAG} \
                  ${DELETEIMAGE}:arm64v8-latest \
-                  ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || :
-                  if [ -n "${SEMVER}" ]; then
-                    docker rmi \
-                    ${DELETEIMAGE}:amd64-${SEMVER} \
-                    ${DELETEIMAGE}:arm32v7-${SEMVER} \
-                    ${DELETEIMAGE}:arm64v8-${SEMVER} || :
-                  fi
+                  ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} \
+                  ${DELETEIMAGE}:arm64v8-${SEMVER} || :
                done
                docker rmi \
                ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \
--- a/README.md
+++ b/README.md
@ -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)
@ -52,27 +51,27 @@ 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 |
-| :----: | :----: | ---- |
-| x86-64 | ✅ | amd64-\<version tag\> |
-| arm64 | ✅ | arm64v8-\<version tag\> |
-| armhf| ✅ | arm32v7-\<version tag\> |
+| Architecture | Tag |
+| :----: | --- |
+| x86-64 | amd64-latest |
+| arm64 | arm64v8-latest |
+| armhf | arm32v7-latest |

 ## Version Tags

-This image provides various versions that are available via tags. Please read the descriptions carefully and exercise caution when using unstable or development 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 | Available | Description |
-| :----: | :----: |--- |
-| latest | ✅ | Stable releases |
-| focal | ✅ | DEPRECATED (no longer updated, `latest` is rebased on focal) - Stable releases, based on Ubuntu Focal |
-| development | ✅ | DEPRECATED (no longer updated) - Prereleases from their GitHub |
+| Tag | Description |
+| :----: | --- |
+| latest | Stable releases |
+| focal | DEPRECATED (no longer updated, `latest` is rebased on focal) - Stable releases, based on Ubuntu Focal |
+| development | DEPRECATED (no longer updated) - Prereleases from their GitHub |

 ## Application Setup

@ -100,7 +99,7 @@ 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
@ -136,7 +135,7 @@ docker run -d \
  -p 8443:8443 \
  -v /path/to/appdata/config:/config \
  --restart unless-stopped \
-  lscr.io/linuxserver/code-server:latest
+  lscr.io/linuxserver/code-server
 ```

 ## Parameters
@ -200,7 +199,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

@ -218,7 +217,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)
@ -266,8 +265,6 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

 ## Versions

-* **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).
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@ -3,7 +3,7 @@
 # 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
 ls_branch: master
--- a/package_versions.txt
+++ b/package_versions.txt
@ -1,36 +1,37 @@
 adduser3.118ubuntu2
-apt2.0.9
-apt-utils2.0.9
-base-files11ubuntu5.5
+apt2.0.6
+apt-utils2.0.6
+base-files11ubuntu5.4
 base-passwd3.5.47
 bash5.0-6ubuntu1.1
-bsdutils1:2.34-0.1ubuntu9.3
+bsdutils1:2.34-0.1ubuntu9.1
 bzip21.0.8-2
-ca-certificates20211016~20.04.1
+ca-certificates20210119~20.04.2
 coreutils8.30-3ubuntu2
-curl7.68.0-1ubuntu2.12
+curl7.68.0-1ubuntu2.7
 dash0.5.10.2-6
 debconf1.5.73
 debianutils4.9.1
 diffutils1:3.7-3
-dirmngr2.2.19-3ubuntu2.2
+dirmngr2.2.19-3ubuntu2.1
 dpkg1.19.7ubuntu3
 e2fsprogs1.45.5-2ubuntu1
-fdisk2.34-0.1ubuntu9.3
+fdisk2.34-0.1ubuntu9.1
+file1:5.38-4
 findutils4.7.0-1ubuntu1
 gcc-10-base10.3.0-1ubuntu1~20.04
-git1:2.25.1-1ubuntu3.5
-git-man1:2.25.1-1ubuntu3.5
-gnupg2.2.19-3ubuntu2.2
-gnupg-l10n2.2.19-3ubuntu2.2
-gnupg-utils2.2.19-3ubuntu2.2
-gpg2.2.19-3ubuntu2.2
-gpg-agent2.2.19-3ubuntu2.2
-gpgconf2.2.19-3ubuntu2.2
-gpgsm2.2.19-3ubuntu2.2
-gpgv2.2.19-3ubuntu2.2
-gpg-wks-client2.2.19-3ubuntu2.2
-gpg-wks-server2.2.19-3ubuntu2.2
+git1:2.25.1-1ubuntu3.2
+git-man1:2.25.1-1ubuntu3.2
+gnupg2.2.19-3ubuntu2.1
+gnupg-l10n2.2.19-3ubuntu2.1
+gnupg-utils2.2.19-3ubuntu2.1
+gpg2.2.19-3ubuntu2.1
+gpg-agent2.2.19-3ubuntu2.1
+gpgconf2.2.19-3ubuntu2.1
+gpgsm2.2.19-3ubuntu2.1
+gpgv2.2.19-3ubuntu2.1
+gpg-wks-client2.2.19-3ubuntu2.1
+gpg-wks-server2.2.19-3ubuntu2.1
 grep3.4-1
 gzip1.10-0ubuntu4
 hostname3.23
@ -39,32 +40,31 @@ jq1.6-1ubuntu0.20.04.1
 krb5-locales1.17-6ubuntu4.1
 less551-1ubuntu0.1
 libacl12.2.53-6
-libapt-pkg6.02.0.9
+libapt-pkg6.02.0.6
 libasn1-8-heimdal7.7.0+dfsg-1ubuntu1
 libassuan02.5.3-7ubuntu2
-libatomic110.3.0-1ubuntu1~20.04
 libattr11:2.4.48-5
 libaudit11:2.8.5-2ubuntu6
 libaudit-common1:2.8.5-2ubuntu6
-libblkid12.34-0.1ubuntu9.3
+libblkid12.34-0.1ubuntu9.1
 libbrotli11.0.7-6ubuntu0.1
 libbsd00.10.0-1
 libbz2-1.01.0.8-2
-libc62.31-0ubuntu9.9
+libc62.31-0ubuntu9.2
 libcap-ng00.7.9-2.1build1
-libc-bin2.31-0ubuntu9.7
+libc-bin2.31-0ubuntu9.2
 libcbor0.60.6.0-0ubuntu1
 libcom-err21.45.5-2ubuntu1
 libcrypt11:4.4.10-10ubuntu4
-libcurl3-gnutls7.68.0-1ubuntu2.12
-libcurl47.68.0-1ubuntu2.12
+libcurl3-gnutls7.68.0-1ubuntu2.7
+libcurl47.68.0-1ubuntu2.7
 libdb5.35.3.28+dfsg1-0.6ubuntu2
 libdebconfclient00.251ubuntu1
 libedit23.1-20191231-1
 liberror-perl0.17029-1
-libexpat12.2.9-1ubuntu0.4
+libexpat12.2.9-1build1
 libext2fs21.45.5-2ubuntu1
-libfdisk12.34-0.1ubuntu9.3
+libfdisk12.34-0.1ubuntu9.1
 libffi73.3-4
 libfido2-11.3.1-1ubuntu2
 libgcc-s110.3.0-1ubuntu1~20.04
@ -84,16 +84,19 @@ libhx509-5-heimdal7.7.0+dfsg-1ubuntu1
 libidn2-02.2.0-2
 libjq11.6-1ubuntu0.20.04.1
 libk5crypto31.17-6ubuntu4.1
-libkeyutils11.6-6ubuntu1.1
+libkeyutils11.6-6ubuntu1
 libkrb5-26-heimdal7.7.0+dfsg-1ubuntu1
 libkrb5-31.17-6ubuntu4.1
 libkrb5support01.17-6ubuntu4.1
 libksba81.3.5-2
-libldap-2.4-22.4.49+dfsg-2ubuntu1.9
-libldap-common2.4.49+dfsg-2ubuntu1.9
+libldap-2.4-22.4.49+dfsg-2ubuntu1.8
+libldap-common2.4.49+dfsg-2ubuntu1.8
 liblz4-11.9.2-2ubuntu0.20.04.1
 liblzma55.2.4-1ubuntu1
-libmount12.34-0.1ubuntu9.3
+libmagic11:5.38-4
+libmagic-mgc1:5.38-4
+libmount12.34-0.1ubuntu9.1
+libmpdec22.4.2-3
 libncurses66.2-0ubuntu2
 libncursesw66.2-0ubuntu2
 libnettle73.5.1+really3.5.1-2ubuntu0.2
@ -110,29 +113,32 @@ libpcre32:8.39-12build1
 libperl5.305.30.0-9ubuntu0.2
 libprocps82:3.3.16-1ubuntu2.3
 libpsl50.21.0-1ubuntu1
+libpython3.8-minimal3.8.10-0ubuntu1~20.04.1
+libpython3.8-stdlib3.8.10-0ubuntu1~20.04.1
+libpython3-stdlib3.8.2-0ubuntu2
 libreadline88.0-4
 libroken18-heimdal7.7.0+dfsg-1ubuntu1
 librtmp12.4+20151223.gitfa8646d.1-2build1
-libsasl2-22.1.27+dfsg-2ubuntu0.1
-libsasl2-modules2.1.27+dfsg-2ubuntu0.1
-libsasl2-modules-db2.1.27+dfsg-2ubuntu0.1
-libseccomp22.5.1-1ubuntu1~20.04.2
+libsasl2-22.1.27+dfsg-2
+libsasl2-modules2.1.27+dfsg-2
+libsasl2-modules-db2.1.27+dfsg-2
+libseccomp22.5.1-1ubuntu1~20.04.1
 libselinux13.0-1build2
 libsemanage13.0-1build2
 libsemanage-common3.0-1build2
 libsepol13.0-1
-libsmartcols12.34-0.1ubuntu9.3
-libsqlite3-03.31.1-4ubuntu0.3
+libsmartcols12.34-0.1ubuntu9.1
+libsqlite3-03.31.1-4ubuntu0.2
 libss21.45.5-2ubuntu1
 libssh-40.9.3-2ubuntu2.2
-libssl1.11.1.1f-1ubuntu2.16
+libssl1.11.1.1f-1ubuntu2.9
 libstdc++610.3.0-1ubuntu1~20.04
-libsystemd0245.4-4ubuntu3.15
+libsystemd0245.4-4ubuntu3.13
 libtasn1-64.16.0-2
 libtinfo66.2-0ubuntu2
-libudev1245.4-4ubuntu3.15
+libudev1245.4-4ubuntu3.13
 libunistring20.9.10-2
-libuuid12.34-0.1ubuntu9.3
+libuuid12.34-0.1ubuntu9.1
 libwind0-heimdal7.7.0+dfsg-1ubuntu1
 libx11-62:1.6.9-2ubuntu1.2
 libx11-data2:1.6.9-2ubuntu1.2
@ -142,19 +148,21 @@ libxdmcp61:1.1.3-0ubuntu1
 libxext62:1.3.4-0ubuntu1
 libxmuu12:1.1.3-0ubuntu1
 libzstd11.4.4+dfsg-3ubuntu0.1
-locales2.31-0ubuntu9.9
+locales2.31-0ubuntu9.2
 login1:4.8.1-1ubuntu5.20.04.1
 logsave1.45.5-2ubuntu1
 lsb-base11.1.0ubuntu2
 mawk1.3.4.20200120-2
-mount2.34-0.1ubuntu9.3
+mime-support3.64ubuntu1
+mount2.34-0.1ubuntu9.1
 nano4.8-1ubuntu1
 ncurses-base6.2-0ubuntu2
 ncurses-bin6.2-0ubuntu2
 netbase6.1
 net-tools1.60+git20180626.aebd88e-1ubuntu1
-openssh-client1:8.2p1-4ubuntu0.5
-openssl1.1.1f-1ubuntu2.16
+nodejs14.18.2-deb-1nodesource1
+openssh-client1:8.2p1-4ubuntu0.3
+openssl1.1.1f-1ubuntu2.9
 passwd1:4.8.1-1ubuntu5.20.04.1
 patch2.7.6-6
 perl5.30.0-9ubuntu0.2
@ -163,14 +171,20 @@ perl-modules-5.305.30.0-9ubuntu0.2
 pinentry-curses1.1.0-3build1
 procps2:3.3.16-1ubuntu2.3
 publicsuffix20200303.0012-1
+python33.8.2-0ubuntu2
+python3.83.8.10-0ubuntu1~20.04.1
+python3.8-minimal3.8.10-0ubuntu1~20.04.1
+python3-minimal3.8.2-0ubuntu2
 readline-common8.0-4
 sed4.7-1
 sensible-utils0.0.12+nmu1
 sudo1.8.31-1ubuntu1.2
 sysvinit-utils2.96-2.1ubuntu1
-tar1.30+dfsg-7ubuntu0.20.04.2
-tzdata2022a-0ubuntu0.20.04
+tar1.30+dfsg-7ubuntu0.20.04.1
+tzdata2021e-0ubuntu0.20.04
 ubuntu-keyring2020.02.11.4
-util-linux2.34-0.1ubuntu9.3
+util-linux2.34-0.1ubuntu9.1
 xauth1:1.1-0ubuntu1
+xz-utils5.2.4-1ubuntu1
+yarn1.22.15-1
 zlib1g1:1.2.11.dfsg-2ubuntu1.2
--- a/readme-vars.yml
+++ b/readme-vars.yml
@ -77,8 +77,6 @@ app_setup_block: |

 # changelog
 changelogs:
-  - { 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)." }
--- a/root/etc/services.d/code-server/run
+++ b/root/etc/services.d/code-server/run
@ -15,7 +15,7 @@ fi

 exec \
    s6-setuidgid abc \
-        /app/code-server/bin/code-server \
+        /usr/local/bin/code-server \
            --bind-addr 0.0.0.0:8443 \
            --user-data-dir /config/data \
            --extensions-dir /config/extensions \
--- a/root/usr/local/bin/install-extension
+++ b/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