From 315de5d1f794a499306c86458e5978e0e490f70d Mon Sep 17 00:00:00 2001 From: itdominator <1itdominator@gmail.com> Date: Wed, 26 Nov 2025 16:40:01 -0600 Subject: [PATCH] Limit mount point scope; damonized start; separated clean vs reset --- Docker/Dockerfile | 2 ++ Docker/scripts/clean.sh | 5 ----- Docker/scripts/reset.sh | 26 ++++++++++++++++++++++++++ Docker/scripts/start.sh | 12 +++++++++--- 4 files changed, 37 insertions(+), 8 deletions(-) create mode 100755 Docker/scripts/reset.sh diff --git a/Docker/Dockerfile b/Docker/Dockerfile index fd647ba..53e4a9b 100644 --- a/Docker/Dockerfile +++ b/Docker/Dockerfile @@ -58,7 +58,9 @@ RUN apt-get install \ libgirepository1.0-dev \ libssl-dev libcairo2-dev \ curl \ + wget \ clang \ + clangd \ gopls \ git diff --git a/Docker/scripts/clean.sh b/Docker/scripts/clean.sh index 63a14c7..451769e 100755 --- a/Docker/scripts/clean.sh +++ b/Docker/scripts/clean.sh @@ -16,11 +16,6 @@ function main() { podman image prune podman volume prune podman network prune - - podman machine stop - podman machine reset - podman machine init - podman machine start } main $@; diff --git a/Docker/scripts/reset.sh b/Docker/scripts/reset.sh new file mode 100755 index 0000000..63a14c7 --- /dev/null +++ b/Docker/scripts/reset.sh @@ -0,0 +1,26 @@ +#!/bin/bash + +# . CONFIG.sh + +# set -o xtrace ## To debug scripts +# set -o errexit ## To exit on error +# set -o errunset ## To exit if a variable is referenced but not set + + +function main() { + SCRIPTPATH="$( cd "$(dirname "")" >/dev/null 2>&1 ; pwd -P )" + cd "${SCRIPTPATH}" + echo "Working Dir: " $(pwd) + + podman container prune + podman image prune + podman volume prune + podman network prune + + podman machine stop + podman machine reset + podman machine init + podman machine start +} +main $@; + diff --git a/Docker/scripts/start.sh b/Docker/scripts/start.sh index d5bba14..0b074a4 100755 --- a/Docker/scripts/start.sh +++ b/Docker/scripts/start.sh @@ -18,14 +18,20 @@ function main() { exit 1 fi - podman run \ + CODE_HOST="${HOME}/Coding" + CODE_CONTAINER="${HOME}/Coding" + CONFIG_HOST="${HOME}/.config/lsps" + CONFIG_CONTAINER="${HOME}/.config/lsps" + + podman run -d \ -p 9999:9999 \ -e HOME="${HOME}" \ -e MAVEN_OPTS="-Duser.home=${HOME}" \ -e JAVA_TOOL_OPTIONS="-Duser.home=${HOME}" \ - -e JDTLS_CONFIG_PATH="${HOME}/.config/lsps/jdtls" \ + -e JDTLS_CONFIG_PATH="${CONFIG_CONTAINER}/jdtls" \ -e JDTLS_DATA_PATH="${JDTLS_CONFIG_PATH}/data" \ - -v "${HOME}":"${HOME}" \ + -v "${CODE_HOST}":"${CODE_CONTAINER}" \ + -v "${CONFIG_HOST}":"${CONFIG_CONTAINER}" \ newton-lsp:latest } main $@;