Refactor for security and modularity #9
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -97,5 +97,11 @@ RUN npm install [email protected] -g | |
| RUN npx [email protected] install | ||
|
|
||
|
|
||
| # Create a non-root user | ||
| RUN useradd -ms /bin/bash coderunner | ||
|
|
||
| # Switch to the non-root user | ||
| USER coderunner | ||
|
|
||
| # Use the entrypoint script | ||
| ENTRYPOINT ["/entrypoint.sh"] | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,77 +1,89 @@ | ||
| #!/bin/bash | ||
|
|
||
| # --- Helper Functions --- | ||
|
|
||
| # Function to check if a command exists | ||
| command_exists() { | ||
| command -v "$1" &> /dev/null | ||
| } | ||
|
|
||
| # Function to get current macOS version | ||
| get_macos_version() { | ||
| sw_vers -productVersion | awk -F. '{print $1 "." $2}' | ||
| } | ||
|
|
||
| # --- Main Installation Logic --- | ||
|
|
||
| echo "Starting CodeRunner Setup..." | ||
|
|
||
| # --- macOS Specific Setup --- | ||
| if [[ "$OSTYPE" == "darwin"* ]]; then | ||
| echo "✅ macOS system detected." | ||
|
|
||
| # Check macOS version | ||
| macos_version=$(get_macos_version) | ||
| if (( $(echo "$macos_version < 26.0" | bc -l) )); then | ||
| echo "⚠️ Warning: Your macOS version is $macos_version. Version 26.0 or later is recommended for Apple Container." | ||
| fi | ||
|
|
||
| # Check for Apple Container tool | ||
| if command_exists container; then | ||
| echo "✅ Apple 'container' tool detected." | ||
| container --version | ||
| else | ||
| echo "❌ Apple 'container' tool not found." | ||
| echo "Please install it from: https://github.com/apple/container/releases" | ||
| exit 1 | ||
| fi | ||
|
|
||
| echo "Starting Apple Container services..." | ||
| container system start | ||
| sudo container system dns create local | ||
| container system dns default set local | ||
|
|
||
| echo "Pulling the latest image for Apple Container..." | ||
| container image pull instavm/coderunner | ||
|
|
||
| echo "→ Ensuring coderunner assets directory exists..." | ||
| ASSETS_SRC="$HOME/.coderunner/assets" | ||
| mkdir -p "$ASSETS_SRC" | ||
|
|
||
| echo "🚀 Starting CodeRunner container..." | ||
| container run --volume "$ASSETS_SRC:/app/uploads" --name coderunner --detach --rm --cpus 8 --memory 4g instavm/coderunner | ||
|
|
||
| echo "✅ Setup complete! MCP server is available at http://coderunner.local:8222/mcp" | ||
|
|
||
| # --- Docker-based Setup for Linux/Other --- | ||
| else | ||
| echo "✅ Non-macOS system detected. Setting up with Docker." | ||
|
|
||
| # Check for Docker | ||
| if ! command_exists docker; then | ||
| echo "❌ Docker is not installed. Please install Docker to continue." | ||
| echo "Visit: https://docs.docker.com/get-docker/" | ||
| exit 1 | ||
| fi | ||
|
|
||
| echo "✅ Docker is installed." | ||
|
|
||
| # Check if Docker daemon is running | ||
| if ! docker info &> /dev/null; then | ||
| echo "❌ Docker daemon is not running. Please start Docker and re-run this script." | ||
| exit 1 | ||
| fi | ||
|
|
||
| echo "Pulling the latest image from Docker Hub..." | ||
| docker pull instavm/coderunner | ||
|
|
||
| echo "→ Ensuring coderunner assets directory exists..." | ||
| ASSETS_SRC="$HOME/.coderunner/assets" | ||
| mkdir -p "$ASSETS_SRC" | ||
|
|
||
| echo "🚀 Starting CodeRunner container using Docker..." | ||
| docker run -d --rm --name coderunner \ | ||
| -p 8222:8222 \ | ||
| -v "$ASSETS_SRC:/app/uploads" \ | ||
| instavm/coderunner | ||
|
Comment on lines
+83
to
+86
There was a problem hiding this comment. There's a critical permission issue with the mounted volume. The A common solution is to handle this at container startup. For example, the entrypoint script could be run as root to There was a problem hiding this comment. I think we should revert this commit. Or maybe I will handle it in a new PR soon. |
||
|
|
||
| echo "✅ Setup complete! MCP server is available at http://localhost:8222/mcp" | ||
| fi | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The newly created
coderunneruser needs write permissions for directories within/app, such as/app/jupyter_runtime, which are currently owned byroot. Without this, the Jupyter server may fail at runtime. Please change the ownership of the/appdirectory after creating the user.