From cd431f18919b299e98b627efe4cf5698b67ae83b Mon Sep 17 00:00:00 2001 From: Peter Surda Date: Sun, 3 Mar 2024 23:28:31 +0800 Subject: [PATCH 1/2] Missing user/group for old buildbot --- lib/worker_multibuild.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/worker_multibuild.py b/lib/worker_multibuild.py index bf60e35..0cab7b9 100644 --- a/lib/worker_multibuild.py +++ b/lib/worker_multibuild.py @@ -43,6 +43,8 @@ RUN apt-get update -y && apt-get install -yq --no-install-suggests --no-install- python3-pip dumb-init curl openssh-client wget RUN pip3 install 'buildbot-worker==2.6.0' +RUN groupadd buildbot +RUN useradd -d /var/lib/buildbot -m -g buildbot buildbot # 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 @@ -88,6 +90,8 @@ RUN apt-get update -y && apt-get install -yq --no-install-suggests --no-install- python-setuptools python-psutil libssl-dev python-dev libgmp-dev python-virtualenv RUN pip3 install 'buildbot-worker==2.6.0' +RUN groupadd buildbot +RUN useradd -d /var/lib/buildbot -m -g buildbot buildbot # dumb-init RUN wget https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_amd64.deb -- 2.40.1 From d42e359732cdb56c88e7b3ea0a3db5ee3d9893ce Mon Sep 17 00:00:00 2001 From: Peter Surda Date: Mon, 4 Mar 2024 07:09:22 +0800 Subject: [PATCH 2/2] Fix buildbot worker for older 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 0cab7b9..cf635ee 100644 --- a/lib/worker_multibuild.py +++ b/lib/worker_multibuild.py @@ -40,9 +40,9 @@ dockerfile_extra_contents['bionic'] = """ # Buildbot 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 - -RUN pip3 install 'buildbot-worker==2.6.0' + python3-pip dumb-init curl openssh-client wget python3-wheel \ + pkg-config +RUN pip3 install buildbot-worker pyOpenSSL setuptools_rust RUN groupadd buildbot RUN useradd -d /var/lib/buildbot -m -g buildbot buildbot @@ -87,9 +87,10 @@ dockerfile_extra_contents['xenial'] = """ 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 curl openssh-client wget \ - python-setuptools python-psutil libssl-dev python-dev libgmp-dev python-virtualenv + python-setuptools python-psutil libssl-dev python-dev libgmp-dev \ + python-virtualenv python3-wheel pkg-config -RUN pip3 install 'buildbot-worker==2.6.0' +RUN pip3 install buildbot-worker pyOpenSSL setuptools_rust RUN groupadd buildbot RUN useradd -d /var/lib/buildbot -m -g buildbot buildbot -- 2.40.1