From 5eceb1f591b54d825e36d52ae3b4f31b5cbfd1c8 Mon Sep 17 00:00:00 2001
From: Richard Sperry <Richard@SperryFamily.net>
Date: Tue, 15 Apr 2025 15:03:53 -0700
Subject: [PATCH] changed repo init-cs for mandatory items

---
 vscode/Dockerfile                                         | 7 +++++--
 vscode/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/run | 2 +-
 vscode/rootfs/root/.config/code-server/config.yaml        | 1 -
 3 files changed, 6 insertions(+), 4 deletions(-)
 delete mode 100644 vscode/rootfs/root/.config/code-server/config.yaml

diff --git a/vscode/Dockerfile b/vscode/Dockerfile
index a53ed95..5af17f6 100755
--- a/vscode/Dockerfile
+++ b/vscode/Dockerfile
@@ -44,6 +44,7 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/*
 
 #System configuration
+WORKDIR /data
 RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && locale-gen && \
     update-locale LANG=en_US.UTF-8 && \
     curl https://bootstrap.pypa.io/get-pip.py | python3
@@ -66,8 +67,10 @@ COPY rootfs /
 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/
-WORKDIR /root/.config/code-server
-COPY  "rootfs/usr/lib/code-server/defaults/config.yaml" "/root/.config/code-server/config.yaml"
+
+# Copy default config
+WORKDIR /root/.config/code-server/defaults
+COPY  "rootfs/usr/lib/code-server/defaults/config.yaml" "config.yaml"
 
 # Install Oh My ZSH
 # hadolint ignore=SC2086
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 df2c262..c34647b 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
@@ -24,7 +24,7 @@ readonly -a PREVIOUS_DEFAULT_CONFIG_HASHES=(
 )
 
 readonly DEFAULT_FILES_PATH="/usr/lib/code-server/defaults"
-readonly DEFAULT_CONFIG_PATH="/config/addon_config/vscode"
+readonly DEFAULT_CONFIG_PATH="/config/addon_configs/vscode"
 readonly CODE_SERVER_CONFIG="/root/.config/code-server/config.yaml"
 
 # Ensure config path exists
diff --git a/vscode/rootfs/root/.config/code-server/config.yaml b/vscode/rootfs/root/.config/code-server/config.yaml
deleted file mode 100644
index 700b6c9..0000000
--- a/vscode/rootfs/root/.config/code-server/config.yaml
+++ /dev/null
@@ -1 +0,0 @@
-# this file is blank as install uses the defaults to replace it as to not have spagetti code.