Skip to content

Commit dd77dee

Browse files
authored
Merge pull request #221 from linuxserver/ipv4-fallback
Add fallback for legacy or misconfigured systems without IPv6 support
2 parents 00ee191 + 6363db5 commit dd77dee

3 files changed

Lines changed: 12 additions & 4 deletions

File tree

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,8 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
329329

330330
## Versions
331331

332-
* **17.05.26:** - Let server listen on both ipv4 and ipv6 even when running container as root.
332+
* **20.09.26:** - Add fallback for legacy or misconfigured systems without IPv6 support.
333+
* **17.05.26:** - Fix container only listening on IPv6 when running non-root.
333334
* **10.08.25:** - Let server listen on both ipv4 and ipv6.
334335
* **03.06.25:** - Allow setting PWA name using env var `PWA_APPNAME`.
335336
* **13.10.24:** - Only chown config folder when change to ownership or new install is detected.

‎readme-vars.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,8 @@ init_diagram: |
102102
"code-server:latest" <- Base Images
103103
# changelog
104104
changelogs:
105-
- {date: "17.05.26:", desc: "Let server listen on both ipv4 and ipv6 even when running container as root."}
105+
- {date: "20.09.26:", desc: "Add fallback for legacy or misconfigured systems without IPv6 support."}
106+
- {date: "17.05.26:", desc: "Fix container only listening on IPv6 when running non-root."}
106107
- {date: "10.08.25:", desc: "Let server listen on both ipv4 and ipv6."}
107108
- {date: "03.06.25:", desc: "Allow setting PWA name using env var `PWA_APPNAME`."}
108109
- {date: "13.10.24:", desc: "Only chown config folder when change to ownership or new install is detected."}

‎root/etc/s6-overlay/s6-rc.d/svc-code-server/run‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,18 @@ if [[ -z ${PWA_APPNAME} ]]; then
1818
PWA_APPNAME="code-server"
1919
fi
2020

21+
if test -f /proc/net/if_inet6; then
22+
BIND_ADDR="[::]:8443"
23+
else
24+
BIND_ADDR="0.0.0.0:8443"
25+
fi
26+
2127
if [[ -z ${LSIO_NON_ROOT_USER} ]]; then
2228
exec \
2329
s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z 127.0.0.1 8443" \
2430
s6-setuidgid abc \
2531
/app/code-server/bin/code-server \
26-
--bind-addr "[::]:8443" \
32+
--bind-addr "${BIND_ADDR}" \
2733
--user-data-dir /config/data \
2834
--extensions-dir /config/extensions \
2935
--disable-telemetry \
@@ -35,7 +41,7 @@ else
3541
exec \
3642
s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z 127.0.0.1 8443" \
3743
/app/code-server/bin/code-server \
38-
--bind-addr "[::]:8443" \
44+
--bind-addr "${BIND_ADDR}" \
3945
--user-data-dir /config/data \
4046
--extensions-dir /config/extensions \
4147
--disable-telemetry \

0 commit comments

Comments
 (0)