Merge pull request #22 from linuxserver/dev-3.0.0

structural changes for v3.0.0
This commit is contained in:
aptalca 2020-03-05 16:36:40 -05:00 committed by GitHub
commit 09bad650e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 8 deletions

View File

@ -11,6 +11,7 @@ LABEL maintainer="aptalca"
ENV HOME="/config" ENV HOME="/config"
RUN \ RUN \
echo "**** install dependencies ****" && \
apt-get update && \ apt-get update && \
apt-get install -y \ apt-get install -y \
git \ git \
@ -23,12 +24,14 @@ RUN \
CODE_RELEASE=$(curl -sX GET "https://api.github.com/repos/cdr/code-server/releases" \ CODE_RELEASE=$(curl -sX GET "https://api.github.com/repos/cdr/code-server/releases" \
| jq -r 'first(.[] | select(.prerelease == true)) | .tag_name'); \ | jq -r 'first(.[] | select(.prerelease == true)) | .tag_name'); \
fi && \ fi && \
CODE_URL=$(curl -sX GET "https://api.github.com/repos/cdr/code-server/releases/tags/${CODE_RELEASE}" \
| jq -r '.assets[] | select(.browser_download_url | contains("linux-x86_64")) | .browser_download_url') && \
mkdir -p /app/code-server && \
curl -o \ curl -o \
/tmp/code.tar.gz -L \ /tmp/code.tar.gz -L \
"https://github.com/cdr/code-server/releases/download/${CODE_RELEASE}/code-server${CODE_RELEASE}-linux-x86_64.tar.gz" && \ "${CODE_URL}" && \
tar xzf /tmp/code.tar.gz -C \ tar xzf /tmp/code.tar.gz -C \
/usr/bin/ --strip-components=1 \ /app/code-server --strip-components=1 && \
--wildcards code-server*/code-server && \
echo "**** clean up ****" && \ echo "**** clean up ****" && \
rm -rf \ rm -rf \
/tmp/* \ /tmp/* \

View File

@ -229,6 +229,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions ## Versions
* **05.03.20:** - Updates for v3.0.0 (structural changes).
* **09.07.19:** - Add optional sudo access. * **09.07.19:** - Add optional sudo access.
* **01.07.19:** - Add nano. * **01.07.19:** - Add nano.
* **24.06.19:** - Initial Release. * **24.06.19:** - Initial Release.

View File

@ -65,6 +65,7 @@ app_setup_block: |
# changelog # changelog
changelogs: changelogs:
- { date: "05.03.20:", desc: "Updates for v3.0.0 (structural changes)." }
- { date: "09.07.19:", desc: "Add optional sudo access." } - { date: "09.07.19:", desc: "Add optional sudo access." }
- { date: "01.07.19:", desc: "Add nano." } - { date: "01.07.19:", desc: "Add nano." }
- { date: "24.06.19:", desc: "Initial Release." } - { date: "24.06.19:", desc: "Initial Release." }

View File

@ -1,18 +1,20 @@
#!/usr/bin/with-contenv bash #!/usr/bin/with-contenv bash
if [ -n "${PASSWORD}" ]; then if [ -n "${PASSWORD}" ]; then
AUTH="--auth password" AUTH="password"
else else
AUTH="none"
echo "starting with no password" echo "starting with no password"
fi fi
exec \ exec \
s6-setuidgid abc \ s6-setuidgid abc \
/usr/bin/code-server \ /app/code-server/code-server \
--host 0.0.0.0 \
--port 8443 \ --port 8443 \
--user-data-dir /config/data \ --user-data-dir /config/data \
--extensions-dir /config/extensions \ --extensions-dir /config/extensions \
--disable-telemetry \ --disable-telemetry \
--disable-updates \ --disable-updates \
${AUTH} \ --auth ${AUTH} \
/config/workspace /config/workspace