From 7f5282aa65688e96d3a90f5befa996982c81d913 Mon Sep 17 00:00:00 2001 From: ShahanaFarooqui Date: Thu, 23 May 2024 22:42:55 -0700 Subject: [PATCH] docker: Add missing git dependency for Fedora Dockerfile Fedora image building by build-release.sh currently throws error ` git: command not found`. Fixed it by adding git in the Dockerfile and loading the image in the script. Changelog-None. --- contrib/docker/Dockerfile.builder.fedora | 1 + tools/build-release.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/docker/Dockerfile.builder.fedora b/contrib/docker/Dockerfile.builder.fedora index 2c3b1f55301f..bd4be8ff46ef 100644 --- a/contrib/docker/Dockerfile.builder.fedora +++ b/contrib/docker/Dockerfile.builder.fedora @@ -19,6 +19,7 @@ RUN dnf update -y && \ net-tools \ valgrind \ wget \ + git \ jq \ xz \ zlib-devel && \ diff --git a/tools/build-release.sh b/tools/build-release.sh index 52122858259e..0e37d269716e 100755 --- a/tools/build-release.sh +++ b/tools/build-release.sh @@ -148,7 +148,7 @@ for target in $TARGETS; do echo "Building Fedora Image" DOCKERFILE=contrib/docker/Dockerfile.builder.fedora TAG=fedora - docker build -f $DOCKERFILE -t $TAG . + docker build -f $DOCKERFILE -t $TAG --load . docker run --rm=true -v "$(pwd)":/src:ro -v "$RELEASEDIR":/release $TAG /src/tools/build-release.sh --inside-docker "$VERSION" "$platform" docker run --rm=true -w /build $TAG rm -rf /"$VERSION-$platform" /build echo "Fedora Image Built"