diff options
| -rw-r--r-- | Dockerfile | 13 | ||||
| -rw-r--r-- | requirements.txt | 2 |
2 files changed, 1 insertions, 14 deletions
diff --git a/Dockerfile b/Dockerfile index 9ef973e98..5a17739f0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -69,19 +69,6 @@ RUN /output/install-from-bindep zuul_base \ # where it becomes the default. && git config --system protocol.version 2 -# Begin temporary git package upgrade -RUN ARCH=`dpkg --print-architecture` \ - && cd /tmp \ - && apt-get update \ - && apt-get -y install wget \ - && wget https://static.opendev.org/project/opendev.org/debs/git/git_2.30.2-1opendev1.0_$ARCH.deb \ - && wget https://static.opendev.org/project/opendev.org/debs/git/git-man_2.30.2-1opendev1.0_all.deb \ - && apt-get -y install /tmp/git_*.deb /tmp/git-man_*.deb \ - && rm -f /tmp/*.deb \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* -# End temporary git package upgrade - VOLUME /var/lib/zuul CMD ["/usr/local/bin/zuul"] diff --git a/requirements.txt b/requirements.txt index 428bd4d47..082a18043 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,7 +18,7 @@ PrettyTable>=0.6,<0.8 babel>=1.0 netaddr kazoo>=2.9.0 -sqlalchemy +sqlalchemy<2.0.0 alembic cryptography>=39.0.0 cachecontrol<0.12.7 |