From 7df7bd8707654e3a32122e8230cfb17230cfc774 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jo@mein.io>
Date: Sun, 12 Apr 2020 00:15:26 +0200
Subject: [PATCH] buildmaster: update to v2.4.1

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---
 docker/buildmaster/Dockerfile | 45 +++++++++++++++++++----------------
 phase1/master.cfg             |  2 +-
 phase2/master.cfg             |  2 +-
 3 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/docker/buildmaster/Dockerfile b/docker/buildmaster/Dockerfile
index d3a6376..a5add66 100644
--- a/docker/buildmaster/Dockerfile
+++ b/docker/buildmaster/Dockerfile
@@ -8,27 +8,30 @@ ENV         BUILDMASTER_PHASE  1
 
 USER root
 
-RUN apt-get update && \
-    apt-get install -y \
-	pwgen \
-	locales \
-	buildbot \
-	build-essential \
-	libncurses5-dev \
-	gawk \
-	git-core \
-	pv \
-	gosu \
-	signify-openbsd \
-	python3-pip \
-	wget && \
-    apt-get clean && \
-    localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 && \
-    pip3 install \
-	"buildbot-www==2.0.1" \
-	"buildbot-waterfall-view==2.0.1" \
-	"buildbot-console-view==2.0.1" \
-	"buildbot-grid-view==2.0.1"
+RUN echo 'deb http://deb.debian.org/debian testing main' \
+		> /etc/apt/sources.list.d/testing.list && \
+	apt-get update && \
+	apt-get install -t buster -y \
+		pwgen \
+		locales \
+		build-essential \
+		libncurses5-dev \
+		gawk \
+		git-core \
+		pv \
+		gosu \
+		signify-openbsd \
+		python3-pip \
+		wget && \
+	apt-get install -t testing -y \
+		buildbot && \
+	apt-get clean && \
+	localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 && \
+	pip3 install \
+		"buildbot-www==2.4.1" \
+		"buildbot-waterfall-view==2.4.1" \
+		"buildbot-console-view==2.4.1" \
+		"buildbot-grid-view==2.4.1"
 
 ENV LANG=en_US.utf8
 
diff --git a/phase1/master.cfg b/phase1/master.cfg
index 3e06733..d230466 100644
--- a/phase1/master.cfg
+++ b/phase1/master.cfg
@@ -69,7 +69,7 @@ c['buildbotURL'] = ini.get("phase1", "buildbot_url")
 slave_port = 9989
 
 if ini.has_option("phase1", "port"):
-	slave_port = ini.getint("phase1", "port")
+	slave_port = ini.get("phase1", "port")
 
 c['workers'] = []
 NetLocks = dict()
diff --git a/phase2/master.cfg b/phase2/master.cfg
index dd4db32..5ed7eff 100644
--- a/phase2/master.cfg
+++ b/phase2/master.cfg
@@ -54,7 +54,7 @@ git_ssh = False
 git_ssh_key = None
 
 if ini.has_option("phase2", "port"):
-	slave_port = ini.getint("phase2", "port")
+	slave_port = ini.get("phase2", "port")
 
 if ini.has_option("phase2", "persistent"):
 	persistent = ini.getboolean("phase2", "persistent")
-- 
2.30.2