diff --git a/addon-vscode.code-workspace b/addon-vscode.code-workspace index 34c5564..e587503 100644 --- a/addon-vscode.code-workspace +++ b/addon-vscode.code-workspace @@ -14,9 +14,11 @@ }, "cSpell.words": [ "elif", + "homeassistant", "pinage", "robbyrussell", - "seti" + "seti", + "uart" ] } } diff --git a/cspell.json b/cspell.json index c60cefc..c402e23 100644 --- a/cspell.json +++ b/cspell.json @@ -5,6 +5,7 @@ "dictionaries": [], "words": [ "bashio", + "codenotary", "colordiff", "contenv", "devcontainers", diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 65379f4..015edb8 100644 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -106,13 +106,10 @@ RUN find /usr/local \ -exec rm -rf '{}' + && \ rm -fr /root/.cache /tmp/* /var/{cache,log}/* /var/lib/apt/lists/* - - # Health check 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/rootfs/etc/s6-overlay/s6-rc.d/paths.sh b/vscode/rootfs/etc/s6-overlay/s6-rc.d/paths.sh index f495259..708b473 100644 --- a/vscode/rootfs/etc/s6-overlay/s6-rc.d/paths.sh +++ b/vscode/rootfs/etc/s6-overlay/s6-rc.d/paths.sh @@ -1,25 +1,25 @@ #!/usr/bin/env bash # this file is to prevent spaghetti paths # shellcheck disable=SC2034 +readonly -a DIRECTORIES=(addons addon_configs backup config media share ssl) +readonly GIT_USER_PATH="/data/git" +readonly SSH_USER_PATH="/data/.ssh" +readonly ZSH_HISTORY_FILE="/root/.zsh_history" +readonly ZSH_HISTORY_PERSISTENT_FILE="/data/.zsh_history" + +readonly CUSTOM_BASH_SCRIPTS_PATH="/data/vscode/custom_boot_scripts" +readonly CODE_SERVER_WORKSPACE_DIR="/data/workspace" readonly DEFAULT_CONFIG_PATH="/data/vscode" readonly DEFAULT_FILES_PATH="/var/lib/code-server/defaults" readonly ROOT_CODE_SERVER_CONFIG_PATH="/root/.config/code-server/" # needed for code-server to cleanly -readonly ROOT_CODE_SERVER_USER_PATH="/root/.config/code-server/user" # needed for code-server to cleanly +readonly ROOT_CODE_SERVER_USER_PATH="$DEFAULT_CONFIG_PATH/user" # needed for code-server to cleanly readonly CODE_SERVER_EXTENSIONS_INSTALL_PATH="$DEFAULT_CONFIG_PATH/extensions" readonly CODE_SERVER_EXTENSIONS_LIST="$DEFAULT_CONFIG_PATH/vscode.extensions" -readonly CODE_SERVER_WORKSPACE_DIR="/data/workspace" + readonly CODE_SERVER_WORKSPACE_FILE="$CODE_SERVER_WORKSPACE_DIR/SERVER.code-workspace" readonly CODE_SERVER_VSCODE_DIR="$CODE_SERVER_WORKSPACE_DIR/.vscode" readonly CODE_SERVER_VSCODE_TASKS="$CODE_SERVER_VSCODE_DIR/tasks.json" -readonly CUSTOM_BASH_SCRIPTS_PATH="/data/vscode/custom_boot_scripts" -readonly -a DIRECTORIES=(addons addon_configs backup config media share ssl) - -readonly GIT_USER_PATH=/data/git -readonly SSH_USER_PATH=/data/.ssh -readonly ZSH_HISTORY_FILE=/root/.zsh_history -readonly ZSH_HISTORY_PERSISTENT_FILE=/data/.zsh_history - -readonly USER_CUSTOM_DIR=$CUSTOM_BASH_SCRIPTS_PATH/storage +readonly USER_CUSTOM_DIR="$CUSTOM_BASH_SCRIPTS_PATH/storage"