Revert "Use debian bookworm version of libc-bin"

This reverts commit 559602910f.

The fix to grantpt() required has been merged into bullseye with
2.31-13+deb11u4.

To minimise our differences to a standard upstream we can revert to
this version of glibc.

[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1015740

Depends-On: https://review.opendev.org/c/opendev/system-config/+/856537
Change-Id: I8580e15d4ea4c65154ba465462e6f38cb4363a5f
This commit is contained in:
Ian Wienand 2022-08-29 13:53:01 +10:00
parent 6e4067c553
commit f5cfb8a900

View File

@ -69,13 +69,7 @@ COPY --from=builder /usr/local/lib/zuul/ /usr/local/lib/zuul
COPY --from=builder /tmp/openshift-install/kubectl /usr/local/bin/kubectl
COPY --from=builder /tmp/openshift-install/oc /usr/local/bin/oc
# We need libc >= 2.33 due to
# https://github.com/ansible/ansible/issues/78270
RUN echo 'APT::Default-Release "stable";' >> /etc/apt/apt.conf.d/99defaultrelease
RUN echo "deb http://deb.debian.org/debian/ bookworm main contrib non-free" > /etc/apt/sources.list.d/testing.list
RUN apt-get update \
&& apt-get -t bookworm install -y libc-bin \
&& apt-get install -y skopeo \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*