From 17cbb375aabe6a40c6a9a3b3ef15113dac33e700 Mon Sep 17 00:00:00 2001
From: ShahanaFarooqui <shahana.farooqui@gmail.com>
Date: Wed, 12 Jun 2024 12:31:56 -0700
Subject: [PATCH] Removing cache & platforms for base testing

---
 .github/workflows/docker-release.yml | 15 ++-------------
 Dockerfile                           |  7 +++++++
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
index 62e36e787593..cc54e78223bc 100644
--- a/.github/workflows/docker-release.yml
+++ b/.github/workflows/docker-release.yml
@@ -27,22 +27,11 @@ jobs:
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
 
-    - name: Cache Docker layers
-      uses: actions/cache@v2
-      with:
-        path: /tmp/.buildx-cache
-        key: ${{ runner.os }}-buildx-${{ github.sha }}
-        restore-keys: |
-          ${{ runner.os }}-buildx-
-
     - name: Build and push Docker image
       uses: docker/build-push-action@v5
       with:
         context: .
         push: true
-        platforms: linux/amd64,linux/arm64,linux/arm/v7
+        platforms: linux/arm/v7
         tags: |
-          shahanafarooqui/lightningd:${{ github.event.inputs.version }}
-          shahanafarooqui/lightningd:latest
-        cache-from: type=local,src=/tmp/.buildx-cache
-        cache-to: type=local,dest=/tmp/.buildx-cache
+          elementsproject/lightningd:${{ github.event.inputs.version }}
diff --git a/Dockerfile b/Dockerfile
index f99f24396331..943b7a42f4d1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -194,6 +194,13 @@ RUN ( ! [ -n "${target_host}" ] ) || \
 RUN ( ! [ "${target_host}" = "arm-linux-gnueabihf" ] ) || \
     (sed -i '/documentation = "https:\/\/docs.rs\/cln-grpc"/a include = ["**\/*.*"]' cln-grpc/Cargo.toml)
 
+# Build the configurator binary for each architecture
+# Fix `configurator: Exec format error` on ARM and ARM64 
+WORKDIR /opt/lightningd/ccan/tools/configurator
+COPY ccan/tools/configurator/configurator.c configurator.c
+RUN gcc -o configurator configurator.c
+WORKDIR /opt/lightningd
+
 RUN ./configure --prefix=/tmp/lightning_install --enable-static && \
     make && \
     /root/.local/bin/poetry run make install