Rob McKnight commited on
Commit
e8d045e
·
1 Parent(s): 776a752

Go back to root again smh

Browse files
Files changed (2) hide show
  1. Dockerfile +4 -29
  2. start.sh +1 -4
Dockerfile CHANGED
@@ -1,5 +1,4 @@
1
  FROM agenticlabs/lsproxy:0.1.1
2
- RUN rustup update
3
 
4
  # Install Python, pip, and git
5
  RUN apt-get update && apt-get install -y \
@@ -8,45 +7,21 @@ RUN apt-get update && apt-get install -y \
8
  git \
9
  && rm -rf /var/lib/apt/lists/*
10
 
11
- # Set up uv
12
- COPY --from=ghcr.io/astral-sh/uv:0.4.20 /uv /bin/uv
13
-
14
- # Create user first
15
- RUN useradd -m -u 1000 user
16
-
17
- # Create directories with proper permissions
18
- RUN mkdir -p /home/user/.marimo && \
19
- mkdir -p /home/user/.config && \
20
- mkdir -p /mnt/workspace && \
21
- chown -R user:user /home/user/.marimo && \
22
- chown -R user:user /home/user/.config && \
23
- chown -R user:user /mnt && \
24
- chown user:user /lsproxy
25
-
26
- ENV PATH="/home/user/.local/bin:$PATH"
27
- ENV UV_SYSTEM_PYTHON=1
28
- ENV HOME=/home/user
29
- ENV XDG_CONFIG_HOME=/home/user/.config
30
- ENV MARIMO_CONFIG_DIR=/home/user/.marimo
31
- ENV RUST_LOG=debug
32
-
33
 
34
  # Set up marimo
35
  WORKDIR /app
36
- COPY --chown=user ./requirements.txt requirements.txt
 
37
  RUN pip install --break-system-packages -r requirements.txt
38
- COPY --chown=user . /app
39
 
40
- # Copy and set up start script
41
- COPY --chown=user ./start.sh /start.sh
42
 
43
  EXPOSE 7860
44
 
45
- # Clone trieve as user
46
- USER user
47
  RUN git clone https://github.com/devflowinc/trieve /mnt/workspace && \
48
  cd /mnt/workspace && \
49
  git checkout e65889a13715e8833e7cccfe0168b57c1fc966cc
50
 
 
 
51
  # Start both processes using the script
52
  CMD ["/start.sh"]
 
1
  FROM agenticlabs/lsproxy:0.1.1
 
2
 
3
  # Install Python, pip, and git
4
  RUN apt-get update && apt-get install -y \
 
7
  git \
8
  && rm -rf /var/lib/apt/lists/*
9
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
10
 
11
  # Set up marimo
12
  WORKDIR /app
13
+ COPY requirements.txt requirements.txt
14
+ COPY tutorial.py tutorial.py
15
  RUN pip install --break-system-packages -r requirements.txt
 
16
 
 
 
17
 
18
  EXPOSE 7860
19
 
 
 
20
  RUN git clone https://github.com/devflowinc/trieve /mnt/workspace && \
21
  cd /mnt/workspace && \
22
  git checkout e65889a13715e8833e7cccfe0168b57c1fc966cc
23
 
24
+ COPY start.sh /start.sh
25
+
26
  # Start both processes using the script
27
  CMD ["/start.sh"]
start.sh CHANGED
@@ -1,12 +1,9 @@
1
  #!/bin/bash
2
 
3
- # Start lsproxy in the workspace directory
4
- cd /mnt/workspace
5
  /lsproxy &
6
  LSPROXY_PID=$!
7
 
8
- # Start marimo in the app directory
9
- cd /app
10
  marimo run tutorial.py --host 0.0.0.0 --port 7860 &
11
  MARIMO_PID=$!
12
 
 
1
  #!/bin/bash
2
 
3
+ cd /app
 
4
  /lsproxy &
5
  LSPROXY_PID=$!
6
 
 
 
7
  marimo run tutorial.py --host 0.0.0.0 --port 7860 &
8
  MARIMO_PID=$!
9