Skip to content

Commit 4a25570

Browse files
feat: support --welcome-text
1 parent aabaf1e commit 4a25570

File tree

5 files changed

+33
-1
lines changed

5 files changed

+33
-1
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.PHONY: test
22
test:
3-
devcontainer features test
3+
devcontainer features test --filter "$$DEVCONTAINER_FEATURE_TEST_FILTER"
44

55
.PHONY: docs
66
docs: src/code-server/README.md

src/code-server/devcontainer-feature.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,11 @@
105105
"default": "",
106106
"description": "The version of code-server to install. If empty, installs the latest version."
107107
},
108+
"welcomeText": {
109+
"type": "string",
110+
"default": "",
111+
"description": "Text to show on login page."
112+
},
108113
"workspace": {
109114
"type": "string",
110115
"default": "",

src/code-server/install.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,10 @@ if [[ -n "$APPNAME" ]]; then
8383
FLAGS+=(--app-name "$APPNAME")
8484
fi
8585

86+
if [[ -n "$WELCOMETEXT" ]]; then
87+
FLAGS+=(--welcome-text "$WELCOMETEXT")
88+
fi
89+
8690
cat > /usr/local/bin/code-server-entrypoint <<EOF
8791
#!/usr/bin/env bash
8892
set -e
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#!/bin/bash
2+
set -e
3+
4+
# Optional: Import test library bundled with the devcontainer CLI
5+
source dev-container-features-test-lib
6+
7+
# Feature-specific tests
8+
check "code-server version" code-server --version
9+
check "code-server running" pgrep -f 'code-server/lib/node.*/code-server'
10+
check "code-server listening" lsof -i "@127.0.0.1:8080"
11+
12+
check "code-server welcome-text" grep '"--welcome-text".*"Some Welcome Text"' < /usr/local/bin/code-server-entrypoint
13+
14+
# Report results
15+
reportResults

test/code-server/scenarios.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,5 +184,13 @@
184184
"appName": "My Code Server"
185185
}
186186
}
187+
},
188+
"code-server-welcome-text": {
189+
"image": "mcr.microsoft.com/devcontainers/base:ubuntu",
190+
"features": {
191+
"code-server": {
192+
"welcomeText": "Some Welcome Text"
193+
}
194+
}
187195
}
188196
}

0 commit comments

Comments
 (0)