Skip to content

Commit 3b59cd4

Browse files
committed
Rebase to noble
1 parent deb7a49 commit 3b59cd4

File tree

13 files changed

+32
-34
lines changed

13 files changed

+32
-34
lines changed

Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy
1+
FROM ghcr.io/linuxserver/baseimage-ubuntu:noble
22

33
# set version label
44
ARG BUILD_DATE
@@ -16,11 +16,9 @@ RUN \
1616
apt-get update && \
1717
apt-get install -y \
1818
git \
19-
jq \
2019
libatomic1 \
2120
nano \
2221
net-tools \
23-
netcat \
2422
sudo && \
2523
echo "**** install code-server ****" && \
2624
if [ -z ${CODE_RELEASE+x} ]; then \
@@ -33,6 +31,7 @@ RUN \
3331
"https://github.com/coder/code-server/releases/download/v${CODE_RELEASE}/code-server-${CODE_RELEASE}-linux-amd64.tar.gz" && \
3432
tar xf /tmp/code-server.tar.gz -C \
3533
/app/code-server --strip-components=1 && \
34+
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
3635
echo "**** clean up ****" && \
3736
apt-get clean && \
3837
rm -rf \

Dockerfile.aarch64

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy
1+
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-noble
22

33
# set version label
44
ARG BUILD_DATE
@@ -16,11 +16,9 @@ RUN \
1616
apt-get update && \
1717
apt-get install -y \
1818
git \
19-
jq \
2019
libatomic1 \
2120
nano \
2221
net-tools \
23-
netcat \
2422
sudo && \
2523
echo "**** install code-server ****" && \
2624
if [ -z ${CODE_RELEASE+x} ]; then \
@@ -33,6 +31,7 @@ RUN \
3331
"https://github.com/coder/code-server/releases/download/v${CODE_RELEASE}/code-server-${CODE_RELEASE}-linux-arm64.tar.gz" && \
3432
tar xf /tmp/code-server.tar.gz -C \
3533
/app/code-server --strip-components=1 && \
34+
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
3635
echo "**** clean up ****" && \
3736
apt-get clean && \
3837
rm -rf \

Jenkinsfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ pipeline {
3333
CI_PORT='8443'
3434
CI_SSL='false'
3535
CI_DELAY='120'
36-
CI_DOCKERENV='TZ=US/Pacific'
37-
CI_AUTH='user:password'
36+
CI_DOCKERENV=''
37+
CI_AUTH=''
3838
CI_WEBPATH=''
3939
}
4040
stages {

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ services:
101101
- PROXY_DOMAIN=code-server.my.domain #optional
102102
- DEFAULT_WORKSPACE=/config/workspace #optional
103103
volumes:
104-
- /path/to/appdata/config:/config
104+
- /path/to/code-server/config:/config
105105
ports:
106106
- 8443:8443
107107
restart: unless-stopped
@@ -122,7 +122,7 @@ docker run -d \
122122
-e PROXY_DOMAIN=code-server.my.domain `#optional` \
123123
-e DEFAULT_WORKSPACE=/config/workspace `#optional` \
124124
-p 8443:8443 \
125-
-v /path/to/appdata/config:/config \
125+
-v /path/to/code-server/config:/config \
126126
--restart unless-stopped \
127127
lscr.io/linuxserver/code-server:latest
128128
```
@@ -306,6 +306,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
306306

307307
## Versions
308308

309+
* **19.08.24:** - Rebase to Ubuntu Noble.
309310
* **01.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)
310311
* **05.10.22:** - Install recommended deps to maintain parity with the older images.
311312
* **29.09.22:** - Rebase to jammy, switch to s6v3. Fix chown logic to skip `/config/workspace` contents.

jenkins-vars.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ repo_vars:
2222
- CI_PORT='8443'
2323
- CI_SSL='false'
2424
- CI_DELAY='120'
25-
- CI_DOCKERENV='TZ=US/Pacific'
26-
- CI_AUTH='user:password'
25+
- CI_DOCKERENV=''
26+
- CI_AUTH=''
2727
- CI_WEBPATH=''

readme-vars.yml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,16 @@ project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_
1010
available_architectures:
1111
- {arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
1212
- {arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
13-
# development version
14-
development_versions: false
15-
development_versions_items:
16-
- {tag: "latest", desc: "Stable releases"}
13+
1714
# container parameters
1815
common_param_env_vars_enabled: true
1916
param_container_name: "{{ project_name }}"
2017
param_usage_include_vols: true
2118
param_volumes:
22-
- {vol_path: "/config", vol_host_path: "/path/to/appdata/config", desc: "Contains all relevant configuration files."}
19+
- {vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Contains all relevant configuration files."}
2320
param_usage_include_ports: true
2421
param_ports:
2522
- {external_port: "8443", internal_port: "8443", port_desc: "web gui"}
26-
param_usage_include_env: true
27-
param_env_vars:
28-
- {env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London"}
2923
# optional container parameters
3024
opt_param_usage_include_env: true
3125
opt_param_env_vars:
@@ -35,8 +29,7 @@ opt_param_env_vars:
3529
- {env_var: "SUDO_PASSWORD_HASH", env_value: "", desc: "Optionally set sudo password via hash (takes priority over `SUDO_PASSWORD` var). Format is `$type$salt$hashed`."}
3630
- {env_var: "PROXY_DOMAIN", env_value: "code-server.my.domain", desc: "If this optional variable is set, this domain will be proxied for subdomain proxying. See [Documentation](https://github.com/cdr/code-server/blob/master/docs/FAQ.md#sub-domains)"}
3731
- {env_var: "DEFAULT_WORKSPACE", env_value: "/config/workspace", desc: "If this optional variable is set, code-server will open this directory by default"}
38-
optional_block_1: false
39-
optional_block_1_items: ""
32+
4033
# application setup block
4134
app_setup_block_enabled: true
4235
app_setup_block: |
@@ -54,6 +47,7 @@ app_setup_block: |
5447
How to create the [hashed password](https://github.com/cdr/code-server/blob/master/docs/FAQ.md#can-i-store-my-password-hashed).
5548
# changelog
5649
changelogs:
50+
- {date: "19.08.24:", desc: "Rebase to Ubuntu Noble."}
5751
- {date: "01.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"}
5852
- {date: "05.10.22:", desc: "Install recommended deps to maintain parity with the older images."}
5953
- {date: "29.09.22:", desc: "Rebase to jammy, switch to s6v3. Fix chown logic to skip `/config/workspace` contents."}
Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
#!/usr/bin/with-contenv bash
2+
# shellcheck shell=bash
23

34
mkdir -p /config/{extensions,data,workspace,.ssh}
45

5-
if [ -n "${SUDO_PASSWORD}" ] || [ -n "${SUDO_PASSWORD_HASH}" ]; then
6+
if [[ -n "${SUDO_PASSWORD}" ]] || [[ -n "${SUDO_PASSWORD_HASH}" ]]; then
67
echo "setting up sudo access"
78
if ! grep -q 'abc' /etc/sudoers; then
89
echo "adding abc to sudoers"
910
echo "abc ALL=(ALL:ALL) ALL" >> /etc/sudoers
1011
fi
11-
if [ -n "${SUDO_PASSWORD_HASH}" ]; then
12+
if [[ -n "${SUDO_PASSWORD_HASH}" ]]; then
1213
echo "setting sudo password using sudo password hash"
1314
sed -i "s|^abc:\!:|abc:${SUDO_PASSWORD_HASH}:|" /etc/shadow
1415
else
@@ -17,15 +18,18 @@ if [ -n "${SUDO_PASSWORD}" ] || [ -n "${SUDO_PASSWORD_HASH}" ]; then
1718
fi
1819
fi
1920

20-
[[ ! -f /config/.bashrc ]] && \
21+
if [[ ! -f /config/.bashrc ]]; then
2122
cp /root/.bashrc /config/.bashrc
22-
[[ ! -f /config/.profile ]] && \
23+
fi
24+
25+
if [[ ! -f /config/.profile ]]; then
2326
cp /root/.profile /config/.profile
27+
fi
2428

2529
# fix permissions (ignore contents of /config/workspace)
2630
find /config -path /config/workspace -prune -o -exec chown abc:abc {} +
2731
chown abc:abc /config/workspace
2832
chmod 700 /config/.ssh
29-
if [ -n "$(ls -A /config/.ssh)" ]; then
33+
if [[ -n "$(ls -A /config/.ssh)" ]]; then
3034
chmod 600 /config/.ssh/*
3135
fi
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
oneshot
1+
oneshot
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
/etc/s6-overlay/s6-rc.d/init-code-server/run
1+
/etc/s6-overlay/s6-rc.d/init-code-server/run
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3
1+
3

0 commit comments

Comments
 (0)