From c1bb07269acf99acc38f63bfd959bd1c82b977c7 Mon Sep 17 00:00:00 2001
From: Paul Gauthier <aider@paulg.org>
Date: Thu, 11 Jul 2024 06:18:28 +0100
Subject: [PATCH] restored build-essentials in docker image

---
 docker/Dockerfile | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index a70d4c22e..c4b557426 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,21 +1,16 @@
-# Build stage
-FROM python:3.10-slim AS builder
-
-RUN apt-get update && \
-    apt-get install --no-install-recommends -y build-essential git
+FROM python:3.10-slim
 
 COPY . /aider
 
-RUN    pip install --no-cache-dir /aider[hf-embed] --extra-index-url https://download.pytorch.org/whl/cpu
+# Unfortunately to build the multi-arch docker image we need `build-essential` for amd64.
+# Apparently py-tree-sitter-languages doesn't have a pre-built binary wheel?
+# Apparently Playwright needs build-essentials too.
 
-# Final stage
-FROM python:3.10-slim
 RUN apt-get update && \
-    apt-get install --no-install-recommends -y git libportaudio2 && \
-    rm -rf /var/lib/apt/lists/*
-
-COPY --from=builder /usr/local/lib/python3.10/site-packages /usr/local/lib/python3.10/site-packages
-COPY --from=builder /usr/local/bin/aider /usr/local/bin/aider
-
+    apt-get install --no-install-recommends -y build-essential git libportaudio2 && \
+    rm -rf /var/lib/apt/lists/* && \
+    pip install --no-cache-dir /aider[hf-embed] --extra-index-url https://download.pytorch.org/whl/cpu && \
+    rm -rf /aider
+    
 WORKDIR /app
-ENTRYPOINT ["aider"]
+ENTRYPOINT ["aider"]
\ No newline at end of file