From 0385ca1048c59a2b15c1b5fe59a1ef495a270130 Mon Sep 17 00:00:00 2001 From: Richard Sperry Date: Tue, 15 Apr 2025 16:35:19 -0700 Subject: [PATCH] changed init-cp run --- vscode/Dockerfile | 4 ++- vscode/config.yaml | 28 ++++++++++++++----- .../etc/s6-overlay/s6-rc.d/code-server/run | 2 +- .../s6-overlay/s6-rc.d/init-code-server/run | 2 +- 4 files changed, 26 insertions(+), 10 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index af3a94d..38d479c 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -75,6 +75,9 @@ RUN sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master && git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting \ && sed -i -e "s#bin/bash#bin/zsh#" /etc/passwd +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 @@ -95,7 +98,6 @@ RUN find /usr/local \ HEALTHCHECK \ CMD curl --fail http://127.0.0.1:1337/healthz || exit 1 - # Build Final image ARG BUILD_ARCH ARG BUILD_DATE diff --git a/vscode/config.yaml b/vscode/config.yaml index 9595ebe..7951676 100644 --- a/vscode/config.yaml +++ b/vscode/config.yaml @@ -19,13 +19,27 @@ hassio_api: true hassio_role: manager homeassistant_api: true map: - - addons:rw - - all_addon_configs:rw - - backup:rw - - homeassistant_config:rw - - media:rw - - share:rw - - ssl:rw + - type: addons + read_only: false + path: /WORKDIR/addons + - type: all_addon_configs + read_only: false + path: /WORKDIR/all_addon_configs + - type: backup + read_only: false + path: /WORKDIR/backup + - type: homeassistant_config + read_only: false + path: /WORKDIR/config + - type: media + read_only: false + path: /WORKDIR/media + - type: share + read_only: false + path: /WORKDIR/share + - type: + read_only: false + path: /WORKDIR/ssl services: - mysql:want - mqtt:want diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/code-server/run b/vscode/rootfs/etc/s6-overlay/s6-rc.d/code-server/run index e120bfb..d22647e 100644 --- a/vscode/rootfs/etc/s6-overlay/s6-rc.d/code-server/run +++ b/vscode/rootfs/etc/s6-overlay/s6-rc.d/code-server/run @@ -12,4 +12,4 @@ export HASS_SERVER="http://supervisor/core" export HASS_TOKEN="${SUPERVISOR_TOKEN:-}" # Run the code server -exec code-server /config +exec code-server /WORKDIR 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 8145120..ed425b5 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_configs/vscode" +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"