From 1b82cded646ca406929a4ebfb4ba3d96f57edd15 Mon Sep 17 00:00:00 2001 From: thelamer Date: Mon, 28 Jul 2025 08:39:34 -0400 Subject: [PATCH] #48 use lsioenv to install python deps --- Dockerfile | 13 ++++++------- Dockerfile.aarch64 | 13 ++++++------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/Dockerfile b/Dockerfile index 05f32ce..fd41dc9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -59,8 +59,7 @@ RUN \ echo "**** dev deps ****" && \ apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ - python3-dev \ - python3-pip && \ + python3-dev && \ echo "**** enable locales ****" && \ sed -i \ '/locale/d' \ @@ -144,7 +143,7 @@ RUN \ pulseaudio \ pulseaudio-utils \ python3 \ - python3-distutils \ + python3-venv \ software-properties-common \ ssl-cert \ stterm \ @@ -179,7 +178,6 @@ RUN \ apt install -t bookworm-backports -y \ mesa-libgallium && \ echo "**** install selkies ****" && \ - pip3 install pixelflux pcmflux --break-system-packages && \ SELKIES_RELEASE=$(curl -sX GET "https://api.github.com/repos/selkies-project/selkies/releases/latest" \ | awk '/tag_name/{print $4;exit}' FS='[""]') && \ curl -o \ @@ -188,7 +186,9 @@ RUN \ cd /tmp && \ tar xf selkies.tar.gz && \ cd selkies-* && \ - pip3 install . --break-system-packages && \ + python3 -m venv /lsiopy && \ + pip install . && \ + pip install setuptools && \ echo "**** install selkies interposer ****" && \ cd addons/js-interposer && \ gcc -shared -fPIC -ldl \ @@ -253,8 +253,7 @@ RUN \ | tar xzvf - -C /usr/share/themes/Clearlooks/openbox-3/ && \ echo "**** cleanup ****" && \ apt-get purge -y --autoremove \ - python3-dev \ - python3-pip && \ + python3-dev && \ apt-get autoclean && \ rm -rf \ /config/.cache \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 9fe6722..d00a4b8 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -59,8 +59,7 @@ RUN \ echo "**** dev deps ****" && \ apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ - python3-dev \ - python3-pip && \ + python3-dev && \ echo "**** enable locales ****" && \ sed -i \ '/locale/d' \ @@ -143,7 +142,7 @@ RUN \ pulseaudio \ pulseaudio-utils \ python3 \ - python3-distutils \ + python3-venv \ software-properties-common \ ssl-cert \ stterm \ @@ -177,7 +176,6 @@ RUN \ apt install -t bookworm-backports -y \ mesa-libgallium && \ echo "**** install selkies ****" && \ - pip3 install pixelflux pcmflux --break-system-packages && \ SELKIES_RELEASE=$(curl -sX GET "https://api.github.com/repos/selkies-project/selkies/releases/latest" \ | awk '/tag_name/{print $4;exit}' FS='[""]') && \ curl -o \ @@ -186,7 +184,9 @@ RUN \ cd /tmp && \ tar xf selkies.tar.gz && \ cd selkies-* && \ - pip3 install . --break-system-packages && \ + python3 -m venv /lsiopy && \ + pip install . && \ + pip install setuptools && \ echo "**** install selkies interposer ****" && \ cd addons/js-interposer && \ gcc -shared -fPIC -ldl \ @@ -251,8 +251,7 @@ RUN \ | tar xzvf - -C /usr/share/themes/Clearlooks/openbox-3/ && \ echo "**** cleanup ****" && \ apt-get purge -y --autoremove \ - python3-dev \ - python3-pip && \ + python3-dev && \ apt-get autoclean && \ rm -rf \ /config/.cache \