Browse code

Dockerfile.s390x: Update glibc to proposed-updates 2.19-18+deb8u5

The glibc of Debian Jessie contains the following two bugs:

https://sourceware.org/git/?p=glibc.git;a=commit;h=890b7a4b33d482b5c768ab47d70758b80227e9bc
https://sourceware.org/git/?p=glibc.git;a=commit;h=2e807f29595eb5b1e5d0decc6e356a3562ecc58e

The CI tests hang because the bugs affect the gccgo runtime of the
s390x/gcc images.

Now the fixes have been integrated to glibc 2.19-18+deb8u5 in
"proposed-updates" for Debian Jessie:

https://anonscm.debian.org/cgit/pkg-glibc/glibc.git/log/?h=jessie
https://release.debian.org/proposed-updates/stable.html

It is expected that the package should be part of the next stable point
release (8.6) in about one to two months from now.

In order to enable CI for s390x earlier, we now explicitely update
the glibc in Dockerfile.s390x to the proposed-updates version.

After Debian 8.6 is released we can remove this change again.

Closes #24748

Suggested-by: Tianon Gravi <admwiggin@gmail.com>
Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>

Michael Holzheu authored on 2016/07/20 22:35:41
Showing 1 changed files
... ...
@@ -48,6 +48,15 @@ RUN apt-get update && apt-get install -y \
48 48
 	tar \
49 49
 	--no-install-recommends
50 50
 
51
+# glibc in Debian has a bug specific to s390x that won't be fixed until Debian 8.6 is released
52
+# - https://github.com/docker/docker/issues/24748
53
+# - https://sourceware.org/git/?p=glibc.git;a=commit;h=890b7a4b33d482b5c768ab47d70758b80227e9bc
54
+# - https://sourceware.org/git/?p=glibc.git;a=commit;h=2e807f29595eb5b1e5d0decc6e356a3562ecc58e
55
+RUN echo 'deb http://httpredir.debian.org/debian jessie-proposed-updates main' >> /etc/apt/sources.list.d/pu.list \
56
+	&& apt-get update \
57
+	&& apt-get install -y libc6 \
58
+	&& rm -rf /var/lib/apt/lists/*
59
+
51 60
 # install seccomp: the version shipped in jessie is too old
52 61
 ENV SECCOMP_VERSION 2.3.1
53 62
 RUN set -x \