From 4b6b10902dcd64d825a71dc24d4fc903789c161a Mon Sep 17 00:00:00 2001
From: Richard Sperry <Richard@SperryFamily.net>
Date: Wed, 16 Apr 2025 14:43:33 -0700
Subject: [PATCH] devenv

---
 vscode/Dockerfile                                    |  2 ++
 vscode/config.yaml                                   |  2 --
 .../lib/code-server => data}/defaults/config.yaml    |  0
 .../code-server => data}/defaults/requirements.txt   |  0
 .../lib/code-server => data}/defaults/settings.json  |  0
 .../code-server => data}/defaults/vscode.extensions  |  0
 .../code-server => data}/defaults/workspaces.json    |  0
 .../config => data/vscode}/extensions.json           |  0
 .../etc/s6-overlay/s6-rc.d/init-code-server/run      | 12 +++++-------
 9 files changed, 7 insertions(+), 9 deletions(-)
 rename vscode/{rootfs/var/lib/code-server => data}/defaults/config.yaml (100%)
 rename vscode/{rootfs/var/lib/code-server => data}/defaults/requirements.txt (100%)
 rename vscode/{rootfs/var/lib/code-server => data}/defaults/settings.json (100%)
 rename vscode/{rootfs/var/lib/code-server => data}/defaults/vscode.extensions (100%)
 rename vscode/{rootfs/var/lib/code-server => data}/defaults/workspaces.json (100%)
 rename vscode/{rootfs/var/lib/code-server/config => data/vscode}/extensions.json (100%)

diff --git a/vscode/Dockerfile b/vscode/Dockerfile
index bce1afb..5f17bc8 100644
--- a/vscode/Dockerfile
+++ b/vscode/Dockerfile
@@ -67,6 +67,8 @@ RUN chown -R root:root /root \
     && chown -R root:root /etc/s6-overlay/s6-rc.d/ \
     && chmod 755 -R /etc/s6-overlay/s6-rc.d/
 
+COPY data /data
+
 # Install Oh My ZSH
 # hadolint ignore=SC2086
 RUN sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"  \
diff --git a/vscode/config.yaml b/vscode/config.yaml
index d50e8ea..6b73e6a 100644
--- a/vscode/config.yaml
+++ b/vscode/config.yaml
@@ -28,8 +28,6 @@ map:
     read_only: false
   - type: data
     read_only: false
-  - type: all_addon_configs
-    read_only: false
   - type: backup
     read_only: false
   - type: config
diff --git a/vscode/rootfs/var/lib/code-server/defaults/config.yaml b/vscode/data/defaults/config.yaml
similarity index 100%
rename from vscode/rootfs/var/lib/code-server/defaults/config.yaml
rename to vscode/data/defaults/config.yaml
diff --git a/vscode/rootfs/var/lib/code-server/defaults/requirements.txt b/vscode/data/defaults/requirements.txt
similarity index 100%
rename from vscode/rootfs/var/lib/code-server/defaults/requirements.txt
rename to vscode/data/defaults/requirements.txt
diff --git a/vscode/rootfs/var/lib/code-server/defaults/settings.json b/vscode/data/defaults/settings.json
similarity index 100%
rename from vscode/rootfs/var/lib/code-server/defaults/settings.json
rename to vscode/data/defaults/settings.json
diff --git a/vscode/rootfs/var/lib/code-server/defaults/vscode.extensions b/vscode/data/defaults/vscode.extensions
similarity index 100%
rename from vscode/rootfs/var/lib/code-server/defaults/vscode.extensions
rename to vscode/data/defaults/vscode.extensions
diff --git a/vscode/rootfs/var/lib/code-server/defaults/workspaces.json b/vscode/data/defaults/workspaces.json
similarity index 100%
rename from vscode/rootfs/var/lib/code-server/defaults/workspaces.json
rename to vscode/data/defaults/workspaces.json
diff --git a/vscode/rootfs/var/lib/code-server/config/extensions.json b/vscode/data/vscode/extensions.json
similarity index 100%
rename from vscode/rootfs/var/lib/code-server/config/extensions.json
rename to vscode/data/vscode/extensions.json
diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/run b/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/run
index bb7fc58..26bfaaf 100644
--- a/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/run
+++ b/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/run
@@ -22,16 +22,14 @@ readonly -a PREVIOUS_DEFAULT_CONFIG_HASHES=(
     dbe905f0935b2fea8bb5ba379bff78db9d056ea6d0965c68aa9b07938a52cbbf117186452b2b6c766aa4cf93cc3494ad91b763e8500e515e41d8cde31a3821ae
     2212babaa9dc46d38ba239052c9c05151abe517cc8b493d0d351a96bf70c1efa4f7479f6ed0b75811429ba649906eb5657d73b0732b460e718a5c66603dcdbda
 )
-
-readonly -a DIRECTORIES=(addon_configs addons backup config media share ssl)
-readonly DEFAULT_FILES_PATH="/var/lib/code-server/defaults"
-readonly DEFAULT_CONFIG_PATH="/config/addon_configs/vscode"
-readonly ROOT_CODE_SERVER_CONFIG_PATH="/root/.config/code-server/"
-
-CODE_SERVER_CONFIG="$DEFAULT_CONFIG_PATH/config.yaml"
+readonly DEFAULT_FILES_PATH="/data/defaults"
+readonly DEFAULT_CONFIG_PATH="/data/vscode"
+readonly ROOT_CODE_SERVER_CONFIG_PATH="/root/.config/code-server/" # needed for code-server to cleanly startup.
 readonly CODE_SERVER_EXTENSIONS_INSTALL_PATH="$DEFAULT_CONFIG_PATH/extensions"
 readonly CODE_SERVER_EXTENSIONS_LIST="$DEFAULT_CONFIG_PATH/vscode.extensions"
+readonly -a DIRECTORIES=(addons addon_configs data backup config media share ssl)
 
+CODE_SERVER_CONFIG="$DEFAULT_CONFIG_PATH/config.yaml"
 
 # Links some common directories to the user's home folder for convenience
 for dir in "${DIRECTORIES[@]}"; do