Pin sqlalchemy to <2.0 and revert "Update git"
2.0 has breaking api changes:
https://www.sqlalchemy.org/blog/2023/01/26/sqlalchemy-2.0.0-released/
Revert "Update git"
This reverts commit 944b9852c9
.
Upstream Debian has updated git to 2.30.2-1+deb11u1 which patches git
for the issues we manually patched to cover. We don't need the manual
patch anymore and can switch to the distro hence this revert.
Reviewers should double check that the image build process installs the
expected 2.30.2-1+deb11u1 version.
Change-Id: I02c4746a0f6651dfcd04ea88ccfd7d62e481d490
Co-Authored-By: Clark Boylan <cboylan@sapwetik.org>
This commit is contained in:
parent
09f705d968
commit
c0985cff39
13
Dockerfile
13
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"]
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue