From 1bd6836a4249210090ed99c4e281374e9e16e138 Mon Sep 17 00:00:00 2001 From: Dominik Dingel Date: Thu, 15 Dec 2016 10:40:33 +0100 Subject: [PATCH] Dockerfile.s390x: Change base to debian jessie With commit ee59f25c2d503cd68262679250387e140171c685 we changed from gcc-go to golang 1.7. By switching to debian we can reduce the base layer from 1.4 GB to around 130 MB. Signed-off-by: Dominik Dingel --- Dockerfile.s390x | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/Dockerfile.s390x b/Dockerfile.s390x index bc49db7d79..78e2df51e1 100644 --- a/Dockerfile.s390x +++ b/Dockerfile.s390x @@ -15,7 +15,7 @@ # the case. Therefore, you don't have to disable it anymore. # -FROM s390x/gcc:6.1 +FROM s390x/debian:jessie # Packaged dependencies RUN apt-get update && apt-get install -y \ @@ -50,15 +50,6 @@ RUN apt-get update && apt-get install -y \ vim-common \ --no-install-recommends -# glibc in Debian has a bug specific to s390x that won't be fixed until Debian 8.6 is released -# - https://github.com/docker/docker/issues/24748 -# - https://sourceware.org/git/?p=glibc.git;a=commit;h=890b7a4b33d482b5c768ab47d70758b80227e9bc -# - https://sourceware.org/git/?p=glibc.git;a=commit;h=2e807f29595eb5b1e5d0decc6e356a3562ecc58e -RUN echo 'deb http://httpredir.debian.org/debian jessie-proposed-updates main' >> /etc/apt/sources.list.d/pu.list \ - && apt-get update \ - && apt-get install -y libc6 \ - && rm -rf /var/lib/apt/lists/* - # Install seccomp: the version shipped in jessie is too old ENV SECCOMP_VERSION 2.3.1 RUN set -x \