Back to bash lol

Dockerfile

@@ -4,43 +4,36 @@ FROM agenticlabs/lsproxy:0.1.1
 RUN apt-get update && apt-get install -y \
     python3 \
     python3-pip \
-    supervisor \
     git \
     && rm -rf /var/lib/apt/lists/*
 
 # Set up uv
 COPY --from=ghcr.io/astral-sh/uv:0.4.20 /uv /bin/uv
-RUN useradd -m -u 1000 user
 
-# Set up marimo config directory with proper permissions
-RUN mkdir -p /home/user/.marimo && \
-    chown -R user:user /home/user/.marimo
+# Set up directories
+RUN mkdir -p /root/.marimo /root/.config /mnt/workspace
 
-ENV PATH="/home/user/.local/bin:$PATH"
+ENV PATH="/root/.local/bin:$PATH"
 ENV UV_SYSTEM_PYTHON=1
-ENV HOME=/home/user
-ENV XDG_CONFIG_HOME=/home/user/.config
-ENV MARIMO_CONFIG_DIR=/home/user/.marimo
+ENV HOME=/root
+ENV XDG_CONFIG_HOME=/root/.config
+ENV MARIMO_CONFIG_DIR=/root/.marimo
 
-# Clone specific commit of trieve
+# Clone trieve
 RUN git clone https://github.com/devflowinc/trieve /mnt/workspace && \
     cd /mnt/workspace && \
     git checkout e65889a13715e8833e7cccfe0168b57c1fc966cc
 
 # Set up marimo
 WORKDIR /app
-COPY --chown=user ./requirements.txt requirements.txt
+COPY requirements.txt .
 RUN pip install --break-system-packages -r requirements.txt
-COPY --chown=user . /app
+COPY . .
 
-# Set up supervisor with proper permissions
-RUN mkdir -p /var/log/supervisor && \
-    chown -R user:user /var/log/supervisor && \
-    mkdir -p /var/run && \
-    chown -R user:user /var/run
-COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+# Copy start script
+COPY start.sh /start.sh
+RUN chmod +x /start.sh
 
 EXPOSE 7860
 
-# Start supervisor to manage both processes
-CMD ["supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]
+CMD ["/start.sh"]

start.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# Start lsproxy in the workspace directory
+cd /mnt/workspace
+/lsproxy &
+LSPROXY_PID=$!
+
+# Start marimo in the app directory
+cd /app
+marimo run tutorial.py --host 0.0.0.0 --port 7860 &
+MARIMO_PID=$!
+
+# Handle shutdown gracefully
+cleanup() {
+    echo "Shutting down processes..."
+    kill $LSPROXY_PID
+    kill $MARIMO_PID
+    exit 0
+}
+
+trap cleanup SIGTERM SIGINT
+
+# Wait for either process to exit
+wait $LSPROXY_PID $MARIMO_PID

supervisord.conf

@@ -1,23 +0,0 @@
-[supervisord]
-nodaemon=true
-logfile=/var/log/supervisor/supervisord.log
-loglevel=debug
-user=user
-
-[program:lsproxy]
-command=/lsproxy
-environment=RUST_LOG=info,RA_LOG=/tmp/rust-analyzer.log
-stdout_logfile=/var/log/supervisor/lsproxy.log
-stderr_logfile=/var/log/supervisor/lsproxy.err
-autorestart=true
-startretries=5
-
-[program:marimo]
-command=marimo run tutorial.py --host 0.0.0.0 --port 7860
-user=user
-directory=/app
-stdout_logfile=/var/log/supervisor/marimo.log
-stderr_logfile=/var/log/supervisor/marimo.err
-autorestart=true
-startretries=5
-environment=HOME="/home/user",XDG_CONFIG_HOME="/home/user/.config",MARIMO_CONFIG_DIR="/home/user/.marimo",PYTHONUNBUFFERED=1