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

[buildbot.git] / docker / buildmaster / Dockerfile

diff --git a/docker/buildmaster/Dockerfile b/docker/buildmaster/Dockerfile
index fb7a7581b029e08c5f65264a31885648bcd79747..1cf4d566974726d8f794731a6c05654054ace9cb 100644 (file)
--- a/docker/buildmaster/Dockerfile
+++ b/docker/buildmaster/Dockerfile
@@ -12,26 +12,30 @@ USER root
 RUN \
        apt-get update && \
        apt-get install -y \
-               pwgen \
-               locales \
                build-essential \
-               libncurses5-dev \
                gawk \
                git-core \
-               pv \
                gosu \
+               libncurses5-dev \
+               locales \
                signify-openbsd \
+               pv \
+               pwgen \
                python3-pip \
                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 -U pip
 RUN \
        pip3 install \
                "buildbot-www==$BUILDBOT_VERSION" \
                "buildbot-waterfall-view==$BUILDBOT_VERSION" \
                "buildbot-console-view==$BUILDBOT_VERSION" \
-               "buildbot-grid-view==$BUILDBOT_VERSION"
+               "buildbot-grid-view==$BUILDBOT_VERSION" \
+               "buildbot-worker==$BUILDBOT_VERSION" \
+               pyOpenSSL \
+               service_identity
 
 ENV LANG=en_US.utf8