Skip to content

Commit 1b82cde

Browse files
committed
#48 use lsioenv to install python deps
1 parent 48d571e commit 1b82cde

2 files changed

Lines changed: 12 additions & 14 deletions

File tree

Dockerfile

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,7 @@ RUN \
5959
echo "**** dev deps ****" && \
6060
apt-get update && \
6161
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
62-
python3-dev \
63-
python3-pip && \
62+
python3-dev && \
6463
echo "**** enable locales ****" && \
6564
sed -i \
6665
'/locale/d' \
@@ -144,7 +143,7 @@ RUN \
144143
pulseaudio \
145144
pulseaudio-utils \
146145
python3 \
147-
python3-distutils \
146+
python3-venv \
148147
software-properties-common \
149148
ssl-cert \
150149
stterm \
@@ -179,7 +178,6 @@ RUN \
179178
apt install -t bookworm-backports -y \
180179
mesa-libgallium && \
181180
echo "**** install selkies ****" && \
182-
pip3 install pixelflux pcmflux --break-system-packages && \
183181
SELKIES_RELEASE=$(curl -sX GET "https://api.github.com/repos/selkies-project/selkies/releases/latest" \
184182
| awk '/tag_name/{print $4;exit}' FS='[""]') && \
185183
curl -o \
@@ -188,7 +186,9 @@ RUN \
188186
cd /tmp && \
189187
tar xf selkies.tar.gz && \
190188
cd selkies-* && \
191-
pip3 install . --break-system-packages && \
189+
python3 -m venv /lsiopy && \
190+
pip install . && \
191+
pip install setuptools && \
192192
echo "**** install selkies interposer ****" && \
193193
cd addons/js-interposer && \
194194
gcc -shared -fPIC -ldl \
@@ -253,8 +253,7 @@ RUN \
253253
| tar xzvf - -C /usr/share/themes/Clearlooks/openbox-3/ && \
254254
echo "**** cleanup ****" && \
255255
apt-get purge -y --autoremove \
256-
python3-dev \
257-
python3-pip && \
256+
python3-dev && \
258257
apt-get autoclean && \
259258
rm -rf \
260259
/config/.cache \

Dockerfile.aarch64

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,7 @@ RUN \
5959
echo "**** dev deps ****" && \
6060
apt-get update && \
6161
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
62-
python3-dev \
63-
python3-pip && \
62+
python3-dev && \
6463
echo "**** enable locales ****" && \
6564
sed -i \
6665
'/locale/d' \
@@ -143,7 +142,7 @@ RUN \
143142
pulseaudio \
144143
pulseaudio-utils \
145144
python3 \
146-
python3-distutils \
145+
python3-venv \
147146
software-properties-common \
148147
ssl-cert \
149148
stterm \
@@ -177,7 +176,6 @@ RUN \
177176
apt install -t bookworm-backports -y \
178177
mesa-libgallium && \
179178
echo "**** install selkies ****" && \
180-
pip3 install pixelflux pcmflux --break-system-packages && \
181179
SELKIES_RELEASE=$(curl -sX GET "https://api.github.com/repos/selkies-project/selkies/releases/latest" \
182180
| awk '/tag_name/{print $4;exit}' FS='[""]') && \
183181
curl -o \
@@ -186,7 +184,9 @@ RUN \
186184
cd /tmp && \
187185
tar xf selkies.tar.gz && \
188186
cd selkies-* && \
189-
pip3 install . --break-system-packages && \
187+
python3 -m venv /lsiopy && \
188+
pip install . && \
189+
pip install setuptools && \
190190
echo "**** install selkies interposer ****" && \
191191
cd addons/js-interposer && \
192192
gcc -shared -fPIC -ldl \
@@ -251,8 +251,7 @@ RUN \
251251
| tar xzvf - -C /usr/share/themes/Clearlooks/openbox-3/ && \
252252
echo "**** cleanup ****" && \
253253
apt-get purge -y --autoremove \
254-
python3-dev \
255-
python3-pip && \
254+
python3-dev && \
256255
apt-get autoclean && \
257256
rm -rf \
258257
/config/.cache \

0 commit comments

Comments
 (0)