diff options
| author | Ian Wienand <iwienand@redhat.com> | 2022-08-29 13:53:01 +1000 |
|---|---|---|
| committer | Ian Wienand <iwienand@redhat.com> | 2022-09-13 19:40:59 +0000 |
| commit | f5cfb8a900c638e8f4ee07e480fefba137cb8d54 (patch) | |
| tree | f80c3c362498b2f0c7428ba46ee94637eb58b89b /Dockerfile | |
| parent | 6e4067c5536c31fbbc48d57540885bcaf8228723 (diff) | |
| download | zuul-f5cfb8a900c638e8f4ee07e480fefba137cb8d54.tar.gz | |
Revert "Use debian bookworm version of libc-bin"
This reverts commit 559602910ff57f90e6478e748d17e0e298430c73.
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
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/Dockerfile b/Dockerfile index 0c1118ccb..c6cc17651 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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/* |