From 97c191b8e84d909269102095ba216bfa301a5e0f Mon Sep 17 00:00:00 2001 From: Peter Surda Date: Sun, 3 Mar 2024 20:20:36 +0800 Subject: [PATCH] Certificate for PB buildbot connections - add buildbot.bitmessage.org cert - change BUILDMASTER to CONNECTIONSTRING --- lib/worker_multibuild.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/lib/worker_multibuild.py b/lib/worker_multibuild.py index f51abcd..b258926 100644 --- a/lib/worker_multibuild.py +++ b/lib/worker_multibuild.py @@ -24,12 +24,14 @@ RUN apt-get update -y && apt-get install -yq --no-install-suggests --no-install- # 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 +RUN wget -O /usr/local/share/ca-certificates/buildbot-ca.crt https://git.bitmessage.org/Bitmessage/buildbot-scripts/raw/branch/master/docker/bionic/buildbot-ca.crt +RUN update-ca-certificates RUN echo 'buildbot ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers USER buildbot -ENTRYPOINT /usr/local/bin/buildbot_entrypoint.sh "$BUILDMASTER" "$WORKERNAME" "$WORKERPASS" +ENTRYPOINT /usr/local/bin/buildbot_entrypoint.sh "$CONNECTIONSTRING" "$WORKERNAME" "$WORKERPASS" """ @@ -43,12 +45,14 @@ RUN apt-get update -y && apt-get install -yq --no-install-suggests --no-install- # 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 +RUN wget -O /usr/local/share/ca-certificates/buildbot-ca.crt https://git.bitmessage.org/Bitmessage/buildbot-scripts/raw/branch/master/docker/bionic/buildbot-ca.crt +RUN update-ca-certificates RUN echo 'buildbot ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers USER buildbot -ENTRYPOINT /usr/local/bin/buildbot_entrypoint.sh "$BUILDMASTER" "$WORKERNAME" "$WORKERPASS" +ENTRYPOINT /usr/local/bin/buildbot_entrypoint.sh "$CONNECTIONSTRING" "$WORKERNAME" "$WORKERPASS" """ @@ -62,12 +66,14 @@ RUN apt-get update -y && apt-get install -yq --no-install-suggests --no-install- # 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 +RUN wget -O /usr/local/share/ca-certificates/buildbot-ca.crt https://git.bitmessage.org/Bitmessage/buildbot-scripts/raw/branch/master/docker/bionic/buildbot-ca.crt +RUN update-ca-certificates RUN echo 'buildbot ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers USER buildbot -ENTRYPOINT /usr/local/bin/buildbot_entrypoint.sh "$BUILDMASTER" "$WORKERNAME" "$WORKERPASS" +ENTRYPOINT /usr/local/bin/buildbot_entrypoint.sh "$CONNECTIONSTRING" "$WORKERNAME" "$WORKERPASS" """ @@ -86,12 +92,14 @@ RUN dpkg -i dumb-init_*.deb && rm -f dumb-init_*.deb # buildbot entrypoint RUN [ -f /usr/local/bin/buildbot_entrypoint.sh ] || wget -O /usr/local/bin/buildbot_entrypoint.sh https://git.bitmessage.org/Bitmessage/buildbot-scripts/raw/branch/master/docker/xenial/entrypoint.sh RUN chmod +x /usr/local/bin/buildbot_entrypoint.sh +RUN wget -O /usr/local/share/ca-certificates/buildbot-ca.crt https://git.bitmessage.org/Bitmessage/buildbot-scripts/raw/branch/master/docker/bionic/buildbot-ca.crt +RUN update-ca-certificates RUN echo 'buildbot ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers USER buildbot -ENTRYPOINT /usr/local/bin/buildbot_entrypoint.sh "$BUILDMASTER" "$WORKERNAME" "$WORKERPASS" +ENTRYPOINT /usr/local/bin/buildbot_entrypoint.sh "$CONNECTIONSTRING" "$WORKERNAME" "$WORKERPASS" """