From: Petr Štetiar <ynezz@true.cz>
Date: Mon, 15 Mar 2021 22:39:55 +0000 (+0100)
Subject: docker: master/worker: fix issue with latest stable sqlalchemy
X-Git-Tag: v1~27
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=1d17927e74896df84208da090c80c2d1791d5fe6;p=buildbot.git

docker: master/worker: fix issue with latest stable sqlalchemy

Fixes following issue with sqlalchemy version 1.4.0 and too relaxed
dependecies `sqlalchemy>=1.2.0` in buildbot:

 Traceback (most recent call last):
   File "/usr/local/bin/buildbot", line 8, in <module>
     sys.exit(run())
     from buildbot.db import enginestrategy
   ...
   File "/usr/local/lib/python3.7/dist-packages/buildbot/db/enginestrategy.py", line 154, in <module>
     class BuildbotEngineStrategy(strategies.PlainEngineStrategy):
 AttributeError: module 'sqlalchemy.engine.strategies' has no attribute 'PlainEngineStrategy'

References: https://github.com/buildbot/buildbot/issues/5911
Signed-off-by: Petr Štetiar <ynezz@true.cz>
---

diff --git a/docker/buildmaster/Dockerfile b/docker/buildmaster/Dockerfile
index 1cf4d56..aa8fa10 100644
--- a/docker/buildmaster/Dockerfile
+++ b/docker/buildmaster/Dockerfile
@@ -29,6 +29,7 @@ RUN \
 RUN pip3 install -U pip
 RUN \
 	pip3 install \
+		"sqlalchemy==1.3.23" \
 		"buildbot-www==$BUILDBOT_VERSION" \
 		"buildbot-waterfall-view==$BUILDBOT_VERSION" \
 		"buildbot-console-view==$BUILDBOT_VERSION" \
diff --git a/docker/buildworker/Dockerfile b/docker/buildworker/Dockerfile
index ae62c7f..deb182b 100644
--- a/docker/buildworker/Dockerfile
+++ b/docker/buildworker/Dockerfile
@@ -39,6 +39,7 @@ RUN \
 
 RUN pip3 install -U pip
 RUN pip3 install \
+		"sqlalchemy==1.3.23" \
 		"buildbot-worker==$BUILDBOT_VERSION" \
 		pyOpenSSL \
 		service_identity