From 3cfee211daa4bb77e20ff25bf28dee10f2563b39 Mon Sep 17 00:00:00 2001 From: Richard Sperry Date: Tue, 15 Apr 2025 16:52:55 -0700 Subject: [PATCH] changed init-cp run --- vscode/Dockerfile | 2 +- vscode/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/run | 2 +- vscode/rootfs/{usr => var}/lib/code-server/defaults/config.yaml | 0 .../{usr => var}/lib/code-server/defaults/requirements.txt | 0 .../rootfs/{usr => var}/lib/code-server/defaults/settings.json | 0 .../{usr => var}/lib/code-server/defaults/vscode.extensions | 0 .../{usr => var}/lib/code-server/defaults/workspaces.json | 0 7 files changed, 2 insertions(+), 2 deletions(-) rename vscode/rootfs/{usr => var}/lib/code-server/defaults/config.yaml (100%) rename vscode/rootfs/{usr => var}/lib/code-server/defaults/requirements.txt (100%) rename vscode/rootfs/{usr => var}/lib/code-server/defaults/settings.json (100%) rename vscode/rootfs/{usr => var}/lib/code-server/defaults/vscode.extensions (100%) rename vscode/rootfs/{usr => var}/lib/code-server/defaults/workspaces.json (100%) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 38d479c..0cbb3b1 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -80,7 +80,7 @@ WORKDIR /WORKDIR/ # Install Python packages RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 10 && \ - pip3 install --no-cache-dir -r /usr/lib/code-server/defaults/requirements.txt + pip3 install --no-cache-dir -r /var/lib/code-server/defaults/requirements.txt # Cleanup apt cache RUN apt-get purge -y --auto-remove \ 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 74e925f..34a257e 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 @@ -23,7 +23,7 @@ readonly -a PREVIOUS_DEFAULT_CONFIG_HASHES=( 2212babaa9dc46d38ba239052c9c05151abe517cc8b493d0d351a96bf70c1efa4f7479f6ed0b75811429ba649906eb5657d73b0732b460e718a5c66603dcdbda ) -readonly DEFAULT_FILES_PATH="/usr/lib/code-server/defaults" +readonly DEFAULT_FILES_PATH="/var/lib/code-server/defaults" readonly DEFAULT_CONFIG_PATH="/WORKDIR/config/addon_configs/vscode" readonly CODE_SERVER_CONFIG_DIR="/root/.config/code-server/" readonly CODE_SERVER_CONFIG="$CODE_SERVER_CONFIG_DIR/config.yaml" diff --git a/vscode/rootfs/usr/lib/code-server/defaults/config.yaml b/vscode/rootfs/var/lib/code-server/defaults/config.yaml similarity index 100% rename from vscode/rootfs/usr/lib/code-server/defaults/config.yaml rename to vscode/rootfs/var/lib/code-server/defaults/config.yaml diff --git a/vscode/rootfs/usr/lib/code-server/defaults/requirements.txt b/vscode/rootfs/var/lib/code-server/defaults/requirements.txt similarity index 100% rename from vscode/rootfs/usr/lib/code-server/defaults/requirements.txt rename to vscode/rootfs/var/lib/code-server/defaults/requirements.txt diff --git a/vscode/rootfs/usr/lib/code-server/defaults/settings.json b/vscode/rootfs/var/lib/code-server/defaults/settings.json similarity index 100% rename from vscode/rootfs/usr/lib/code-server/defaults/settings.json rename to vscode/rootfs/var/lib/code-server/defaults/settings.json diff --git a/vscode/rootfs/usr/lib/code-server/defaults/vscode.extensions b/vscode/rootfs/var/lib/code-server/defaults/vscode.extensions similarity index 100% rename from vscode/rootfs/usr/lib/code-server/defaults/vscode.extensions rename to vscode/rootfs/var/lib/code-server/defaults/vscode.extensions diff --git a/vscode/rootfs/usr/lib/code-server/defaults/workspaces.json b/vscode/rootfs/var/lib/code-server/defaults/workspaces.json similarity index 100% rename from vscode/rootfs/usr/lib/code-server/defaults/workspaces.json rename to vscode/rootfs/var/lib/code-server/defaults/workspaces.json