From a3a6e0f93792a34aa297b090180384a53feb6969 Mon Sep 17 00:00:00 2001 From: aptalca Date: Thu, 24 Oct 2019 15:51:46 -0400 Subject: [PATCH] v2 compatibility --- Dockerfile | 2 +- README.md | 1 + readme-vars.yml | 1 + root/etc/services.d/code-server/run | 12 ++++++------ 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 93bac9c..b43a48e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,7 @@ RUN \ fi && \ curl -o \ /tmp/code.tar.gz -L \ - "https://github.com/cdr/code-server/releases/download/${CODE_RELEASE}/code-server${CODE_RELEASE}-linux-x64.tar.gz" && \ + "https://github.com/cdr/code-server/releases/download/${CODE_RELEASE}/code-server${CODE_RELEASE}-linux-x86_64.tar.gz" && \ tar xzf /tmp/code.tar.gz -C \ /usr/bin/ --strip-components=1 \ --wildcards code-server*/code-server && \ diff --git a/README.md b/README.md index a812928..26db62c 100644 --- a/README.md +++ b/README.md @@ -213,6 +213,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **24.10.19:** - Upgrade to v2 builds. * **28.09.19:** - Update project logo. * **21.09.19:** - Add development builds/tag. * **09.07.19:** - Add optional sudo access. diff --git a/readme-vars.yml b/readme-vars.yml index 272bcbe..51be44a 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -65,6 +65,7 @@ app_setup_block: | # changelog changelogs: + - { date: "24.10.19:", desc: "Upgrade to v2 builds." } - { date: "28.09.19:", desc: "Update project logo." } - { date: "21.09.19:", desc: "Add development builds/tag." } - { date: "09.07.19:", desc: "Add optional sudo access." } diff --git a/root/etc/services.d/code-server/run b/root/etc/services.d/code-server/run index 6ea617d..3703dbb 100644 --- a/root/etc/services.d/code-server/run +++ b/root/etc/services.d/code-server/run @@ -1,18 +1,18 @@ #!/usr/bin/with-contenv bash if [ -n "${PASSWORD}" ]; then - PASSARG="-P ${PASSWORD}" + AUTH="--auth password" else - PASSARG="-N" echo "starting with no password" fi exec \ s6-setuidgid abc \ /usr/bin/code-server \ - -H \ - ${PASSARG} \ - -d /config/data \ - -e /config/extensions \ + --port 8443 \ + --user-data-dir /config/data \ + --extensions-dir /config/extensions \ --disable-telemetry \ + --disable-updates \ + ${AUTH} \ /config/workspace