diff --git a/Dockerfile b/Dockerfile index fb8d5e9..3b02c84 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy +FROM ghcr.io/linuxserver/baseimage-ubuntu:noble # set version label ARG BUILD_DATE @@ -20,7 +20,6 @@ RUN \ libatomic1 \ nano \ net-tools \ - netcat \ sudo && \ echo "**** install openvscode-server ****" && \ if [ -z ${CODE_RELEASE+x} ]; then \ @@ -35,6 +34,7 @@ RUN \ tar xf \ /tmp/openvscode-server.tar.gz -C \ /app/openvscode-server/ --strip-components=1 && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** clean up ****" && \ apt-get clean && \ rm -rf \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index c40a12e..e61b91d 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy +FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-noble # set version label ARG BUILD_DATE @@ -20,7 +20,6 @@ RUN \ libatomic1 \ nano \ net-tools \ - netcat \ sudo && \ echo "**** install openvscode-server ****" && \ if [ -z ${CODE_RELEASE+x} ]; then \ @@ -35,6 +34,7 @@ RUN \ tar xf \ /tmp/openvscode-server.tar.gz -C \ /app/openvscode-server/ --strip-components=1 && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** clean up ****" && \ apt-get clean && \ rm -rf \ diff --git a/Jenkinsfile b/Jenkinsfile index 9a604de..bdcabe1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -31,8 +31,8 @@ pipeline { CI_PORT='3000' CI_SSL='false' CI_DELAY='120' - CI_DOCKERENV='TZ=US/Pacific|CONNECTION_TOKEN=lsio' - CI_AUTH='user:password' + CI_DOCKERENV='CONNECTION_TOKEN=lsio' + CI_AUTH='' CI_WEBPATH='/?tkn=lsio' } stages { diff --git a/README.md b/README.md index 1110a7a..7a5c830 100644 --- a/README.md +++ b/README.md @@ -302,6 +302,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **18.06.24:** - Rebase to noble. * **01.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf) * **29.09.22:** - Rebase to jammy, switch to s6v3. Fix chown logic to skip `/config/workspace` contents. * **12.02.22:** - Update `install-extension` helper to compensate for upstream changes. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index e3f8bff..d77faa0 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -22,6 +22,6 @@ repo_vars: - CI_PORT='3000' - CI_SSL='false' - CI_DELAY='120' - - CI_DOCKERENV='TZ=US/Pacific|CONNECTION_TOKEN=lsio' - - CI_AUTH='user:password' + - CI_DOCKERENV='CONNECTION_TOKEN=lsio' + - CI_AUTH='' - CI_WEBPATH='/?tkn=lsio' diff --git a/readme-vars.yml b/readme-vars.yml index c229029..d933524 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -52,6 +52,7 @@ app_setup_block: | When reverse proxied through SWAG, custom services running on specific ports inside openvscode-server can be accessed at `https://PORT.openvscode-server.domain.com` very much like how code-server's port proxy function is handled. For that, a wildcard CNAME `*.openvscode-server.domain.com` needs to be created and the SWAG cert needs to cover those subdomains. # changelog changelogs: + - {date: "18.06.24:", desc: "Rebase to noble."} - {date: "01.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"} - {date: "29.09.22:", desc: "Rebase to jammy, switch to s6v3. Fix chown logic to skip `/config/workspace` contents."} - {date: "12.02.22:", desc: "Update `install-extension` helper to compensate for upstream changes."}