From 85332f2bd4c1b038593f8e956244a05a4f30d3cd Mon Sep 17 00:00:00 2001
From: Shahana Farooqui <shahana.farooqui@gmail.com>
Date: Mon, 31 Jul 2023 06:31:03 -0700
Subject: [PATCH] tools: build release docker script update

tools: build release docker script update
---
 tools/build-release.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tools/build-release.sh b/tools/build-release.sh
index 670ffa251..1dfdad80e 100755
--- a/tools/build-release.sh
+++ b/tools/build-release.sh
@@ -8,7 +8,7 @@ if [ "$1" = "--inside-docker" ]; then
     PLTFM="$3"
     git clone /src /build
     cd /build
-    pip3 install -r plugins/clnrest/requirements.txt
+    pip3 install ./contrib/pyln-client
     ./configure
     make VERSION="$VER"
     make install DESTDIR=/"$VER-$PLTFM" RUST_PROFILE=release
@@ -245,15 +245,17 @@ if [ -z "${TARGETS##* docker *}" ]; then
         git clone --recursive . "${TMPDIR}"
         (
         cd "${TMPDIR}"
-        git checkout "v${BARE_VERSION}"
+        if ! $FORCE_UNCLEAN; then
+            git checkout "v${BARE_VERSION}"
+        fi
         case "$d" in
             "arm32v7")
                 cp "${SRCDIR}/contrib/docker/Dockerfile.$d" "${TMPDIR}/"
-                docker buildx build --load --platform linux/arm64 -t "elementsproject/lightningd:$VERSION-$d" -f Dockerfile.$d "${TMPDIR}"
+                docker buildx build --load --platform linux/arm/v7 -t "elementsproject/lightningd:$VERSION-$d" -f Dockerfile.$d "${TMPDIR}"
                 ;;
             "arm64v8")
                 cp "${SRCDIR}/contrib/docker/Dockerfile.$d" "${TMPDIR}/"
-                docker buildx build --load --platform linux/arm/v7 -t "elementsproject/lightningd:$VERSION-$d" -f Dockerfile.$d "${TMPDIR}"
+                docker buildx build --load --platform linux/arm64 -t "elementsproject/lightningd:$VERSION-$d" -f Dockerfile.$d "${TMPDIR}"
                 ;;
             *)
                 cp "${SRCDIR}/Dockerfile" "${TMPDIR}/"