From b62feb681e18a9b612dc2720c54858a2681c2cb8 Mon Sep 17 00:00:00 2001 From: Peter Surda Date: Sun, 3 Mar 2024 22:49:05 +0800 Subject: [PATCH] Fix buildbot worker TLS for old ubuntu --- lib/worker_multibuild.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/worker_multibuild.py b/lib/worker_multibuild.py index 0c85322..bf60e35 100644 --- a/lib/worker_multibuild.py +++ b/lib/worker_multibuild.py @@ -39,9 +39,11 @@ dockerfile_extra_contents['bionic'] = """ # Buildbot RUN apt-get update -y && apt-get install -yq --no-install-suggests --no-install-recommends \ - buildbot-slave git subversion python3-dev libffi-dev python3-setuptools \ + git subversion python3-dev libffi-dev python3-setuptools \ python3-pip dumb-init curl openssh-client wget +RUN pip3 install 'buildbot-worker==2.6.0' + # buildbot entrypoint RUN wget -O /usr/local/bin/buildbot_entrypoint.sh https://git.bitmessage.org/Bitmessage/buildbot-scripts/raw/branch/master/docker/bionic/entrypoint.sh RUN chmod +x /usr/local/bin/buildbot_entrypoint.sh @@ -81,10 +83,12 @@ dockerfile_extra_contents['xenial'] = """ # Buildbot RUN apt-get update -y && apt-get install -yq --no-install-suggests --no-install-recommends \ - buildbot-slave git subversion python3-dev libffi-dev python3-setuptools \ + 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 +RUN pip3 install 'buildbot-worker==2.6.0' + # dumb-init RUN wget https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_amd64.deb RUN dpkg -i dumb-init_*.deb && rm -f dumb-init_*.deb