From 51fde197470f1bf73dee06b5a36aae720f459e85 Mon Sep 17 00:00:00 2001 From: Peter Surda Date: Mon, 4 Mar 2024 07:55:46 +0800 Subject: [PATCH] Fix buildbot deps for old ubuntu --- lib/worker_multibuild.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/worker_multibuild.py b/lib/worker_multibuild.py index cf635ee..052872a 100644 --- a/lib/worker_multibuild.py +++ b/lib/worker_multibuild.py @@ -41,8 +41,9 @@ dockerfile_extra_contents['bionic'] = """ RUN apt-get update -y && apt-get install -yq --no-install-suggests --no-install-recommends \ git subversion python3-dev libffi-dev python3-setuptools \ python3-pip dumb-init curl openssh-client wget python3-wheel \ - pkg-config -RUN pip3 install buildbot-worker pyOpenSSL setuptools_rust + pkg-config rustc cargo +RUN pip3 install setuptools_rust +RUN pip3 install buildbot-worker pyOpenSSL RUN groupadd buildbot RUN useradd -d /var/lib/buildbot -m -g buildbot buildbot @@ -88,9 +89,9 @@ RUN apt-get update -y && apt-get install -yq --no-install-suggests --no-install- git subversion python3-dev libffi-dev python3-setuptools \ python3-pip curl openssh-client wget \ python-setuptools python-psutil libssl-dev python-dev libgmp-dev \ - python-virtualenv python3-wheel pkg-config - -RUN pip3 install buildbot-worker pyOpenSSL setuptools_rust + python-virtualenv python3-wheel pkg-config rustc cargo +RUN pip3 install setuptools_rust +RUN pip3 install buildbot-worker pyOpenSSL RUN groupadd buildbot RUN useradd -d /var/lib/buildbot -m -g buildbot buildbot