SiegfriedSiegert/PTU5KAS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Docker: Update to Debian stretch

Browse Source 
Time to move forward, buster is almost in sight. We may break some older
Yocto versions this way, but they can always use older images.

Along this update, this migrates the locale setup towards the
recommendation on https://docs.docker.com/samples/library/debian/#locales.
Furthermore, DEBIAN_FRONTEND=noninteractive is moved to the top-level
Dockerfile - it's generic.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
This commit is contained in:
Jan Kiszka 2018-07-17 21:56:15 +02:00 committed by Daniel Wagner
parent 6f51c33be2
commit 3bada55d30
2 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Dockerfile
View File

@ -1,25 +1,22 @@
# This image builds Yocto 2.1 and 2.2 jobs using the kas tool # This image builds Yocto jobs using the kas tool
FROM debian:jessie-slim FROM debian:stretch-slim
ENV DEBIAN_FRONTEND=noninteractive
ENV LOCALE=en_US.UTF-8
RUN apt-get update && \ RUN apt-get update && \
apt-get install --no-install-recommends -y locales && \ apt-get install -y locales && \
sed -i -e "s/# $LOCALE/$LOCALE/" /etc/locale.gen && \ localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
ln -s /etc/locale.alias /usr/share/locale/locale.alias && \ ENV LANG=en_US.utf8
dpkg-reconfigure --frontend=noninteractive locales && \
apt-get install --no-install-recommends -y \ RUN apt-get install --no-install-recommends -y \
gawk wget git-core diffstat unzip file \ gawk wget git-core diffstat unzip file \
texinfo gcc-multilib build-essential \ texinfo gcc-multilib build-essential \
chrpath socat cpio python python3 rsync \ chrpath socat cpio python python3 rsync \
tar bzip2 curl dosfstools mtools parted \ tar bzip2 curl dosfstools mtools parted \
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 iproute2 && \ vim less mercurial iproute2 xz-utils && \
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/*
@ -34,6 +31,4 @@ ENV NO_PROXY="*"
COPY . /kas COPY . /kas
RUN pip3 --proxy=$https_proxy install /kas RUN pip3 --proxy=$https_proxy install /kas
ENV LANG=$LOCALE
ENTRYPOINT ["/kas/docker-entrypoint"] ENTRYPOINT ["/kas/docker-entrypoint"]

14
Dockerfile.isar
View File

@ -1,17 +1,13 @@
# This image builds Isar jobs using the kas tool
FROM kasproject/kas:latest FROM kasproject/kas:latest
ENV DEBIAN_FRONTEND noninteractive
ENV LC_ALL=en_US.UTF-8 ENV LC_ALL=en_US.UTF-8
RUN echo 'deb http://deb.debian.org/debian jessie-backports main' >> /etc/apt/sources.list.d/backports.list && \ RUN apt-get update && \
apt-get update && \ apt-get install -y -f --no-install-recommends \
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 \ sudo grub2 grub-efi-amd64-bin grub-efi-ia32-bin \
reprepro python3 binfmt-support && \ reprepro python3 binfmt-support e2fsprogs \
apt-get install -y -f --no-install-recommends --target-release jessie-backports \
e2fsprogs && \
apt-get install -y -f --no-install-recommends --target-release stretch \
multistrap qemu-user-static debootstrap && \ multistrap qemu-user-static debootstrap && \
apt-get clean && \ apt-get clean && \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp* rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp*