From: Maria Matejka <mq@ucw.cz>
Date: Mon, 13 Jan 2025 21:21:43 +0000 (+0100)
Subject: use python venv for debian
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7e87495c62f446259c925b3b228889ce53db6be;p=thirdparty%2Fbird.git

use python venv for debian
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1e84f670f..6e7d25c9d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -354,6 +354,8 @@ build-opensuse-15.3-amd64:
 .pkg-deb: &pkg-deb
   stage: pkg
   script:
+    # create venv only if it's installed
+    - if python3 -m venv venv; then . venv/bin/activate; fi
     - pip3 install apkg
     - apkg build
     #- apkg install -y pkg/pkgs/*/*/*.deb
diff --git a/misc/docker/debian-12-amd64/Dockerfile b/misc/docker/debian-12-amd64/Dockerfile
index 3c6b43dd6..9a3ab9f43 100644
--- a/misc/docker/debian-12-amd64/Dockerfile
+++ b/misc/docker/debian-12-amd64/Dockerfile
@@ -23,4 +23,5 @@ RUN apt-get -y --no-install-recommends install \
 	quilt \
 	python3 \
 	python3-pip \
-	python3-setuptools
+	python3-setuptools \
+	python3-venv
diff --git a/misc/docker/debian-12-i386/Dockerfile b/misc/docker/debian-12-i386/Dockerfile
index 414178f12..a324f9efa 100644
--- a/misc/docker/debian-12-i386/Dockerfile
+++ b/misc/docker/debian-12-i386/Dockerfile
@@ -22,4 +22,5 @@ RUN apt-get -y --no-install-recommends install \
 	quilt \
 	python3 \
 	python3-pip \
-	python3-setuptools
+	python3-setuptools \
+	python3-venv
diff --git a/misc/docker/ubuntu-22.04-amd64/Dockerfile b/misc/docker/ubuntu-22.04-amd64/Dockerfile
index 00c4ffec4..4996fff2a 100644
--- a/misc/docker/ubuntu-22.04-amd64/Dockerfile
+++ b/misc/docker/ubuntu-22.04-amd64/Dockerfile
@@ -24,4 +24,5 @@ RUN apt-get -y install \
 	quilt \
 	python3 \
 	python3-pip \
-	python3-setuptools
+	python3-setuptools \
+	python3-venv
diff --git a/misc/docker/ubuntu-24.04-amd64/Dockerfile b/misc/docker/ubuntu-24.04-amd64/Dockerfile
index b6567eb25..799770015 100644
--- a/misc/docker/ubuntu-24.04-amd64/Dockerfile
+++ b/misc/docker/ubuntu-24.04-amd64/Dockerfile
@@ -24,4 +24,5 @@ RUN apt-get -y install \
 	quilt \
 	python3 \
 	python3-pip \
-	python3-setuptools
+	python3-setuptools \
+	python3-venv
diff --git a/misc/docker/ubuntu-24.10-amd64/Dockerfile b/misc/docker/ubuntu-24.10-amd64/Dockerfile
index b886ec638..03a3821b1 100644
--- a/misc/docker/ubuntu-24.10-amd64/Dockerfile
+++ b/misc/docker/ubuntu-24.10-amd64/Dockerfile
@@ -24,4 +24,5 @@ RUN apt-get -y install \
 	quilt \
 	python3 \
 	python3-pip \
-	python3-setuptools
+	python3-setuptools \
+	python3-venv