Bot Updating Package Versions

.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 -sX GET https://registry.yarnpkg.com/code-server | jq -r '."dist-tags".latest' | sed 's|^|v|')
+          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||')
           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"

Dockerfile

@@ -12,55 +12,49 @@ 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 \
-    libx11-dev \
+    nodejs && \
-    libxkbfile-dev \
-    pkg-config \
-    python3 && \
   echo "**** install runtime dependencies ****" && \
   apt-get install -y \
     git \
     jq \
+    libatomic1 \
     nano \
     net-tools \
-    nodejs \
+    sudo && \
-    sudo \
-    yarn && \
   echo "**** install code-server ****" && \
   if [ -z ${CODE_RELEASE+x} ]; then \
-    CODE_RELEASE=$(curl -sX GET https://registry.yarnpkg.com/code-server \
+    CODE_RELEASE=$(curl -sX GET https://api.github.com/repos/coder/code-server/releases/latest \
-    | jq -r '."dist-tags".latest' | sed 's|^|v|'); \
+    | 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; \
   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 \
-    libx11-dev \
+    nodejs && \
-    libxkbfile-dev \
-    libsecret-1-dev \
-    pkg-config && \
   apt-get clean && \
   rm -rf \
     /config/* \
     /tmp/* \
     /var/lib/apt/lists/* \
-    /var/tmp/*
+    /var/tmp/* \
+    /etc/apt/sources.list.d/nodesource.list
 
 # add local files
 COPY /root /

Dockerfile.aarch64

@@ -12,55 +12,49 @@ 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 \
-    libx11-dev \
+    nodejs && \
-    libxkbfile-dev \
-    pkg-config \
-    python3 && \
   echo "**** install runtime dependencies ****" && \
   apt-get install -y \
     git \
     jq \
+    libatomic1 \
     nano \
     net-tools \
-    nodejs \
+    sudo && \
-    sudo \
-    yarn && \
   echo "**** install code-server ****" && \
   if [ -z ${CODE_RELEASE+x} ]; then \
-    CODE_RELEASE=$(curl -sX GET https://registry.yarnpkg.com/code-server \
+    CODE_RELEASE=$(curl -sX GET https://api.github.com/repos/coder/code-server/releases/latest \
-    | jq -r '."dist-tags".latest' | sed 's|^|v|'); \
+    | 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; \
   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 \
-    libx11-dev \
+    nodejs && \
-    libxkbfile-dev \
-    libsecret-1-dev \
-    pkg-config && \
   apt-get clean && \
   rm -rf \
     /config/* \
     /tmp/* \
     /var/lib/apt/lists/* \
-    /var/tmp/*
+    /var/tmp/* \
+    /etc/apt/sources.list.d/nodesource.list
 
 # add local files
 COPY /root /

Dockerfile.armhf

@@ -12,55 +12,49 @@ 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 \
-    libx11-dev \
+    nodejs && \
-    libxkbfile-dev \
-    pkg-config \
-    python3 && \
   echo "**** install runtime dependencies ****" && \
   apt-get install -y \
     git \
     jq \
+    libatomic1 \
     nano \
     net-tools \
-    nodejs \
+    sudo && \
-    sudo \
-    yarn && \
   echo "**** install code-server ****" && \
   if [ -z ${CODE_RELEASE+x} ]; then \
-    CODE_RELEASE=$(curl -sX GET https://registry.yarnpkg.com/code-server \
+    CODE_RELEASE=$(curl -sX GET https://api.github.com/repos/coder/code-server/releases/latest \
-    | jq -r '."dist-tags".latest' | sed 's|^|v|'); \
+    | 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; \
   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 \
-    libx11-dev \
+    nodejs && \
-    libxkbfile-dev \
-    libsecret-1-dev \
-    pkg-config && \
   apt-get clean && \
   rm -rf \
     /config/* \
     /tmp/* \
     /var/lib/apt/lists/* \
-    /var/tmp/*
+    /var/tmp/* \
+    /etc/apt/sources.list.d/nodesource.list
 
 # add local files
 COPY /root /

Jenkinsfile

@@ -104,7 +104,7 @@ pipeline {
       steps{
         script{
           env.EXT_RELEASE = sh(
-            script: ''' curl -sX GET https://registry.yarnpkg.com/code-server | jq -r '."dist-tags".latest' | sed 's|^|v|' ''',
+            script: ''' curl -sX GET https://api.github.com/repos/coder/code-server/releases/latest | jq -r '.tag_name' | sed 's|^v||' ''',
             returnStdout: true).trim()
             env.RELEASE_LINK = 'custom_command'
         }

README.md

@@ -266,6 +266,7 @@ 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.

jenkins-vars.yml

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

package_versions.txt

@@ -1,10 +1,10 @@
 adduser3.118ubuntu2
 apt2.0.6
 apt-utils2.0.6
-base-files11ubuntu5.4
+base-files11ubuntu5.5
 base-passwd3.5.47
 bash5.0-6ubuntu1.1
-bsdutils1:2.34-0.1ubuntu9.1
+bsdutils1:2.34-0.1ubuntu9.3
 bzip21.0.8-2
 ca-certificates20210119~20.04.2
 coreutils8.30-3ubuntu2
@@ -16,8 +16,7 @@ diffutils1:3.7-3
 dirmngr2.2.19-3ubuntu2.1
 dpkg1.19.7ubuntu3
 e2fsprogs1.45.5-2ubuntu1
-fdisk2.34-0.1ubuntu9.1
+fdisk2.34-0.1ubuntu9.3
-file1:5.38-4
 findutils4.7.0-1ubuntu1
 gcc-10-base10.3.0-1ubuntu1~20.04
 git1:2.25.1-1ubuntu3.2
@@ -43,16 +42,17 @@ libacl12.2.53-6
 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.1
+libblkid12.34-0.1ubuntu9.3
 libbrotli11.0.7-6ubuntu0.1
 libbsd00.10.0-1
 libbz2-1.01.0.8-2
-libc62.31-0ubuntu9.2
+libc62.31-0ubuntu9.7
 libcap-ng00.7.9-2.1build1
-libc-bin2.31-0ubuntu9.2
+libc-bin2.31-0ubuntu9.7
 libcbor0.60.6.0-0ubuntu1
 libcom-err21.45.5-2ubuntu1
 libcrypt11:4.4.10-10ubuntu4
@@ -62,9 +62,9 @@ libdb5.35.3.28+dfsg1-0.6ubuntu2
 libdebconfclient00.251ubuntu1
 libedit23.1-20191231-1
 liberror-perl0.17029-1
-libexpat12.2.9-1build1
+libexpat12.2.9-1ubuntu0.4
 libext2fs21.45.5-2ubuntu1
-libfdisk12.34-0.1ubuntu9.1
+libfdisk12.34-0.1ubuntu9.3
 libffi73.3-4
 libfido2-11.3.1-1ubuntu2
 libgcc-s110.3.0-1ubuntu1~20.04
@@ -93,10 +93,7 @@ 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
-libmagic11:5.38-4
+libmount12.34-0.1ubuntu9.3
-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
@@ -113,32 +110,29 @@ 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.2
-libpython3.8-stdlib3.8.10-0ubuntu1~20.04.2
-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-2
+libsasl2-22.1.27+dfsg-2ubuntu0.1
-libsasl2-modules2.1.27+dfsg-2
+libsasl2-modules2.1.27+dfsg-2ubuntu0.1
-libsasl2-modules-db2.1.27+dfsg-2
+libsasl2-modules-db2.1.27+dfsg-2ubuntu0.1
 libseccomp22.5.1-1ubuntu1~20.04.2
 libselinux13.0-1build2
 libsemanage13.0-1build2
 libsemanage-common3.0-1build2
 libsepol13.0-1
-libsmartcols12.34-0.1ubuntu9.1
+libsmartcols12.34-0.1ubuntu9.3
 libsqlite3-03.31.1-4ubuntu0.2
 libss21.45.5-2ubuntu1
 libssh-40.9.3-2ubuntu2.2
-libssl1.11.1.1f-1ubuntu2.10
+libssl1.11.1.1f-1ubuntu2.12
 libstdc++610.3.0-1ubuntu1~20.04
 libsystemd0245.4-4ubuntu3.15
 libtasn1-64.16.0-2
 libtinfo66.2-0ubuntu2
 libudev1245.4-4ubuntu3.15
 libunistring20.9.10-2
-libuuid12.34-0.1ubuntu9.1
+libuuid12.34-0.1ubuntu9.3
 libwind0-heimdal7.7.0+dfsg-1ubuntu1
 libx11-62:1.6.9-2ubuntu1.2
 libx11-data2:1.6.9-2ubuntu1.2
@@ -148,21 +142,19 @@ libxdmcp61:1.1.3-0ubuntu1
 libxext62:1.3.4-0ubuntu1
 libxmuu12:1.1.3-0ubuntu1
 libzstd11.4.4+dfsg-3ubuntu0.1
-locales2.31-0ubuntu9.2
+locales2.31-0ubuntu9.7
 login1:4.8.1-1ubuntu5.20.04.1
 logsave1.45.5-2ubuntu1
 lsb-base11.1.0ubuntu2
 mawk1.3.4.20200120-2
-mime-support3.64ubuntu1
+mount2.34-0.1ubuntu9.3
-mount2.34-0.1ubuntu9.1
 nano4.8-1ubuntu1
 ncurses-base6.2-0ubuntu2
 ncurses-bin6.2-0ubuntu2
 netbase6.1
 net-tools1.60+git20180626.aebd88e-1ubuntu1
-nodejs14.19.0-deb-1nodesource1
 openssh-client1:8.2p1-4ubuntu0.4
-openssl1.1.1f-1ubuntu2.10
+openssl1.1.1f-1ubuntu2.12
 passwd1:4.8.1-1ubuntu5.20.04.1
 patch2.7.6-6
 perl5.30.0-9ubuntu0.2
@@ -171,20 +163,14 @@ 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.2
-python3.8-minimal3.8.10-0ubuntu1~20.04.2
-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.1
+tar1.30+dfsg-7ubuntu0.20.04.2
 tzdata2021e-0ubuntu0.20.04
 ubuntu-keyring2020.02.11.4
-util-linux2.34-0.1ubuntu9.1
+util-linux2.34-0.1ubuntu9.3
 xauth1:1.1-0ubuntu1
-xz-utils5.2.4-1ubuntu1
-yarn1.22.17-1
 zlib1g1:1.2.11.dfsg-2ubuntu1.2

readme-vars.yml

@@ -77,6 +77,7 @@ 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." }

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

@@ -15,7 +15,7 @@ fi
 
 exec \
     s6-setuidgid abc \
-        /usr/local/bin/code-server \
+        /app/code-server/bin/code-server \
             --bind-addr 0.0.0.0:8443 \
             --user-data-dir /config/data \
             --extensions-dir /config/extensions \

root/usr/local/bin/install-extension

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