From ddfca01f16727492351fe8b76b0dc8236b8c1a69 Mon Sep 17 00:00:00 2001
From: kexkey <github@kexkey.com>
Date: Fri, 26 Apr 2019 12:48:42 -0400
Subject: [PATCH] Aligned with c-lightning official docker using usr local

---
 docker-build.sh                 | 4 ++--
 proxy_docker/Dockerfile.amd64   | 2 +-
 proxy_docker/Dockerfile.arm32v6 | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docker-build.sh b/docker-build.sh
index e05fca4..9d3ffc2 100755
--- a/docker-build.sh
+++ b/docker-build.sh
@@ -117,8 +117,8 @@ manifest "gatekeeper" \
 
 [ $? -ne 0 ] && echo "Error" && return 1
 
-image_dockers "clightning" "../dockers/c-lightning v0.7.0" ${arch} "Dockerfile.${arch}" \
-&& image_dockers "bitcoin" "../dockers/bitcoin-core v0.17.1" ${arch} "Dockerfile.${arch}" \
+image_dockers "clightning" "../dockers/c-lightning" "v0.7.0" ${arch} "Dockerfile.${arch}" \
+&& image_dockers "bitcoin" "../dockers/bitcoin-core" "v0.17.1" ${arch} "Dockerfile.${arch}" \
 && image_dockers "app_welcome" "../cyphernode_welcome" "${v3}" ${arch} \
 && image_dockers "app_welcome" "../cyphernode_welcome" "${v2}" ${arch} \
 && image_dockers "app_welcome" "../cyphernode_welcome" "${v1}" ${arch} \
diff --git a/proxy_docker/Dockerfile.amd64 b/proxy_docker/Dockerfile.amd64
index 806a713..e3aa367 100644
--- a/proxy_docker/Dockerfile.amd64
+++ b/proxy_docker/Dockerfile.amd64
@@ -28,7 +28,7 @@ WORKDIR ${HOME}
 
 COPY app/data/* ./
 COPY app/script/* ./
-COPY --from=cyphernode/clightning:v0.7.0 /usr/bin/lightning-cli ./
+COPY --from=cyphernode/clightning:v0.7.0 /usr/local/bin/lightning-cli ./
 
 RUN chmod +x startproxy.sh requesthandler.sh lightning-cli sqlmigrate*.sh waitanyinvoice.sh \
  && chmod o+w . \
diff --git a/proxy_docker/Dockerfile.arm32v6 b/proxy_docker/Dockerfile.arm32v6
index f4a0646..97ca5ec 100644
--- a/proxy_docker/Dockerfile.arm32v6
+++ b/proxy_docker/Dockerfile.arm32v6
@@ -24,7 +24,7 @@ WORKDIR ${HOME}
 
 COPY app/data/* ./
 COPY app/script/* ./
-COPY --from=cyphernode/clightning:v0.7.0 /usr/bin/lightning-cli ./
+COPY --from=cyphernode/clightning:v0.7.0 /usr/local/bin/lightning-cli ./
 
 RUN chmod +x startproxy.sh requesthandler.sh lightning-cli sqlmigrate*.sh waitanyinvoice.sh \
  && chmod o+w . \