diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 6827e1098..1bfa99b0d 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -6,7 +6,7 @@ // Sets the run context to one level up instead of the .devcontainer folder. "context": "..", // Update the 'dockerFile' property if you aren't using the standard 'Dockerfile' filename. - "dockerfile": "../Dockerfile.dev", + "dockerfile": "../Dockerfile.dev" }, // Use 'forwardPorts' to make a list of ports inside the container available locally. "appPort": [8080], @@ -110,5 +110,5 @@ // Uncomment to connect as an existing user other than the container default. More info: https://aka.ms/dev-containers-non-root. "remoteUser": "devuser", "shutdownAction": "stopContainer", - "postStartCommand": "chmod +x scripts/init-setup.sh && ./scripts/init-setup.sh" + "postStartCommand": "./scripts/init-setup.sh" } diff --git a/Dockerfile.dev b/Dockerfile.dev index afe840e25..dc6f40d73 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -43,11 +43,8 @@ RUN mkdir -p /home/devuser/{configs,logs,customFiles,pipeline/watchedFolders,pip && adduser --disabled-password --gecos '' devuser \ && chown -R devuser:devuser /home/devuser -RUN mkdir -p /home/devuser/logs && chown devuser:devuser /home/devuser/logs -RUN mkdir -p /workspace/logs && chown devuser:devuser /workspace/logs -RUN mkdir -p /workspace/src && chown devuser:devuser /workspace/src -RUN mkdir -p /workspace/src/main && chown devuser:devuser /workspace/src/main -RUN mkdir -p /workspace/src/main/resources && chown devuser:devuser /workspace/src/main/resources +RUN mkdir -p /home/devuser/logs /workspace/logs /workspace/scripts /workspace/src/main/resources \ + && chown -R devuser:devuser /home/devuser /workspace # Setze das Arbeitsverzeichnis (wird später per Bind-Mount überschrieben) WORKDIR /workspace diff --git a/scripts/init-setup.sh b/scripts/init-setup.sh index a495add7c..6b7153cda 100644 --- a/scripts/init-setup.sh +++ b/scripts/init-setup.sh @@ -5,4 +5,4 @@ whoami cd "$(dirname "$0")/.." -./gradlew bootRun +echo "Devcontainer started..."