From a4e2b4e2493571c56c40191e9f3c66ab57ce29ad Mon Sep 17 00:00:00 2001 From: Peter Surda Date: Sun, 3 Mar 2024 21:35:28 +0800 Subject: [PATCH] Partially revert last commit - looks like BUILDMASTER variable name is hard coded into buildbot docker worker code --- lib/worker_multibuild.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/worker_multibuild.py b/lib/worker_multibuild.py index b258926..0c85322 100644 --- a/lib/worker_multibuild.py +++ b/lib/worker_multibuild.py @@ -31,7 +31,7 @@ RUN echo 'buildbot ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers USER buildbot -ENTRYPOINT /usr/local/bin/buildbot_entrypoint.sh "$CONNECTIONSTRING" "$WORKERNAME" "$WORKERPASS" +ENTRYPOINT /usr/local/bin/buildbot_entrypoint.sh "$BUILDMASTER:$BUILDMASTER_PORT" "$WORKERNAME" "$WORKERPASS" """ @@ -52,7 +52,7 @@ RUN echo 'buildbot ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers USER buildbot -ENTRYPOINT /usr/local/bin/buildbot_entrypoint.sh "$CONNECTIONSTRING" "$WORKERNAME" "$WORKERPASS" +ENTRYPOINT /usr/local/bin/buildbot_entrypoint.sh "$$BUILDMASTER:$BUILDMASTER_PORT" "$WORKERNAME" "$WORKERPASS" """ @@ -73,7 +73,7 @@ RUN echo 'buildbot ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers USER buildbot -ENTRYPOINT /usr/local/bin/buildbot_entrypoint.sh "$CONNECTIONSTRING" "$WORKERNAME" "$WORKERPASS" +ENTRYPOINT /usr/local/bin/buildbot_entrypoint.sh "$$BUILDMASTER:$BUILDMASTER_PORT" "$WORKERNAME" "$WORKERPASS" """ @@ -99,7 +99,7 @@ RUN echo 'buildbot ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers USER buildbot -ENTRYPOINT /usr/local/bin/buildbot_entrypoint.sh "$CONNECTIONSTRING" "$WORKERNAME" "$WORKERPASS" +ENTRYPOINT /usr/local/bin/buildbot_entrypoint.sh "$$BUILDMASTER:$BUILDMASTER_PORT" "$WORKERNAME" "$WORKERPASS" """