Skip to content

Commit 1f7df79

Browse files
Revert "feat(code-server): add machine settings option" Need to add Versions in README (#104)
Reverts #88 Need to add Readme Versions
1 parent 84f3cb5 commit 1f7df79

File tree

2 files changed

+1
-21
lines changed

2 files changed

+1
-21
lines changed

registry/coder/modules/code-server/main.tf

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,6 @@ variable "settings" {
4444
default = {}
4545
}
4646

47-
variable "machine-settings" {
48-
type = any
49-
description = "A map of template level machine settings to apply to code-server. This will be overwritten at each container start."
50-
default = {}
51-
}
52-
5347
variable "folder" {
5448
type = string
5549
description = "The folder to open in code-server."
@@ -155,7 +149,6 @@ resource "coder_script" "code-server" {
155149
INSTALL_PREFIX : var.install_prefix,
156150
// This is necessary otherwise the quotes are stripped!
157151
SETTINGS : replace(jsonencode(var.settings), "\"", "\\\""),
158-
MACHINE_SETTINGS : replace(jsonencode(var.machine-settings), "\"", "\\\""),
159152
OFFLINE : var.offline,
160153
USE_CACHED : var.use_cached,
161154
USE_CACHED_EXTENSIONS : var.use_cached_extensions,

registry/coder/modules/code-server/run.sh

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,7 @@ function run_code_server() {
2323
if [ ! -f ~/.local/share/code-server/User/settings.json ]; then
2424
echo "⚙️ Creating settings file..."
2525
mkdir -p ~/.local/share/code-server/User
26-
if command -v jq &> /dev/null; then
27-
echo "${SETTINGS}" | jq '.' > ~/.local/share/code-server/User/settings.json
28-
else
29-
echo "${SETTINGS}" > ~/.local/share/code-server/User/settings.json
30-
fi
31-
fi
32-
33-
# Apply/overwrite template based settings
34-
echo "⚙️ Creating machine settings file..."
35-
mkdir -p ~/.local/share/code-server/Machine
36-
if command -v jq &> /dev/null; then
37-
echo "${MACHINE_SETTINGS}" | jq '.' > ~/.local/share/code-server/Machine/settings.json
38-
else
39-
echo "${MACHINE_SETTINGS}" > ~/.local/share/code-server/Machine/settings.json
26+
echo "${SETTINGS}" > ~/.local/share/code-server/User/settings.json
4027
fi
4128

4229
# Check if code-server is already installed for offline

0 commit comments

Comments
 (0)