Merge branch 'main' into tobitege/update-dockerfile

containers/app/Dockerfile

@@ -28,7 +28,33 @@ COPY ./pyproject.toml ./poetry.lock ./
 RUN touch README.md
 RUN export POETRY_CACHE_DIR && poetry install --without evaluation,llama-index --no-root && rm -rf $POETRY_CACHE_DIR
 
-FROM python:3.12.3-slim AS runtime
+FROM nikolaik/python-nodejs:python3.11-nodejs22 AS runtime
+
+# install basic packages
+RUN apt-get update && apt-get install -y \
+    curl \
+    wget \
+    git \
+    vim \
+    nano \
+    unzip \
+    zip \
+    python3 \
+    python3-pip \
+    python3-venv \
+    python3-dev \
+    build-essential \
+    openssh-server \
+    sudo \
+    gcc \
+    jq \
+    g++ \
+    make \
+    iproute2 \
+    && rm -rf /var/lib/apt/lists/*
+
+# Install Playwright via pip
+RUN python3 -m pip install playwright
 
 WORKDIR /app
 

containers/sandbox/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM nikolaik/python-nodejs:python3.11-nodejs22
 
 # install basic packages
 RUN apt-get update && apt-get install -y \
@@ -21,12 +21,9 @@ RUN apt-get update && apt-get install -y \
     g++ \
     make \
     iproute2 \
-    && rm -rf /var/lib/apt/lists/*
-
-RUN mkdir -p -m0755 /var/run/sshd
-
-# symlink python3 to python
-RUN ln -s /usr/bin/python3 /usr/bin/python
+    && rm -rf /var/lib/apt/lists/* \
+    && mkdir -p -m0755 /var/run/sshd \
+    && ln -s /usr/bin/python3 /usr/bin/python # symlink python3 to python
 
 # ==== OpenHands Runtime Client ====
 RUN mkdir -p /openhands && mkdir -p /openhands/logs && chmod 777 /openhands/logs
@@ -41,4 +38,6 @@ RUN rm -f Miniforge3.sh
 RUN /openhands/miniforge3/bin/pip install --upgrade pip
 RUN /openhands/miniforge3/bin/pip install jupyterlab notebook jupyter_kernel_gateway flake8
 RUN /openhands/miniforge3/bin/pip install python-docx PyPDF2 python-pptx pylatexenc openai
-RUN /openhands/miniforge3/bin/pip install python-dotenv toml termcolor pydantic python-docx pyyaml docker pexpect tenacity e2b browsergym minio
+RUN /openhands/miniforge3/bin/pip install python-dotenv toml \
+   termcolor pydantic python-docx pyyaml \
+   docker pexpect tenacity e2b browsergym minio