[buildbot] docker: make TLS working

[LEDE Commits]

ynezz pushed a commit to buildbot.git, branch staging/ynezz/buildbot-2.10.0:
https://git.openwrt.org/66f4b781052dfe4ea433b1c4c99e3833142a4070

commit 66f4b781052dfe4ea433b1c4c99e3833142a4070
Author: Petr Štetiar <ynezz at true.cz>
AuthorDate: Thu Jan 14 17:27:49 2021 +0100

    docker: make TLS working
    
    Fixes following errors during setup:
    
     buildslave-phase2_1   | Failed to load application: name 'optionsForClientTLS' is not defined
    
     [-] while starting BuildMaster
     ...
     builtins.ModuleNotFoundError: No module named 'OpenSSL'
    
    Signed-off-by: Petr Štetiar <ynezz at true.cz>
---
 docker/buildmaster/Dockerfile    | 4 +++-
 docker/buildslave/Dockerfile     | 7 ++++++-
 docker/buildslave/files/start.sh | 4 +++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/docker/buildmaster/Dockerfile b/docker/buildmaster/Dockerfile
index a50296a..988b273 100644
--- a/docker/buildmaster/Dockerfile
+++ b/docker/buildmaster/Dockerfile
@@ -31,7 +31,9 @@ RUN \
 		"buildbot-www==$BUILDBOT_VERSION" \
 		"buildbot-waterfall-view==$BUILDBOT_VERSION" \
 		"buildbot-console-view==$BUILDBOT_VERSION" \
-		"buildbot-grid-view==$BUILDBOT_VERSION"
+		"buildbot-grid-view==$BUILDBOT_VERSION" \
+		pyOpenSSL \
+		service_identity
 
 ENV LANG=en_US.utf8
 
diff --git a/docker/buildslave/Dockerfile b/docker/buildslave/Dockerfile
index 6b09b37..a765fc4 100644
--- a/docker/buildslave/Dockerfile
+++ b/docker/buildslave/Dockerfile
@@ -27,14 +27,19 @@ RUN \
 		pv \
 		pwgen \
 		python3 \
+		python3-openssl \
 		python3-pip \
+		python3-service-identity \
 		qemu-utils \
 		unzip \
 		wget && \
 	apt-get clean && \
 	localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
 
-RUN pip3 install "buildbot-worker==$BUILDBOT_VERSION"
+RUN pip3 install \
+		"buildbot-worker==$BUILDBOT_VERSION" \
+		pyOpenSSL \
+		service_identity
 
 ENV LANG=en_US.utf8
 
diff --git a/docker/buildslave/files/start.sh b/docker/buildslave/files/start.sh
index 004701c..20ac53a 100644
--- a/docker/buildslave/files/start.sh
+++ b/docker/buildslave/files/start.sh
@@ -12,7 +12,9 @@
 
 rm -f /builder/buildbot.tac
 
-/usr/local/bin/buildbot-worker create-worker --force --umask="0o22" /builder \
+use_tls=""
+[ "$BUILDSLAVE_TLS" = 1 ] && use_tls="--use-tls"
+/usr/local/bin/buildbot-worker create-worker --force --umask="0o22" $use_tls /builder \
     "$BUILDSLAVE_MASTER" "$BUILDSLAVE_NAME" "$BUILDSLAVE_PASSWORD"
 
 if [ "$BUILDSLAVE_TLS" = 1 ]; then