From 1f4920f4c144e480a913d5944a28c6fd707db46e Mon Sep 17 00:00:00 2001 From: Maria Matejka Date: Mon, 13 Jan 2025 22:21:43 +0100 Subject: [PATCH] use python venv for debian --- .gitlab-ci.yml | 2 ++ misc/docker/debian-12-amd64/Dockerfile | 3 ++- misc/docker/debian-12-i386/Dockerfile | 3 ++- misc/docker/ubuntu-22.04-amd64/Dockerfile | 3 ++- misc/docker/ubuntu-24.04-amd64/Dockerfile | 3 ++- misc/docker/ubuntu-24.10-amd64/Dockerfile | 3 ++- 6 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 27b35fb3d..9efd79686 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -450,6 +450,8 @@ build-only-static: .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 - BRANCH=$CI_COMMIT_BRANCH ARCHIVE_DOCS=false 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 -- 2.47.2