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

Dockerfile: base containers on bullseye

Browse Source 
Currently the containers are based on buster, but use buster-backports,
and (in case if the Isar container) even plain bullseye with pinning as
additional deb soure.
This changes that to use bullseye only.

Signed-off-by: Adriaan Schmidt <adriaan.schmidt@siemens.com>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
This commit is contained in:
Adriaan Schmidt
2021-11-17 07:25:02 +01:00
committed by Jan Kiszka
parent 75d1a5cce4
commit 41dbef918a
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Dockerfile
View File

@@ -1,12 +1,11 @@
# This image builds Yocto jobs using the kas tool # This image builds Yocto jobs using the kas tool
FROM debian:buster-slim FROM debian:bullseye-slim
ARG TARGETPLATFORM ARG TARGETPLATFORM
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
RUN echo 'deb http://deb.debian.org/debian buster-backports main' > /etc/apt/sources.list.d/buster-backports.list && \ RUN apt-get update && \
apt-get update && \
apt-get install -y locales && \ apt-get install -y locales && \
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
ENV LANG=en_US.utf8 ENV LANG=en_US.utf8
@@ -19,7 +18,7 @@ RUN apt-get install --no-install-recommends -y \
python3-setuptools python3-wheel python3-yaml python3-distro python3-jsonschema python3-newt \ python3-setuptools python3-wheel python3-yaml python3-distro python3-jsonschema python3-newt \
gosu lsb-release file vim less procps tree tar bzip2 zstd bc tmux libncurses-dev \ gosu lsb-release file vim less procps tree tar bzip2 zstd bc tmux libncurses-dev \
dosfstools mtools parted lz4 \ dosfstools mtools parted lz4 \
git-lfs/buster-backports mercurial iproute2 ssh-client curl rsync gnupg awscli sudo && \ git-lfs mercurial iproute2 ssh-client curl rsync gnupg awscli sudo && \
if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \ if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \
apt-get install --no-install-recommends -y gcc-multilib g++-multilib syslinux; \ apt-get install --no-install-recommends -y gcc-multilib g++-multilib syslinux; \
fi && \ fi && \

6
Dockerfile.isar
View File

@@ -7,14 +7,12 @@ FROM ghcr.io/siemens/kas/kas:$KAS_TAG
ARG DEBIAN_FRONTEND=noninteractive ARG 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 bullseye main' > /etc/apt/sources.list.d/bullseye.list && \ RUN apt-get update && \
echo "Package: skopeo golang-github-containers-common golang-github-containers-image\nPin: release n=bullseye\nPin-Priority: 501\n\nPackage: *\nPin: release n=bullseye\nPin-Priority: -1" > /etc/apt/preferences.d/skopeo && \
apt-get update && \
apt-get install -y -f --no-install-recommends \ apt-get install -y -f --no-install-recommends \
autoconf automake gdisk libtool bash-completion \ autoconf automake gdisk libtool bash-completion \
reprepro python3 binfmt-support e2fsprogs \ reprepro python3 binfmt-support e2fsprogs \
umoci skopeo \ umoci skopeo \
multistrap qemu-user-static/buster-backports debootstrap quilt && \ multistrap qemu-user-static debootstrap quilt && \
apt-get clean && \ apt-get clean && \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*