Docker: Install xz-utils from stretch

The stretch version supports multi-thread compression, allowing to
accelerate e.g. artifact compression tasks. The newer version of xz also
seem to resolve mysterious compression failures that created too short
output images.

As we install the stretch source in the base image now, we can remove
that port from the isar image and align both regarding the setup.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
This commit is contained in:
Jan Kiszka 2018-01-20 15:07:52 +01:00 committed by Daniel Wagner
parent 41dc0bef59
commit 37cd2f42d5
2 changed files with 6 additions and 4 deletions

View File

@ -16,6 +16,10 @@ RUN apt-get update && \
syslinux tree python3-pip bc python3-yaml \ syslinux tree python3-pip bc python3-yaml \
lsb-release python3-setuptools ssh-client \ lsb-release python3-setuptools ssh-client \
vim less mercurial && \ vim less mercurial && \
echo 'deb http://deb.debian.org/debian stretch main' >> /etc/apt/sources.list.d/backports.list && \
apt-get update && \
apt-get install -y -f --no-install-recommends --target-release stretch \
xz-utils && \
apt-get clean && \ apt-get clean && \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

View File

@ -2,11 +2,9 @@ FROM kasproject/kas:latest
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
RUN echo 'deb http://deb.debian.org/debian jessie-backports main' >> /etc/apt/sources.list.d/backports.list && \
echo 'deb http://deb.debian.org/debian stretch main' >> /etc/apt/sources.list.d/backports.list
ENV LC_ALL=en_US.UTF-8 ENV LC_ALL=en_US.UTF-8
RUN apt-get update && \ RUN echo 'deb http://deb.debian.org/debian jessie-backports main' >> /etc/apt/sources.list.d/backports.list && \
apt-get update && \
apt-get install -y -f --no-install-recommends --target-release jessie \ apt-get install -y -f --no-install-recommends --target-release jessie \
autoconf automake gdisk libtool bash-completion \ autoconf automake gdisk libtool bash-completion \
sudo grub2 grub-efi-amd64-bin grub-efi-ia32-bin qemu-user-static \ sudo grub2 grub-efi-amd64-bin grub-efi-ia32-bin qemu-user-static \