[PATCH v3] Dockerfile: install git-lfs from buster-backports.

Hieber, Steffen

unread,

Aug 6, 2021, 6:41:55 AM8/6/21

to kas-devel

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 <steffen...@siemens.com>

Changes in v3:
- update patch to latest commit from branch next

---
Dockerfile | 5 +++--
Dockerfile.isar | 3 +--
2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ada2b2d..19ef637 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 python3-newt \
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 \
--
2.28.0

Jan Kiszka

unread,

Aug 6, 2021, 6:57:44 AM8/6/21

to Hieber, Steffen, kas-devel

On 06.08.21 12:41, Hieber, Steffen wrote:
> 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 <steffen...@siemens.com>
>
> Changes in v3:
> - update patch to latest commit from branch next
>
> ---

Almost: This separator should come before the section that should not go
into the commit message, thus the changes here.

Applied to next, thanks.

Jan

--
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux

Henning Schild

unread,

Aug 11, 2021, 5:45:10 AM8/11/21

to Hieber, Steffen, kas-devel

In fact we might want to jump straight to debian-bullseye and drop all
the backports. Bullseye will be released in 3 days and i kind of doubt
things in our containers will receive any significant changes until
then. As long as the next kas release will be in 4+ days ... this patch
is nothing but an intermediate step that can maybe be skipped.

Henning

Am Fri, 6 Aug 2021 10:41:53 +0000
schrieb "Hieber, Steffen" <Steffen...@siemens.com>:

> 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 <steffen...@siemens.com>
>
> Changes in v3:
> - update patch to latest commit from branch next
>
> ---
> Dockerfile | 5 +++--
> Dockerfile.isar | 3 +--
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/Dockerfile b/Dockerfile
> index ada2b2d..19ef637 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

> https://eur01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fdeb.debian.org%2Fdebian&data=04%7C01%7Cde173c00-e982-4fda-8644-47edf4671d63%40ad011.siemens.com%7Ce56b691030c24d360da308d958c6cf9c%7C38ae3bcd95794fd4addab42e1495d55a%7C1%7C0%7C637638433177631830%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=in6cZ0EWiPVNo5X8g6lh%2BfkCqPdlfLYqAr7fJJe6HgM%3D&reserved=0

> buster-backports main' >
> /etc/apt/sources.list.d/buster-backports.list && \
> - echo 'deb

> https://eur01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fdeb.debian.org%2Fdebian&data=04%7C01%7Cde173c00-e982-4fda-8644-47edf4671d63%40ad011.siemens.com%7Ce56b691030c24d360da308d958c6cf9c%7C38ae3bcd95794fd4addab42e1495d55a%7C1%7C0%7C637638433177641787%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=538aBzh9DrOKKFAg4O82xa5pbHAVNCvDr%2FpPqbXxzQQ%3D&reserved=0

> bullseye main' > /etc/apt/sources.list.d/bullseye.list && \ +RUN echo
> 'deb

> https://eur01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fdeb.debian.org%2Fdebian&data=04%7C01%7Cde173c00-e982-4fda-8644-47edf4671d63%40ad011.siemens.com%7Ce56b691030c24d360da308d958c6cf9c%7C38ae3bcd95794fd4addab42e1495d55a%7C1%7C0%7C637638433177641787%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=538aBzh9DrOKKFAg4O82xa5pbHAVNCvDr%2FpPqbXxzQQ%3D&reserved=0

Jan Kiszka

unread,

Aug 12, 2021, 1:51:51 AM8/12/21

to Henning Schild, Hieber, Steffen, kas-devel

On 11.08.21 11:45, Henning Schild wrote:
> In fact we might want to jump straight to debian-bullseye and drop all
> the backports. Bullseye will be released in 3 days and i kind of doubt
> things in our containers will receive any significant changes until
> then. As long as the next kas release will be in 4+ days ... this patch
> is nothing but an intermediate step that can maybe be skipped.

My plan is doing a final 2.x release (unless something critical is found
later on) and then move to bullseye via a 3.0 release. That is already
needed because of a pending fix. That should go into a stable release
for users who can't quickly update specifically the compiler via using
bullseye as basis. Pulling simple enhancements like this one into that
version as well is only logical then.

Reply all

Reply to author

Forward