From 64d4c68fce604b3cf180340b777376aa2378e099 Mon Sep 17 00:00:00 2001 From: Danielle Maywood Date: Tue, 8 Apr 2025 10:28:00 +0000 Subject: [PATCH 1/3] fix: run code-server as the appropriate user Rather than run code-server as root, we instead run it as the appropriate user. --- src/code-server/install.sh | 2 +- test/code-server/code-server-extensions.sh | 2 +- test/code-server/code-server-install-version.sh | 2 +- test/code-server/code-server-modified-host.sh | 2 +- test/code-server/code-server-modified-port.sh | 2 +- test/code-server/test.sh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/code-server/install.sh b/src/code-server/install.sh index af4697a..80737cc 100644 --- a/src/code-server/install.sh +++ b/src/code-server/install.sh @@ -22,7 +22,7 @@ cat > /usr/local/bin/code-server-entrypoint \ #!/usr/bin/env bash set -e -code-server --bind-addr "$HOST:$PORT" \$ARGS +runuser -l $_REMOTE_USER -c 'code-server --bind-addr "$HOST:$PORT" \$ARGS' EOF chmod +x /usr/local/bin/code-server-entrypoint diff --git a/test/code-server/code-server-extensions.sh b/test/code-server/code-server-extensions.sh index d929a0e..7ceb354 100644 --- a/test/code-server/code-server-extensions.sh +++ b/test/code-server/code-server-extensions.sh @@ -7,7 +7,7 @@ source dev-container-features-test-lib # Feature-specific tests check "code-server version" code-server --version check "code-server running" pgrep -f 'code-server/lib/node.*/code-server' -check "code-server listening" sudo lsof -i "@0.0.0.0:8080" +check "code-server listening" lsof -i "@0.0.0.0:8080" extensions=$(sudo code-server --list-extensions) diff --git a/test/code-server/code-server-install-version.sh b/test/code-server/code-server-install-version.sh index 3c11f5b..5c949e8 100644 --- a/test/code-server/code-server-install-version.sh +++ b/test/code-server/code-server-install-version.sh @@ -7,7 +7,7 @@ source dev-container-features-test-lib # Feature-specific tests check "code-server version" code-server --version check "code-server running" pgrep -f 'code-server/lib/node.*/code-server' -check "code-server listening" sudo lsof -i "@0.0.0.0:8080" +check "code-server listening" lsof -i "@0.0.0.0:8080" version=$(code-server --version) check "code-server is correct version" grep '4.98.0\>' <<<"$version" diff --git a/test/code-server/code-server-modified-host.sh b/test/code-server/code-server-modified-host.sh index 25f3662..1fb2d89 100644 --- a/test/code-server/code-server-modified-host.sh +++ b/test/code-server/code-server-modified-host.sh @@ -7,7 +7,7 @@ source dev-container-features-test-lib # Feature-specific tests check "code-server version" code-server --version check "code-server running" pgrep -f 'code-server/lib/node.*/code-server' -check "code-server listening" sudo lsof -i "@0.0.0.0:8080" +check "code-server listening" lsof -i "@0.0.0.0:8080" # Report results reportResults diff --git a/test/code-server/code-server-modified-port.sh b/test/code-server/code-server-modified-port.sh index c811cc1..1876461 100644 --- a/test/code-server/code-server-modified-port.sh +++ b/test/code-server/code-server-modified-port.sh @@ -7,7 +7,7 @@ source dev-container-features-test-lib # Feature-specific tests check "code-server version" code-server --version check "code-server running" pgrep -f 'code-server/lib/node.*/code-server' -check "code-server listening" sudo lsof -i "@127.0.0.1:1234" +check "code-server listening" lsof -i "@127.0.0.1:1234" # Report results reportResults diff --git a/test/code-server/test.sh b/test/code-server/test.sh index 81bfabd..b6fc5e4 100644 --- a/test/code-server/test.sh +++ b/test/code-server/test.sh @@ -7,7 +7,7 @@ source dev-container-features-test-lib # Feature-specific tests check "code-server version" code-server --version check "code-server running" pgrep -f 'code-server/lib/node.*/code-server' -check "code-server listening" sudo lsof -i "@127.0.0.1:8080" +check "code-server listening" lsof -i "@127.0.0.1:8080" # Report results reportResults From 7c18f31165b0ec2668fefbbfef2c466325f118ac Mon Sep 17 00:00:00 2001 From: Danielle Maywood Date: Tue, 8 Apr 2025 10:57:09 +0000 Subject: [PATCH 2/3] chore: replace runuser with su Some linux distributions do not ship with runuser --- src/code-server/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/code-server/install.sh b/src/code-server/install.sh index 80737cc..04be75d 100644 --- a/src/code-server/install.sh +++ b/src/code-server/install.sh @@ -22,7 +22,7 @@ cat > /usr/local/bin/code-server-entrypoint \ #!/usr/bin/env bash set -e -runuser -l $_REMOTE_USER -c 'code-server --bind-addr "$HOST:$PORT" \$ARGS' +su $_REMOTE_USER -c 'code-server --bind-addr "$HOST:$PORT" \$ARGS' EOF chmod +x /usr/local/bin/code-server-entrypoint From 54bd19af12b3f04192fff209282cc9375c9b85ba Mon Sep 17 00:00:00 2001 From: Danielle Maywood Date: Tue, 8 Apr 2025 11:40:09 +0000 Subject: [PATCH 3/3] chore: add fedora to test suite --- .github/workflows/test.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 43b84ee..be1161c 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -15,6 +15,7 @@ jobs: features: - code-server baseImage: + - fedora:latest - debian:latest - ubuntu:latest - mcr.microsoft.com/devcontainers/base:ubuntu