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 1cf4d566974726d8f794731a6c05654054ace9cb..aa8fa10a7993b5409f15633fe97c2be7e26c6ea2 100644 (file)
--- 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 ae62c7f57244b7a317ed7fdc7d592ad87e617cd8..deb182be493895053408addf71f9b8245c2429c1 100644 (file)
--- 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