From b037201b44024f49359b31333cc11734030a9bb7 Mon Sep 17 00:00:00 2001
From: Quentin McGaw <quentin.mcgaw@gmail.com>
Date: Mon, 25 Mar 2024 11:17:00 +0000
Subject: [PATCH] Combine `ENV` instructions together

---
 Dockerfile.external | 9 ++++-----
 Dockerfile.local    | 8 ++++----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Dockerfile.external b/Dockerfile.external
index 247b54ea..824202f5 100644
--- a/Dockerfile.external
+++ b/Dockerfile.external
@@ -18,9 +18,10 @@ ARG POETRY_EXTRAS="ui vector-stores-qdrant llms-ollama embeddings-ollama"
 RUN poetry install --extras "${POETRY_EXTRAS}"
 
 FROM base as app
-
-ENV PYTHONUNBUFFERED=1
-ENV PORT=8080
+ENV \
+  PYTHONUNBUFFERED=1 \
+  PORT=8080 \
+  PYTHONPATH="$PYTHONPATH:/home/worker/app/private_gpt/"
 EXPOSE 8080
 
 # Prepare a non-root user
@@ -38,7 +39,5 @@ COPY --chown=worker *.yaml .
 COPY --chown=worker scripts/ scripts
 COPY --chown=worker Makefile .
 
-ENV PYTHONPATH="$PYTHONPATH:/home/worker/app/private_gpt/"
-
 USER worker
 ENTRYPOINT python -m private_gpt
diff --git a/Dockerfile.local b/Dockerfile.local
index 4ba5ed4f..a4a600ae 100644
--- a/Dockerfile.local
+++ b/Dockerfile.local
@@ -29,8 +29,10 @@ RUN poetry install --extras "${POETRY_EXTRAS}"
 
 FROM base as app
 
-ENV PYTHONUNBUFFERED=1
-ENV PORT=8080
+ENV \
+  PYTHONUNBUFFERED=1 \
+  PORT=8080 \
+  PYTHONPATH="$PYTHONPATH:/home/worker/app/private_gpt/"
 EXPOSE 8080
 
 # Prepare a non-root user
@@ -48,7 +50,5 @@ COPY --chown=worker *.yaml ./
 COPY --chown=worker scripts/ scripts
 COPY --chown=worker Makefile .
 
-ENV PYTHONPATH="$PYTHONPATH:/home/worker/app/private_gpt/"
-
 USER worker
 ENTRYPOINT python -m private_gpt
\ No newline at end of file