From 20fea377359e2392fc3d38c31b5a77fdd4d83ef6 Mon Sep 17 00:00:00 2001 From: tersec Date: Fri, 15 Sep 2023 10:45:49 +0000 Subject: [PATCH] update Docker base images to include `git-lfs` (#5430) * update Docker base images to include git-lfs * add copyright years --- docker/dist/base_image/Dockerfile.amd64 | 9 ++++++++- docker/dist/base_image/Dockerfile.arm | 9 ++++++++- docker/dist/base_image/Dockerfile.arm64 | 9 ++++++++- docker/dist/base_image/Dockerfile.macos | 9 ++++++++- docker/dist/base_image/Dockerfile.win64 | 9 ++++++++- 5 files changed, 40 insertions(+), 5 deletions(-) diff --git a/docker/dist/base_image/Dockerfile.amd64 b/docker/dist/base_image/Dockerfile.amd64 index e12dae778..2696142e4 100644 --- a/docker/dist/base_image/Dockerfile.amd64 +++ b/docker/dist/base_image/Dockerfile.amd64 @@ -1,3 +1,10 @@ +# beacon_chain +# Copyright (c) 2021-2023 Status Research & Development GmbH +# Licensed and distributed under either of +# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT). +# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0). +# at your option. This file may not be copied, modified, or distributed except according to those terms. + # This Docker image can change from one build to another, because the upstream # Debian/Ubuntu package index is continuously updated and we have to run # `apt-get update` in here. @@ -12,7 +19,7 @@ SHELL ["/bin/bash", "-c"] ENV DEBIAN_FRONTEND=noninteractive TZ="Etc/UTC" RUN apt-get -qq update \ - && apt-get -qq -y install build-essential git &>/dev/null \ + && apt-get -qq -y install build-essential git-lfs &>/dev/null \ && apt-get -qq clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* diff --git a/docker/dist/base_image/Dockerfile.arm b/docker/dist/base_image/Dockerfile.arm index 16721d408..e060e77f1 100644 --- a/docker/dist/base_image/Dockerfile.arm +++ b/docker/dist/base_image/Dockerfile.arm @@ -1,3 +1,10 @@ +# beacon_chain +# Copyright (c) 2021-2023 Status Research & Development GmbH +# Licensed and distributed under either of +# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT). +# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0). +# at your option. This file may not be copied, modified, or distributed except according to those terms. + # This Docker image can change from one build to another, because the upstream # Debian/Ubuntu package index is continuously updated and we have to run # `apt-get update` in here. @@ -12,7 +19,7 @@ SHELL ["/bin/bash", "-c"] ENV DEBIAN_FRONTEND=noninteractive TZ="Etc/UTC" RUN apt-get -qq update \ - && apt-get -qq -y install build-essential git \ + && apt-get -qq -y install build-essential git-lfs \ libc6-armhf-armel-cross libc6-dev-armel-armhf-cross binutils-arm-linux-gnueabihf gcc-arm-linux-gnueabihf &>/dev/null \ && apt-get -qq clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* diff --git a/docker/dist/base_image/Dockerfile.arm64 b/docker/dist/base_image/Dockerfile.arm64 index 47981e77b..b92c318d4 100644 --- a/docker/dist/base_image/Dockerfile.arm64 +++ b/docker/dist/base_image/Dockerfile.arm64 @@ -1,3 +1,10 @@ +# beacon_chain +# Copyright (c) 2021-2023 Status Research & Development GmbH +# Licensed and distributed under either of +# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT). +# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0). +# at your option. This file may not be copied, modified, or distributed except according to those terms. + # This Docker image can change from one build to another, because the upstream # Debian/Ubuntu package index is continuously updated and we have to run # `apt-get update` in here. @@ -14,7 +21,7 @@ SHELL ["/bin/bash", "-c"] ENV DEBIAN_FRONTEND=noninteractive TZ="Etc/UTC" RUN apt-get -qq update \ - && apt-get -qq -y install build-essential git \ + && apt-get -qq -y install build-essential git-lfs \ binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu &>/dev/null \ && apt-get -qq clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* diff --git a/docker/dist/base_image/Dockerfile.macos b/docker/dist/base_image/Dockerfile.macos index 8b606a547..5a195faa6 100644 --- a/docker/dist/base_image/Dockerfile.macos +++ b/docker/dist/base_image/Dockerfile.macos @@ -1,3 +1,10 @@ +# beacon_chain +# Copyright (c) 2021-2023 Status Research & Development GmbH +# Licensed and distributed under either of +# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT). +# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0). +# at your option. This file may not be copied, modified, or distributed except according to those terms. + # This Docker image can change from one build to another, because the upstream # Debian/Ubuntu package index is continuously updated and we have to run # `apt-get update` in here. @@ -12,7 +19,7 @@ SHELL ["/bin/bash", "-c"] ENV DEBIAN_FRONTEND=noninteractive TZ="Etc/UTC" RUN apt-get -qq update \ - && apt-get -qq -y install build-essential git clang-11 llvm-11-dev cmake curl libssl-dev lzma-dev libxml2-dev &>/dev/null \ + && apt-get -qq -y install build-essential git-lfs clang-11 llvm-11-dev cmake curl libssl-dev lzma-dev libxml2-dev &>/dev/null \ && update-alternatives --install /usr/bin/clang clang /usr/bin/clang-11 100 \ && update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-11 100 \ && apt-get -qq clean \ diff --git a/docker/dist/base_image/Dockerfile.win64 b/docker/dist/base_image/Dockerfile.win64 index eb0b829d4..1ffdd22df 100644 --- a/docker/dist/base_image/Dockerfile.win64 +++ b/docker/dist/base_image/Dockerfile.win64 @@ -1,3 +1,10 @@ +# beacon_chain +# Copyright (c) 2021-2023 Status Research & Development GmbH +# Licensed and distributed under either of +# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT). +# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0). +# at your option. This file may not be copied, modified, or distributed except according to those terms. + # This Docker image can change from one build to another, because the upstream # Debian/Ubuntu package index is continuously updated and we have to run # `apt-get update` in here. @@ -13,7 +20,7 @@ SHELL ["/bin/bash", "-c"] ENV DEBIAN_FRONTEND=noninteractive TZ="Etc/UTC" RUN \ apt-get -qq update \ - && apt-get -qq -y install git gnupg software-properties-common lsb cmake &>/dev/null \ + && apt-get -qq -y install git-lfs gnupg software-properties-common lsb cmake &>/dev/null \ && apt-get -qq -y install \ autoconf \ automake \