Skip to content

Commit 8f79b61

Browse files
Support setting version of code-server to install
1 parent e286d2d commit 8f79b61

File tree

6 files changed

+38
-3
lines changed

6 files changed

+38
-3
lines changed

src/code-server/README.md

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ VS Code in the browser
1515

1616
| Options Id | Description | Type | Default Value |
1717
|-----|-----|-----|-----|
18+
| version | - | string | - |
1819
| host | - | string | 127.0.0.1 |
1920
| port | - | string | 8080 |
2021
| args | - | string | - |

src/code-server/devcontainer-feature.json

+4
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
"version": "1.0.0",
55
"description": "VS Code in the browser",
66
"options": {
7+
"version": {
8+
"type": "string",
9+
"default": ""
10+
},
711
"host": {
812
"type": "string",
913
"default": "127.0.0.1"

src/code-server/install.sh

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
#!/usr/bin/env bash
22
set -e
33

4-
curl -fsSL https://code-server.dev/install.sh | sh
4+
CODE_SERVER_INSTALL_ARGS=""
5+
6+
if [ -n "$VERSION" ]; then
7+
CODE_SERVER_INSTALL_ARGS="$CODE_SERVER_INSTALL_ARGS --version=\"$VERSION\""
8+
fi
9+
10+
curl -fsSL https://code-server.dev/install.sh | sh -s -- $CODE_SERVER_INSTALL_ARGS
511

612
IFS=',' read -ra extensions <<<"$EXTENSIONS"
713
declare -p extensions

test/code-server/code-server-extensions.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ check "code-server listening" sudo lsof -i "@0.0.0.0:8080"
1111

1212
extensions=$(sudo code-server --list-extensions)
1313

14-
check "code-server extensions [rust-lang.rust-analyzer]" grep 'rust-lang.rust-analyzer' <<<"$extensions"
15-
check "code-server extensions [ms-python.python]" grep 'ms-python.python' <<<"$extensions"
14+
check "code-server extensions [rust-lang.rust-analyzer]" grep 'rust-lang.rust-analyzer\>' <<<"$extensions"
15+
check "code-server extensions [ms-python.python]" grep 'ms-python.python\>' <<<"$extensions"
1616

1717
# Report results
1818
reportResults
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
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" sudo lsof -i "@0.0.0.0:8080"
11+
12+
version=$(code-server --version)
13+
check "code-server is correct version" grep '4.98.0\>' <<<"$version"
14+
15+
# Report results
16+
reportResults

test/code-server/scenarios.json

+8
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,13 @@
2222
"extensions": ["rust-lang.rust-analyzer", "ms-python.python"]
2323
}
2424
}
25+
},
26+
"code-server-install-version": {
27+
"image": "mcr.microsoft.com/devcontainers/base:ubuntu",
28+
"features": {
29+
"code-server": {
30+
"version": "4.98.0"
31+
}
32+
}
2533
}
2634
}

0 commit comments

Comments
 (0)