From 41d9f68ec3c30ba144a235b317f8f3d41dc08472 Mon Sep 17 00:00:00 2001 From: Steffen Hieber Date: Fri, 6 Aug 2021 12:41:53 +0200 Subject: [PATCH] Dockerfile: install git-lfs from buster-backports. Debian Buster comes with version 2.7.1 of git-lfs which does not support git+ssh yet, therefore we need a newer version of git-lfs for cloning a repository which uses LFS. Signed-off-by: Steffen Hieber Signed-off-by: Jan Kiszka --- Dockerfile | 5 +++-- Dockerfile.isar | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2ec0c40..433fb3e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,8 @@ FROM debian:buster-slim ARG TARGETPLATFORM ARG DEBIAN_FRONTEND=noninteractive -RUN apt-get update && \ +RUN echo 'deb http://deb.debian.org/debian buster-backports main' > /etc/apt/sources.list.d/buster-backports.list && \ + apt-get update && \ apt-get install -y locales && \ localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 ENV LANG=en_US.utf8 @@ -18,7 +19,7 @@ RUN apt-get install --no-install-recommends -y \ python3-setuptools python3-wheel python3-yaml python3-distro python3-jsonschema \ gosu lsb-release file vim less procps tree tar bzip2 zstd bc tmux libncurses-dev \ dosfstools mtools parted \ - git-lfs mercurial iproute2 ssh-client curl rsync gnupg awscli sudo && \ + git-lfs/buster-backports mercurial iproute2 ssh-client curl rsync gnupg awscli sudo && \ if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \ apt-get install --no-install-recommends -y gcc-multilib syslinux; \ fi && \ diff --git a/Dockerfile.isar b/Dockerfile.isar index 62a5f00..95fb81c 100644 --- a/Dockerfile.isar +++ b/Dockerfile.isar @@ -7,8 +7,7 @@ FROM ghcr.io/siemens/kas/kas:$KAS_TAG ARG DEBIAN_FRONTEND=noninteractive ENV LC_ALL=en_US.UTF-8 -RUN echo 'deb http://deb.debian.org/debian buster-backports main' > /etc/apt/sources.list.d/buster-backports.list && \ - echo 'deb http://deb.debian.org/debian bullseye main' > /etc/apt/sources.list.d/bullseye.list && \ +RUN echo 'deb http://deb.debian.org/debian bullseye main' > /etc/apt/sources.list.d/bullseye.list && \ 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 \