From 232bfa7a3f266c724ddf57b03532929d8cc0fd43 Mon Sep 17 00:00:00 2001
From: h3110Fr13nd <vijaysinghkushwaha3737@gmail.com>
Date: Mon, 5 Aug 2024 22:14:24 +0530
Subject: [PATCH] chore: Update Dockerfiles for bolna_server, plivo_server, and
 twilio_server

---
 .../dockerfiles/bolna_server.Dockerfile       | 22 ++++++-------------
 .../dockerfiles/plivo_server.Dockerfile       | 15 +++++--------
 .../dockerfiles/twilio_server.Dockerfile      | 11 ++++------
 .../{ => telephony_server}/requirements.txt   |  5 +++--
 requirements.txt                              |  1 +
 5 files changed, 21 insertions(+), 33 deletions(-)
 rename local_setup/{ => telephony_server}/requirements.txt (71%)

diff --git a/local_setup/dockerfiles/bolna_server.Dockerfile b/local_setup/dockerfiles/bolna_server.Dockerfile
index 414aca2c..510c449c 100644
--- a/local_setup/dockerfiles/bolna_server.Dockerfile
+++ b/local_setup/dockerfiles/bolna_server.Dockerfile
@@ -1,19 +1,11 @@
 FROM python:3.10.13-slim
-
 WORKDIR /app
-COPY ./requirements.txt /app
-COPY ./quickstart_server.py /app
-
-RUN apt-get update && apt-get install libgomp1 git -y
-RUN apt-get -y update && apt-get -y upgrade && apt-get install -y --no-install-recommends ffmpeg
-RUN pip install -r requirements.txt
-RUN pip install --force-reinstall git+https://github.com/bolna-ai/bolna@master
-RUN pip install scipy==1.11.0
-RUN pip install torch==2.0.1
-RUN pip install torchaudio==2.0.1
-RUN pip install pydub==0.25.1
-RUN pip install ffprobe
-RUN pip install aiofiles
-
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    libgomp1 \
+    git \
+    ffmpeg
+RUN --mount=type=cache,target=/root/.cache/pip \
+    pip install git+https://github.com/bolna-ai/bolna@master
+COPY quickstart_server.py /app/
 EXPOSE 5001
 CMD ["uvicorn", "quickstart_server:app", "--host", "0.0.0.0", "--port", "5001"]
diff --git a/local_setup/dockerfiles/plivo_server.Dockerfile b/local_setup/dockerfiles/plivo_server.Dockerfile
index 8d1ef218..2632815d 100644
--- a/local_setup/dockerfiles/plivo_server.Dockerfile
+++ b/local_setup/dockerfiles/plivo_server.Dockerfile
@@ -1,11 +1,8 @@
 FROM python:3.10.13-slim
-
 WORKDIR /app
-COPY ./requirements.txt /app
-COPY ./telephony_server/plivo_api_server.py /app
-
-RUN pip install --no-cache-dir -r requirements.txt
-
-EXPOSE 8002
-
-CMD ["uvicorn", "plivo_api_server:app", "--host", "0.0.0.0", "--port", "8002"]
+RUN --mount=type=cache,target=/root/.cache/pip \
+    --mount=type=bind,source=telephony_server/requirements.txt,target=/app/requirements.txt \
+    pip install --no-cache-dir -r requirements.txt
+COPY telephony_server/plivo_api_server.py /app/
+EXPOSE 8001
+CMD ["uvicorn", "plivo_api_server:app", "--host", "0.0.0.0", "--port", "8001"]
\ No newline at end of file
diff --git a/local_setup/dockerfiles/twilio_server.Dockerfile b/local_setup/dockerfiles/twilio_server.Dockerfile
index d368fbb9..4a12c252 100644
--- a/local_setup/dockerfiles/twilio_server.Dockerfile
+++ b/local_setup/dockerfiles/twilio_server.Dockerfile
@@ -1,11 +1,8 @@
 FROM python:3.10.13-slim
-
 WORKDIR /app
-COPY ./requirements.txt /app
-COPY ./telephony_server/twilio_api_server.py /app
-
-RUN pip install --no-cache-dir -r requirements.txt
-
+RUN --mount=type=cache,target=/root/.cache/pip \
+    --mount=type=bind,source=telephony_server/requirements.txt,target=/app/requirements.txt \
+    pip install --no-cache-dir -r requirements.txt
+COPY telephony_server/twilio_api_server.py /app/
 EXPOSE 8001
-
 CMD ["uvicorn", "twilio_api_server:app", "--host", "0.0.0.0", "--port", "8001"]
diff --git a/local_setup/requirements.txt b/local_setup/telephony_server/requirements.txt
similarity index 71%
rename from local_setup/requirements.txt
rename to local_setup/telephony_server/requirements.txt
index 1838e052..f1558707 100644
--- a/local_setup/requirements.txt
+++ b/local_setup/telephony_server/requirements.txt
@@ -1,6 +1,7 @@
-python-dotenv==1.0.0
 fastapi==0.108.0
 plivo==4.47.0
+python-dotenv==1.0.0
 redis==5.0.1
+requests==2.31.0
 twilio==8.9.0
-uvicorn==0.22.0
+uvicorn==0.22.0
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index fbcdc52b..ac741456 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -15,6 +15,7 @@ python-dotenv==1.0.0
 redis==5.0.1
 requests==2.31.0
 tiktoken>=0.6.0
+torchaudio==2.0.1
 twilio==8.9.0
 uvicorn==0.22.0
 websockets==10.4