diff options
| author | James E. Blair <jim@acmegating.com> | 2023-01-27 07:52:03 -0800 |
|---|---|---|
| committer | James E. Blair <jim@acmegating.com> | 2023-01-30 11:45:27 -0800 |
| commit | c0985cff39e0ec2b9f7252e7d4a29e9979cda99f (patch) | |
| tree | d46f2562486880d5c75e050830c3e9e8fe381498 /Dockerfile | |
| parent | 09f705d968d9ef95fd2ada57fdc2f9976784ffa1 (diff) | |
| download | zuul-c0985cff39e0ec2b9f7252e7d4a29e9979cda99f.tar.gz | |
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 944b9852c9f565ec433a808385d4ed0ad3f0abcc.
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>
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 13 |
1 files changed, 0 insertions, 13 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"] |