From f2f58ae45474e17ba0624e4ee908b0f6d637e6d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <inean.es@gmail.com>
Date: Tue, 3 Sep 2024 18:42:20 +0200
Subject: [PATCH] chore: Update Dockerfile to use virtual environment for
 Python dependencies and set app path

---
 Dockerfile | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2021965..6549083 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,15 @@
-# Define the build argument with no default value
+# Global args
 ARG PYTHON_VERSION=3.10
+ARG APP_PATH=/app
+ARG VIRTUAL_ENV_PATH=.venv
 
 # Builder stage
 FROM python:${PYTHON_VERSION}-slim AS builder
 
+# Re-declare the ARG to use it in this stage
+ARG APP_PATH
+ARG VIRTUAL_ENV_PATH
+
 # hadolint ignore=DL3008
 RUN <<EOF
     apt-get update
@@ -11,19 +17,27 @@ RUN <<EOF
 EOF
 
 # Set the working directory:
-WORKDIR /app
+WORKDIR ${APP_PATH}
+
+# Set a Virtual env
+RUN python3 -m venv "${APP_PATH}/${VIRTUAL_ENV_PATH}"
+ENV PATH="${APP_PATH}/${VIRTUAL_ENV_PATH}/bin:$PATH"
 
 # Copy and install dependencies:
-COPY requirements.lock ./
+COPY requirements.lock .
 RUN PYTHONDONTWRITEBYTECODE=1 pip install --no-cache-dir -r requirements.lock
 
 # Copy the application source code:
 COPY src .
 
 # Final stage
-FROM python:${PYTHON_VERSION}-slim
+FROM python:${PYTHON_VERSION}-slim as target
 
-# Define the build argument with a default value
+# Redeclare args
+ARG APP_PATH
+ARG VIRTUAL_ENV_PATH
+
+# Image args
 ARG REGISTRY="ghcr.io"
 ARG REPOSITORY="inean/dns-synchub"
 
@@ -33,10 +47,13 @@ LABEL image="${REGISTRY}/${REPOSITORY}"
 LABEL maintainer="Carlos Martín (github.com/inean)"
 
 # Set the working directory:
-WORKDIR /app
+WORKDIR ${APP_PATH}
+
+# Ensure venv is used
+ENV PATH="${APP_PATH}/${VIRTUAL_ENV_PATH}/bin:$PATH"
 
 # Copy dependencies and source code from the builder stage
-COPY --from=builder /app /app
+COPY --from=builder ${APP_PATH} ${APP_PATH}
 
 # Run the application:
 ENTRYPOINT ["python", "-m", "dns_synchub"]