diff --git a/vscode/Dockerfile b/vscode/Dockerfile index bdf377f..49720ee 100644 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -53,7 +53,6 @@ WORKDIR /tmp/ RUN curl -fsSL https://code-server.dev/install.sh | sh -s -- --version ${CODE_SERVER_VERSION} # Install Home Assistant CLI -WORKDIR /tmp/ # hadolint ignore=SC2086 RUN if [ "${BUILD_ARCH}" = "aarch64" ]; then HA_CLI_URL="https://github.com/home-assistant/cli/releases/download/${HA_CLI_VERSION}/ha_arm64"; \ elif [ "${BUILD_ARCH}" = "amd64" ]; then HA_CLI_URL="https://github.com/home-assistant/cli/releases/download/${HA_CLI_VERSION}/ha_amd64"; fi \ @@ -74,9 +73,6 @@ 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 -# The folder we are going to link Server folders to, as to give a clean view of only the server files and not the addons files. -WORKDIR /SERVER/ - # Install Python packages RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 10 && \ pip3 install --no-cache-dir -r /var/lib/code-server/defaults/core/requirements.txt diff --git a/vscode/config.yaml b/vscode/config.yaml index 49d1d2d..2d46621 100644 --- a/vscode/config.yaml +++ b/vscode/config.yaml @@ -46,4 +46,3 @@ schema: - str? init_commands: - str? - 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 b90d425..fb1f911 100644 --- a/vscode/rootfs/etc/s6-overlay/s6-rc.d/paths.sh +++ b/vscode/rootfs/etc/s6-overlay/s6-rc.d/paths.sh @@ -11,5 +11,6 @@ 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 CUSTOM_BASH_SCRIPTS_PATH="/data/vscode/custom"