From f381942942f302ed74ee8d312634f5bd6721a36d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 6 Feb 2022 13:30:23 +0100 Subject: [PATCH 01/23] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 7c1bbf8..b017c3c 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -160,7 +160,7 @@ ncurses-base6.2-0ubuntu2 ncurses-bin6.2-0ubuntu2 netbase6.1 net-tools1.60+git20180626.aebd88e-1ubuntu1 -nodejs14.18.3-deb-1nodesource1 +nodejs14.19.0-deb-1nodesource1 openssh-client1:8.2p1-4ubuntu0.4 openssl1.1.1f-1ubuntu2.10 passwd1:4.8.1-1ubuntu5.20.04.1 From 16909c627496c0111da4cae5ebb746552d1a89c7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 20 Feb 2022 12:33:41 +0000 Subject: [PATCH 02/23] Bot Updating Package Versions --- package_versions.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index b017c3c..c291f80 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -4,7 +4,7 @@ apt-utils2.0.6 base-files11ubuntu5.4 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,7 +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 @@ -46,7 +46,7 @@ libassuan02.5.3-7ubuntu2 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 @@ -64,7 +64,7 @@ libedit23.1-20191231-1 liberror-perl0.17029-1 libexpat12.2.9-1build1 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 @@ -95,7 +95,7 @@ liblz4-11.9.2-2ubuntu0.20.04.1 liblzma55.2.4-1ubuntu1 libmagic11:5.38-4 libmagic-mgc1:5.38-4 -libmount12.34-0.1ubuntu9.1 +libmount12.34-0.1ubuntu9.3 libmpdec22.4.2-3 libncurses66.2-0ubuntu2 libncursesw66.2-0ubuntu2 @@ -127,7 +127,7 @@ 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 @@ -138,7 +138,7 @@ 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 @@ -154,7 +154,7 @@ logsave1.45.5-2ubuntu1 lsb-base11.1.0ubuntu2 mawk1.3.4.20200120-2 mime-support3.64ubuntu1 -mount2.34-0.1ubuntu9.1 +mount2.34-0.1ubuntu9.3 nano4.8-1ubuntu1 ncurses-base6.2-0ubuntu2 ncurses-bin6.2-0ubuntu2 @@ -183,7 +183,7 @@ sysvinit-utils2.96-2.1ubuntu1 tar1.30+dfsg-7ubuntu0.20.04.1 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 From a1fa7f021e53f4c68fafcff99b42c8f2160c1258 Mon Sep 17 00:00:00 2001 From: aptalca Date: Sun, 20 Feb 2022 15:51:53 -0500 Subject: [PATCH 03/23] install using official debs --- .github/workflows/external_trigger.yml | 2 +- Dockerfile | 47 ++++---------------------- Dockerfile.aarch64 | 47 ++++---------------------- Dockerfile.armhf | 47 ++++---------------------- Jenkinsfile | 2 +- README.md | 1 + jenkins-vars.yml | 2 +- readme-vars.yml | 1 + root/etc/services.d/code-server/run | 2 +- 9 files changed, 24 insertions(+), 127 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 8385449..4035f31 100644 --- 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 -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" diff --git a/Dockerfile b/Dockerfile index 25ea3af..2aa9e59 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,51 +11,16 @@ LABEL maintainer="aptalca" 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 \ - libxkbfile-dev \ - pkg-config \ - python3 && \ - echo "**** install runtime dependencies ****" && \ - apt-get install -y \ - git \ - jq \ - nano \ - net-tools \ - nodejs \ - sudo \ - yarn && \ echo "**** install code-server ****" && \ if [ -z ${CODE_RELEASE+x} ]; then \ - CODE_RELEASE=$(curl -sX GET https://registry.yarnpkg.com/code-server \ - | jq -r '."dist-tags".latest' | sed 's|^|v|'); \ + 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 && \ - 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 && \ + curl -o \ + /tmp/code-server.deb -L \ + "https://github.com/coder/code-server/releases/download/v${CODE_RELEASE}/code-server_${CODE_RELEASE}_amd64.deb" && \ + dpkg -i /tmp/code-server.deb && \ 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/* \ /tmp/* \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index cd62947..38d1fde 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -11,51 +11,16 @@ LABEL maintainer="aptalca" 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 \ - libxkbfile-dev \ - pkg-config \ - python3 && \ - echo "**** install runtime dependencies ****" && \ - apt-get install -y \ - git \ - jq \ - nano \ - net-tools \ - nodejs \ - sudo \ - yarn && \ echo "**** install code-server ****" && \ if [ -z ${CODE_RELEASE+x} ]; then \ - CODE_RELEASE=$(curl -sX GET https://registry.yarnpkg.com/code-server \ - | jq -r '."dist-tags".latest' | sed 's|^|v|'); \ + 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 && \ - 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 && \ + curl -o \ + /tmp/code-server.deb -L \ + "https://github.com/coder/code-server/releases/download/v${CODE_RELEASE}/code-server_${CODE_RELEASE}_arm64.deb" && \ + dpkg -i /tmp/code-server.deb && \ 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/* \ /tmp/* \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 9537b79..59d9d82 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -11,51 +11,16 @@ LABEL maintainer="aptalca" 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 \ - libxkbfile-dev \ - pkg-config \ - python3 && \ - echo "**** install runtime dependencies ****" && \ - apt-get install -y \ - git \ - jq \ - nano \ - net-tools \ - nodejs \ - sudo \ - yarn && \ echo "**** install code-server ****" && \ if [ -z ${CODE_RELEASE+x} ]; then \ - CODE_RELEASE=$(curl -sX GET https://registry.yarnpkg.com/code-server \ - | jq -r '."dist-tags".latest' | sed 's|^|v|'); \ + 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 && \ - 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 && \ + curl -o \ + /tmp/code-server.deb -L \ + "https://github.com/coder/code-server/releases/download/v${CODE_RELEASE}/code-server_${CODE_RELEASE}_armhf.deb" && \ + dpkg -i /tmp/code-server.deb && \ 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/* \ /tmp/* \ diff --git a/Jenkinsfile b/Jenkinsfile index 8ca9e36..daa2df1 100644 --- a/Jenkinsfile +++ b/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' } diff --git a/README.md b/README.md index f2d5db4..d1f1fa5 100644 --- a/README.md +++ b/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 debs. * **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. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index f05393f..5931893 100644 --- 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://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 diff --git a/readme-vars.yml b/readme-vars.yml index 7b86228..ffdbdc7 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -77,6 +77,7 @@ app_setup_block: | # changelog changelogs: + - { date: "20.02.22:", desc: "Install using the official debs." } - { 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." } diff --git a/root/etc/services.d/code-server/run b/root/etc/services.d/code-server/run index 9afa866..e01307c 100644 --- 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 \ - /usr/local/bin/code-server \ + /usr/lib/code-server/bin/code-server \ --bind-addr 0.0.0.0:8443 \ --user-data-dir /config/data \ --extensions-dir /config/extensions \ From 29c861029a25d2cbbadabf31ecb9df8b8da18648 Mon Sep 17 00:00:00 2001 From: aptalca Date: Sun, 20 Feb 2022 19:38:02 -0500 Subject: [PATCH 04/23] add libatomic --- Dockerfile.armhf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 59d9d82..6b73693 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -11,6 +11,9 @@ LABEL maintainer="aptalca" ENV HOME="/config" RUN \ + apt-get update && \ + apt-get install -y \ + libatomic1 && \ 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 \ @@ -21,6 +24,7 @@ RUN \ "https://github.com/coder/code-server/releases/download/v${CODE_RELEASE}/code-server_${CODE_RELEASE}_armhf.deb" && \ dpkg -i /tmp/code-server.deb && \ echo "**** clean up ****" && \ + apt-get clean && \ rm -rf \ /config/* \ /tmp/* \ From b087315336e30a0e9088c88d2570851f7a14a075 Mon Sep 17 00:00:00 2001 From: aptalca Date: Sun, 20 Feb 2022 21:04:50 -0500 Subject: [PATCH 05/23] use official tarballs and patch arm builds --- Dockerfile | 37 +++++++++++++++++++++++++--- Dockerfile.aarch64 | 37 +++++++++++++++++++++++++--- Dockerfile.armhf | 35 ++++++++++++++++++++++---- README.md | 2 +- readme-vars.yml | 2 +- root/etc/services.d/code-server/run | 2 +- root/usr/local/bin/install-extension | 2 +- 7 files changed, 100 insertions(+), 17 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2aa9e59..38d8c51 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,21 +11,50 @@ LABEL maintainer="aptalca" ENV HOME="/config" RUN \ + echo "**** install node repo ****" && \ + 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 && \ + echo "**** install build dependencies ****" && \ + apt-get update && \ + apt-get install -y \ + build-essential \ + nodejs && \ + echo "**** install runtime dependencies ****" && \ + apt-get install -y \ + git \ + jq \ + libatomic1 \ + nano \ + net-tools \ + sudo && \ 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.deb -L \ - "https://github.com/coder/code-server/releases/download/v${CODE_RELEASE}/code-server_${CODE_RELEASE}_amd64.deb" && \ - dpkg -i /tmp/code-server.deb && \ + /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 && \ echo "**** clean up ****" && \ + apt-get purge --auto-remove -y \ + build-essential \ + nodejs && \ + 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 / diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 38d1fde..e739ca3 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -11,21 +11,50 @@ LABEL maintainer="aptalca" ENV HOME="/config" RUN \ + echo "**** install node repo ****" && \ + 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 && \ + echo "**** install build dependencies ****" && \ + apt-get update && \ + apt-get install -y \ + build-essential \ + nodejs && \ + echo "**** install runtime dependencies ****" && \ + apt-get install -y \ + git \ + jq \ + libatomic1 \ + nano \ + net-tools \ + sudo && \ 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.deb -L \ - "https://github.com/coder/code-server/releases/download/v${CODE_RELEASE}/code-server_${CODE_RELEASE}_arm64.deb" && \ - dpkg -i /tmp/code-server.deb && \ + /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 && \ echo "**** clean up ****" && \ + apt-get purge --auto-remove -y \ + build-essential \ + nodejs && \ + 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 / diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 6b73693..5b5063f 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -11,25 +11,50 @@ LABEL maintainer="aptalca" ENV HOME="/config" RUN \ + echo "**** install node repo ****" && \ + 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 && \ + echo "**** install build dependencies ****" && \ apt-get update && \ apt-get install -y \ - libatomic1 && \ + build-essential \ + nodejs && \ + echo "**** install runtime dependencies ****" && \ + apt-get install -y \ + git \ + jq \ + libatomic1 \ + nano \ + net-tools \ + sudo && \ 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.deb -L \ - "https://github.com/coder/code-server/releases/download/v${CODE_RELEASE}/code-server_${CODE_RELEASE}_armhf.deb" && \ - dpkg -i /tmp/code-server.deb && \ + /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 && \ echo "**** clean up ****" && \ + apt-get purge --auto-remove -y \ + build-essential \ + nodejs && \ 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 / diff --git a/README.md b/README.md index d1f1fa5..de335b8 100644 --- a/README.md +++ b/README.md @@ -266,7 +266,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions -* **20.02.22:** - Install using the official debs. +* **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. diff --git a/readme-vars.yml b/readme-vars.yml index ffdbdc7..76c8bb4 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -77,7 +77,7 @@ app_setup_block: | # changelog changelogs: - - { date: "20.02.22:", desc: "Install using the official debs." } + - { 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." } diff --git a/root/etc/services.d/code-server/run b/root/etc/services.d/code-server/run index e01307c..689e176 100644 --- 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 \ - /usr/lib/code-server/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 \ diff --git a/root/usr/local/bin/install-extension b/root/usr/local/bin/install-extension index 16342b9..79c922a 100755 --- a/root/usr/local/bin/install-extension +++ b/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[@]}" "$@" From e9822d8efcf3637f999dad362cae434f1ba690ad Mon Sep 17 00:00:00 2001 From: aptalca Date: Sun, 20 Feb 2022 21:47:30 -0500 Subject: [PATCH 06/23] copy pasta fail --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 38d8c51..6082536 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,7 +36,7 @@ RUN \ 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" && \ + "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 ****" && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index e739ca3..5043fde 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -36,7 +36,7 @@ RUN \ 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" && \ + "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 ****" && \ From e4e82382a0cc3a1a4f8ce25733b7a86eb28a8174 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 21 Feb 2022 04:46:30 +0100 Subject: [PATCH 07/23] Bot Updating Package Versions --- package_versions.txt | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index c291f80..6db61a5 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -17,7 +17,6 @@ dirmngr2.2.19-3ubuntu2.1 dpkg1.19.7ubuntu3 e2fsprogs1.45.5-2ubuntu1 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,6 +42,7 @@ 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 @@ -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 -libmagic-mgc1:5.38-4 libmount12.34-0.1ubuntu9.3 -libmpdec22.4.2-3 libncurses66.2-0ubuntu2 libncursesw66.2-0ubuntu2 libnettle73.5.1+really3.5.1-2ubuntu0.2 @@ -113,9 +110,6 @@ 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 @@ -153,14 +147,12 @@ 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 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 passwd1:4.8.1-1ubuntu5.20.04.1 @@ -171,10 +163,6 @@ 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 @@ -185,6 +173,4 @@ tzdata2021e-0ubuntu0.20.04 ubuntu-keyring2020.02.11.4 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 From da74981da38486753cfecd59df00bcf768a4a309 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 27 Feb 2022 13:26:57 +0100 Subject: [PATCH 08/23] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 6db61a5..552518b 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -62,7 +62,7 @@ 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.2 libext2fs21.45.5-2ubuntu1 libfdisk12.34-0.1ubuntu9.3 libffi73.3-4 From 21f7dce24d4ead187715c367de77fdc49e8d6590 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 2 Mar 2022 21:47:07 +0100 Subject: [PATCH 09/23] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 552518b..527c6ad 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -50,7 +50,7 @@ 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 libcbor0.60.6.0-0ubuntu1 @@ -113,9 +113,9 @@ libpsl50.21.0-1ubuntu1 libreadline88.0-4 libroken18-heimdal7.7.0+dfsg-1ubuntu1 librtmp12.4+20151223.gitfa8646d.1-2build1 -libsasl2-22.1.27+dfsg-2 -libsasl2-modules2.1.27+dfsg-2 -libsasl2-modules-db2.1.27+dfsg-2 +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 libselinux13.0-1build2 libsemanage13.0-1build2 From 69cf23d51667f79f4408a7a102fbe90a856a2730 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 13 Mar 2022 07:27:31 -0500 Subject: [PATCH 10/23] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 527c6ad..1a4f5a2 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,7 +1,7 @@ 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.3 @@ -52,7 +52,7 @@ libbsd00.10.0-1 libbz2-1.01.0.8-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,7 +62,7 @@ libdb5.35.3.28+dfsg1-0.6ubuntu2 libdebconfclient00.251ubuntu1 libedit23.1-20191231-1 liberror-perl0.17029-1 -libexpat12.2.9-1ubuntu0.2 +libexpat12.2.9-1ubuntu0.4 libext2fs21.45.5-2ubuntu1 libfdisk12.34-0.1ubuntu9.3 libffi73.3-4 @@ -125,7 +125,7 @@ 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.11 libstdc++610.3.0-1ubuntu1~20.04 libsystemd0245.4-4ubuntu3.15 libtasn1-64.16.0-2 @@ -142,7 +142,7 @@ 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 @@ -154,7 +154,7 @@ ncurses-bin6.2-0ubuntu2 netbase6.1 net-tools1.60+git20180626.aebd88e-1ubuntu1 openssh-client1:8.2p1-4ubuntu0.4 -openssl1.1.1f-1ubuntu2.10 +openssl1.1.1f-1ubuntu2.11 passwd1:4.8.1-1ubuntu5.20.04.1 patch2.7.6-6 perl5.30.0-9ubuntu0.2 From 1cece84c507501acda31c60e4c9611623ee28319 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 22 Mar 2022 18:48:23 -0500 Subject: [PATCH 11/23] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 1a4f5a2..de78e44 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -125,7 +125,7 @@ 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.11 +libssl1.11.1.1f-1ubuntu2.12 libstdc++610.3.0-1ubuntu1~20.04 libsystemd0245.4-4ubuntu3.15 libtasn1-64.16.0-2 @@ -154,7 +154,7 @@ ncurses-bin6.2-0ubuntu2 netbase6.1 net-tools1.60+git20180626.aebd88e-1ubuntu1 openssh-client1:8.2p1-4ubuntu0.4 -openssl1.1.1f-1ubuntu2.11 +openssl1.1.1f-1ubuntu2.12 passwd1:4.8.1-1ubuntu5.20.04.1 patch2.7.6-6 perl5.30.0-9ubuntu0.2 @@ -168,7 +168,7 @@ 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.3 From 3c58da4f19d0e9dd06f0517b87487fb09fe121d0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 3 Apr 2022 14:28:49 +0200 Subject: [PATCH 12/23] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index de78e44..45827b7 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -169,7 +169,7 @@ sensible-utils0.0.12+nmu1 sudo1.8.31-1ubuntu1.2 sysvinit-utils2.96-2.1ubuntu1 tar1.30+dfsg-7ubuntu0.20.04.2 -tzdata2021e-0ubuntu0.20.04 +tzdata2022a-0ubuntu0.20.04 ubuntu-keyring2020.02.11.4 util-linux2.34-0.1ubuntu9.3 xauth1:1.1-0ubuntu1 From 0b620f304c7120625ac29f25a6201c932b7f29fb Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 15 Apr 2022 00:49:00 +0200 Subject: [PATCH 13/23] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 45827b7..ac083a2 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -19,8 +19,8 @@ e2fsprogs1.45.5-2ubuntu1 fdisk2.34-0.1ubuntu9.3 findutils4.7.0-1ubuntu1 gcc-10-base10.3.0-1ubuntu1~20.04 -git1:2.25.1-1ubuntu3.2 -git-man1:2.25.1-1ubuntu3.2 +git1:2.25.1-1ubuntu3.3 +git-man1:2.25.1-1ubuntu3.3 gnupg2.2.19-3ubuntu2.1 gnupg-l10n2.2.19-3ubuntu2.1 gnupg-utils2.2.19-3ubuntu2.1 From 67211293abbdaf2aac30f7a1938093e0395d5933 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 1 May 2022 07:30:02 -0500 Subject: [PATCH 14/23] Bot Updating Templated Files --- Jenkinsfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index daa2df1..6b72d94 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -343,9 +343,11 @@ 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, removing Unraid template" - git rm unraid/${CONTAINER_NAME}.xml || : - git commit -m 'Bot Removing Deprecated Unraid Template' || : + 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 unraid/${CONTAINER_NAME}.xml + git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || : + git commit -m 'Bot Moving Deprecated Unraid Template' || : else cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ git add unraid/${CONTAINER_NAME}.xml From 9a9f16ab3bb3ea7ad6ad67bf22b407d645114ae6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 1 May 2022 07:31:19 -0500 Subject: [PATCH 15/23] Bot Updating Templated Files --- README.md | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index de335b8..e00e96b 100644 --- a/README.md +++ b/README.md @@ -52,27 +52,27 @@ Find us at: ## Supported Architectures -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/). +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` 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:latest` 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 | Tag | -| :----: | --- | -| x86-64 | amd64-latest | -| arm64 | arm64v8-latest | -| armhf | arm32v7-latest | +| Architecture | Available | Tag | +| :----: | :----: | ---- | +| x86-64 | ✅ | amd64-\ | +| arm64 | ✅ | arm64v8-\ | +| armhf| ✅ | arm32v7-\ | ## 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. +This image provides various versions that are available via tags. Please read the descriptions carefully and exercise caution when using unstable or development tags. -| 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 | +| 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 | ## Application Setup @@ -100,7 +100,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 + image: lscr.io/linuxserver/code-server:latest container_name: code-server environment: - PUID=1000 @@ -136,7 +136,7 @@ docker run -d \ -p 8443:8443 \ -v /path/to/appdata/config:/config \ --restart unless-stopped \ - lscr.io/linuxserver/code-server + lscr.io/linuxserver/code-server:latest ``` ## Parameters @@ -200,7 +200,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` + * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/code-server:latest` ## Updating Info @@ -218,7 +218,7 @@ Below are the instructions for updating containers: ### Via Docker Run -* Update the image: `docker pull lscr.io/linuxserver/code-server` +* Update the image: `docker pull lscr.io/linuxserver/code-server:latest` * 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) From ad0b0c640a1fe8b840efdec5b53223deaee5648d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 1 May 2022 14:34:59 +0200 Subject: [PATCH 16/23] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index ac083a2..8c2730f 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -19,8 +19,8 @@ e2fsprogs1.45.5-2ubuntu1 fdisk2.34-0.1ubuntu9.3 findutils4.7.0-1ubuntu1 gcc-10-base10.3.0-1ubuntu1~20.04 -git1:2.25.1-1ubuntu3.3 -git-man1:2.25.1-1ubuntu3.3 +git1:2.25.1-1ubuntu3.4 +git-man1:2.25.1-1ubuntu3.4 gnupg2.2.19-3ubuntu2.1 gnupg-l10n2.2.19-3ubuntu2.1 gnupg-utils2.2.19-3ubuntu2.1 @@ -56,7 +56,7 @@ libc-bin2.31-0ubuntu9.7 libcbor0.60.6.0-0ubuntu1 libcom-err21.45.5-2ubuntu1 libcrypt11:4.4.10-10ubuntu4 -libcurl3-gnutls7.68.0-1ubuntu2.7 +libcurl3-gnutls7.68.0-1ubuntu2.10 libcurl47.68.0-1ubuntu2.7 libdb5.35.3.28+dfsg1-0.6ubuntu2 libdebconfclient00.251ubuntu1 From 20eda117c2bd3738915f7de09fbb024905905096 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 6 May 2022 15:47:11 -0500 Subject: [PATCH 17/23] Bot Updating Templated Files --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6b72d94..7516ecf 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -345,7 +345,7 @@ pipeline { 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 unraid/${CONTAINER_NAME}.xml + git add -u unraid/${CONTAINER_NAME}.xml git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || : git commit -m 'Bot Moving Deprecated Unraid Template' || : else From 302fdc380da4389878e1ff87f2127ae256db32f9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 6 May 2022 22:50:48 +0200 Subject: [PATCH 18/23] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 8c2730f..a3cf564 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -8,7 +8,7 @@ bsdutils1:2.34-0.1ubuntu9.3 bzip21.0.8-2 ca-certificates20210119~20.04.2 coreutils8.30-3ubuntu2 -curl7.68.0-1ubuntu2.7 +curl7.68.0-1ubuntu2.10 dash0.5.10.2-6 debconf1.5.73 debianutils4.9.1 @@ -57,7 +57,7 @@ libcbor0.60.6.0-0ubuntu1 libcom-err21.45.5-2ubuntu1 libcrypt11:4.4.10-10ubuntu4 libcurl3-gnutls7.68.0-1ubuntu2.10 -libcurl47.68.0-1ubuntu2.7 +libcurl47.68.0-1ubuntu2.10 libdb5.35.3.28+dfsg1-0.6ubuntu2 libdebconfclient00.251ubuntu1 libedit23.1-20191231-1 From a56e57ea9bf3764dba8315b7949999f15e3fa775 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 15 May 2022 07:35:21 -0500 Subject: [PATCH 19/23] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index a3cf564..40b8e36 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -50,13 +50,13 @@ libblkid12.34-0.1ubuntu9.3 libbrotli11.0.7-6ubuntu0.1 libbsd00.10.0-1 libbz2-1.01.0.8-2 -libc62.31-0ubuntu9.7 +libc62.31-0ubuntu9.9 libcap-ng00.7.9-2.1build1 libc-bin2.31-0ubuntu9.7 libcbor0.60.6.0-0ubuntu1 libcom-err21.45.5-2ubuntu1 libcrypt11:4.4.10-10ubuntu4 -libcurl3-gnutls7.68.0-1ubuntu2.10 +libcurl3-gnutls7.68.0-1ubuntu2.11 libcurl47.68.0-1ubuntu2.10 libdb5.35.3.28+dfsg1-0.6ubuntu2 libdebconfclient00.251ubuntu1 @@ -122,10 +122,10 @@ libsemanage13.0-1build2 libsemanage-common3.0-1build2 libsepol13.0-1 libsmartcols12.34-0.1ubuntu9.3 -libsqlite3-03.31.1-4ubuntu0.2 +libsqlite3-03.31.1-4ubuntu0.3 libss21.45.5-2ubuntu1 libssh-40.9.3-2ubuntu2.2 -libssl1.11.1.1f-1ubuntu2.12 +libssl1.11.1.1f-1ubuntu2.13 libstdc++610.3.0-1ubuntu1~20.04 libsystemd0245.4-4ubuntu3.15 libtasn1-64.16.0-2 @@ -153,8 +153,8 @@ ncurses-base6.2-0ubuntu2 ncurses-bin6.2-0ubuntu2 netbase6.1 net-tools1.60+git20180626.aebd88e-1ubuntu1 -openssh-client1:8.2p1-4ubuntu0.4 -openssl1.1.1f-1ubuntu2.12 +openssh-client1:8.2p1-4ubuntu0.5 +openssl1.1.1f-1ubuntu2.13 passwd1:4.8.1-1ubuntu5.20.04.1 patch2.7.6-6 perl5.30.0-9ubuntu0.2 From fd84ed821be9e3b97bc1a553b65ac22155f18b20 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 22 May 2022 14:31:52 +0200 Subject: [PATCH 20/23] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 40b8e36..86a7b3b 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -8,7 +8,7 @@ bsdutils1:2.34-0.1ubuntu9.3 bzip21.0.8-2 ca-certificates20210119~20.04.2 coreutils8.30-3ubuntu2 -curl7.68.0-1ubuntu2.10 +curl7.68.0-1ubuntu2.11 dash0.5.10.2-6 debconf1.5.73 debianutils4.9.1 @@ -57,7 +57,7 @@ libcbor0.60.6.0-0ubuntu1 libcom-err21.45.5-2ubuntu1 libcrypt11:4.4.10-10ubuntu4 libcurl3-gnutls7.68.0-1ubuntu2.11 -libcurl47.68.0-1ubuntu2.10 +libcurl47.68.0-1ubuntu2.11 libdb5.35.3.28+dfsg1-0.6ubuntu2 libdebconfclient00.251ubuntu1 libedit23.1-20191231-1 @@ -142,7 +142,7 @@ libxdmcp61:1.1.3-0ubuntu1 libxext62:1.3.4-0ubuntu1 libxmuu12:1.1.3-0ubuntu1 libzstd11.4.4+dfsg-3ubuntu0.1 -locales2.31-0ubuntu9.7 +locales2.31-0ubuntu9.9 login1:4.8.1-1ubuntu5.20.04.1 logsave1.45.5-2ubuntu1 lsb-base11.1.0ubuntu2 From a87b1ef82d6604682a818fcdb2dc959750fb7ad9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 29 May 2022 07:32:11 -0500 Subject: [PATCH 21/23] Bot Updating Package Versions --- package_versions.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 86a7b3b..73224dd 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,6 +1,6 @@ adduser3.118ubuntu2 -apt2.0.6 -apt-utils2.0.6 +apt2.0.8 +apt-utils2.0.8 base-files11ubuntu5.5 base-passwd3.5.47 bash5.0-6ubuntu1.1 @@ -39,7 +39,7 @@ jq1.6-1ubuntu0.20.04.1 krb5-locales1.17-6ubuntu4.1 less551-1ubuntu0.1 libacl12.2.53-6 -libapt-pkg6.02.0.6 +libapt-pkg6.02.0.8 libasn1-8-heimdal7.7.0+dfsg-1ubuntu1 libassuan02.5.3-7ubuntu2 libatomic110.3.0-1ubuntu1~20.04 @@ -89,8 +89,8 @@ 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.8 -libldap-common2.4.49+dfsg-2ubuntu1.8 +libldap-2.4-22.4.49+dfsg-2ubuntu1.9 +libldap-common2.4.49+dfsg-2ubuntu1.9 liblz4-11.9.2-2ubuntu0.20.04.1 liblzma55.2.4-1ubuntu1 libmount12.34-0.1ubuntu9.3 From 393806fd5e10104b98f11f538920e4cc826c48da Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 12 Jun 2022 07:28:56 -0500 Subject: [PATCH 22/23] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 73224dd..f808ee7 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -84,7 +84,7 @@ 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 +libkeyutils11.6-6ubuntu1.1 libkrb5-26-heimdal7.7.0+dfsg-1ubuntu1 libkrb5-31.17-6ubuntu4.1 libkrb5support01.17-6ubuntu4.1 From d41e959c3f656e6cbbca0320ae8de9db4a3d6562 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 19 Jun 2022 14:30:24 +0200 Subject: [PATCH 23/23] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index f808ee7..ba0bf4b 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -6,7 +6,7 @@ base-passwd3.5.47 bash5.0-6ubuntu1.1 bsdutils1:2.34-0.1ubuntu9.3 bzip21.0.8-2 -ca-certificates20210119~20.04.2 +ca-certificates20211016~20.04.1 coreutils8.30-3ubuntu2 curl7.68.0-1ubuntu2.11 dash0.5.10.2-6