Update Dockerfile to bundle Python dependencies in the Debian package

sc0rp10 · sc0rp10 · commit d41e2fac50b6 · 2025-03-04T02:04:02.000+03:00
diff --git a/Dockerfile b/Dockerfile
@@ -34,6 +34,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     python3 \
     python3-pip \
     python3-setuptools \
+    python3-venv \
     build-essential \
     && rm -rf /var/lib/apt/lists/*
 
@@ -46,20 +47,22 @@ COPY . .
 # Create directories for packaging
 RUN mkdir -p /app/package/usr/lib/k8sh
 RUN mkdir -p /app/package/usr/bin
+RUN mkdir -p /app/package/usr/lib/k8sh/venv
+
+# Create a virtual environment and install dependencies
+RUN python3 -m venv /app/package/usr/lib/k8sh/venv
+RUN /app/package/usr/lib/k8sh/venv/bin/pip install --no-cache-dir -r requirements.txt
 
 # Copy application files to the package structure
 RUN cp -r command k8s_client state utils main.py requirements.txt /app/package/usr/lib/k8sh/
 
-# Create the launcher script
+# Create the launcher script that uses the bundled virtual environment
 RUN echo '#!/bin/bash' > /app/package/usr/bin/k8sh && \
     echo 'cd /usr/lib/k8sh' >> /app/package/usr/bin/k8sh && \
-    echo 'python3 main.py "$@"' >> /app/package/usr/bin/k8sh && \
+    echo 'PYTHONPATH=/usr/lib/k8sh /usr/lib/k8sh/venv/bin/python main.py "$@"' >> /app/package/usr/bin/k8sh && \
     chmod +x /app/package/usr/bin/k8sh
 
-# Create an after-install script to install Python dependencies
-RUN echo '#!/bin/bash' > /app/after-install.sh && \
-    echo 'pip3 install --no-cache-dir -r /usr/lib/k8sh/requirements.txt' >> /app/after-install.sh && \
-    chmod +x /app/after-install.sh
+# No need for an after-install script as dependencies are bundled
 
 # Build the package with FPM
 RUN fpm \
@@ -69,10 +72,8 @@ RUN fpm \
     --version 1.0.0 \
     --architecture all \
     --depends python3 \
-    --depends python3-pip \
     --maintainer "K8sh Team <k8sh@example.com>" \
     --description "Kubernetes Terminal Emulator - A shell-like interface to Kubernetes" \
-    --after-install /app/after-install.sh \
     --chdir /app/package \
     --package /app/k8sh.deb \
     .
