FIX dockerfile (#12)

* FIX dockerfile

* FIX dockerfile

Dockerfile

@@ -14,27 +14,53 @@ RUN npm run build
 # Stage 2: Production image
 FROM python:3.11-slim
 
+# Install system packages as root
 RUN apt-get update && apt-get install -y \
     nginx \
     curl \
     procps \
     && rm -rf /var/lib/apt/lists/*
 
-WORKDIR /app
+# Create a new user named "user" with user ID 1000
+RUN useradd -m -u 1000 user
 
-COPY pyproject.toml uv.lock ./
-COPY cua2-core/ ./cua2-core/
+# Create necessary directories with proper permissions for nginx
+RUN mkdir -p /var/log/nginx /var/lib/nginx /var/cache/nginx /run \
+    && chown -R user:user /var/log/nginx /var/lib/nginx /var/cache/nginx /run \
+    && chmod -R 755 /var/log/nginx /var/lib/nginx /var/cache/nginx /run
 
+# Switch to the "user" user
+USER user
+
+# Set home to the user's home directory
+ENV HOME=/home/user \
+    PATH=/home/user/.local/bin:$PATH
+
+# Set the working directory to the user's home directory
+WORKDIR $HOME/app
+
+# Upgrade pip as user
+RUN pip install --no-cache-dir --upgrade pip
+
+# Install uv as user
 RUN pip install --no-cache-dir uv
 
-RUN cd /app && uv sync --frozen
+# Copy the project files with proper ownership
+COPY --chown=user:user pyproject.toml ./
+COPY --chown=user:user cua2-core/ ./cua2-core/
+
+# Install Python dependencies
+RUN uv sync --all-extras
 
-COPY --from=frontend-builder /app/frontend/dist /app/static
+# Copy frontend build with proper ownership
+COPY --chown=user:user --from=frontend-builder /app/frontend/dist ./static
 
-COPY nginx.conf /etc/nginx/nginx.conf
+# Copy nginx config (user needs read access)
+COPY --chown=user:user nginx.conf ./nginx.conf
 
-COPY entrypoint.sh /app/entrypoint.sh
-RUN chmod +x /app/entrypoint.sh
+# Copy entrypoint script with proper ownership and make it executable
+COPY --chown=user:user entrypoint.sh ./entrypoint.sh
+RUN chmod +x ./entrypoint.sh
 
 EXPOSE 7860
 
@@ -43,4 +69,4 @@ ENV HOST=0.0.0.0
 ENV PORT=8000
 
 # Use entrypoint script
-ENTRYPOINT ["/app/entrypoint.sh"]
+ENTRYPOINT ["./entrypoint.sh"]

cua2-core/src/cua2_core/services/agent_service.py

@@ -193,28 +193,22 @@ class AgentService:
 
             time.sleep(3)
 
-            if message_id in self.last_screenshot:
-                memory_step.observations_images = [
-                    self.last_screenshot[message_id].copy()
-                ]
-            else:
-                image = self.last_screenshot[message_id]
-                # agent.last_marked_screenshot = AgentImage(screenshot_path)
-
-                for previous_memory_step in (
-                    agent.memory.steps
-                ):  # Remove previous screenshots from logs for lean processing
-                    if (
-                        isinstance(previous_memory_step, ActionStep)
-                        and previous_memory_step.step_number is not None
-                        and previous_memory_step.step_number
-                        <= memory_step.step_number - 1
-                    ):
-                        previous_memory_step.observations_images = None
-                    elif isinstance(previous_memory_step, TaskStep):
-                        previous_memory_step.task_images = None
-
-                memory_step.observations_images = [image.copy()]
+            image = self.last_screenshot[message_id]
+            # agent.last_marked_screenshot = AgentImage(screenshot_path)
+
+            for previous_memory_step in (
+                agent.memory.steps
+            ):  # Remove previous screenshots from logs for lean processing
+                if (
+                    isinstance(previous_memory_step, ActionStep)
+                    and previous_memory_step.step_number is not None
+                    and previous_memory_step.step_number <= memory_step.step_number - 1
+                ):
+                    previous_memory_step.observations_images = None
+                elif isinstance(previous_memory_step, TaskStep):
+                    previous_memory_step.task_images = None
+
+            memory_step.observations_images = [image.copy()]
 
             model_output = (
                 memory_step.model_output_message.content

entrypoint.sh

@@ -3,7 +3,8 @@ set -e
 
 echo "Starting CUA2 Application..."
 
-service nginx start
+# Start nginx in the background using the config from the app directory
+nginx -c $HOME/app/nginx.conf -g 'daemon off;' &
 
 sleep 2
 
@@ -13,8 +14,9 @@ if ! pgrep nginx > /dev/null; then
     exit 1
 fi
 
+echo "nginx started successfully"
 
-cd /app/cua2-core
+cd $HOME/app/cua2-core
 
 # Set default number of workers if not specified
 WORKERS=${WORKERS:-1}

nginx.conf

@@ -1,4 +1,5 @@
-user www-data;
+# Running as non-root user, so user directive is not needed
+# user user;
 worker_processes auto;
 pid /run/nginx.pid;
 
@@ -29,7 +30,7 @@ http {
         listen 7860;
         server_name _;
 
-        root /app/static;
+        root /home/user/app/static;
         index index.html;
 
         location / {