From f6c520690941faa333371844e2e1a7f6c2d247d7 Mon Sep 17 00:00:00 2001
From: kexkey <github@kexkey.com>
Date: Mon, 17 Dec 2018 14:43:01 -0500
Subject: [PATCH] Proxy's dockerfile was buggy with wildcard copy

---
 proxy_docker/Dockerfile.amd64   | 30 ++++--------------------------
 proxy_docker/Dockerfile.arm32v6 | 30 ++++--------------------------
 2 files changed, 8 insertions(+), 52 deletions(-)

diff --git a/proxy_docker/Dockerfile.amd64 b/proxy_docker/Dockerfile.amd64
index 1be299a..4154dc2 100644
--- a/proxy_docker/Dockerfile.amd64
+++ b/proxy_docker/Dockerfile.amd64
@@ -24,34 +24,12 @@ RUN apk add --update --no-cache \
     curl \
     su-exec
 
-COPY app/data/cyphernode.sql ${HOME}
-COPY app/data/sqlmigrate* ${HOME}/
-COPY app/html/statuspage.sh ${HOME}
-COPY app/script/callbacks_job.sh ${HOME}
-COPY app/script/blockchainrpc.sh ${HOME}
-COPY app/script/call_lightningd.sh ${HOME}
-COPY app/script/bitcoin.sh ${HOME}
-COPY app/script/ots.sh ${HOME}
-COPY app/script/requesthandler.sh ${HOME}
-COPY app/script/watchrequest.sh ${HOME}
-COPY app/script/walletoperations.sh ${HOME}
-COPY app/script/confirmation.sh ${HOME}
-COPY app/script/startproxy.sh ${HOME}
-COPY app/script/trace.sh ${HOME}
-COPY app/script/sendtobitcoinnode.sh ${HOME}
-COPY app/script/responsetoclient.sh ${HOME}
-COPY app/script/importaddress.sh ${HOME}
-COPY app/script/sql.sh ${HOME}
-COPY app/script/computefees.sh ${HOME}
-COPY app/script/unwatchrequest.sh ${HOME}
-COPY app/script/getactivewatches.sh ${HOME}
-COPY app/script/manage_missed_conf.sh ${HOME}
-COPY app/script/tests.sh ${HOME}
-COPY app/script/tests-cb.sh ${HOME}
-COPY --from=cyphernode/clightning:v0.6.2 /usr/bin/lightning-cli ${HOME}
-
 WORKDIR ${HOME}
 
+COPY app/data/* ./
+COPY app/script/* /.
+COPY --from=cyphernode/clightning:v0.6.2 /usr/bin/lightning-cli .
+
 RUN chmod +x startproxy.sh requesthandler.sh lightning-cli sqlmigrate*.sh \
  && chmod o+w . \
  && mkdir db
diff --git a/proxy_docker/Dockerfile.arm32v6 b/proxy_docker/Dockerfile.arm32v6
index 0fcd391..dc91d97 100644
--- a/proxy_docker/Dockerfile.arm32v6
+++ b/proxy_docker/Dockerfile.arm32v6
@@ -20,34 +20,12 @@ RUN apk add --update --no-cache \
     curl \
     su-exec
 
-COPY app/data/cyphernode.sql ${HOME}
-COPY app/data/sqlmigrate* ${HOME}/
-COPY app/html/statuspage.sh ${HOME}
-COPY app/script/callbacks_job.sh ${HOME}
-COPY app/script/blockchainrpc.sh ${HOME}
-COPY app/script/call_lightningd.sh ${HOME}
-COPY app/script/bitcoin.sh ${HOME}
-COPY app/script/ots.sh ${HOME}
-COPY app/script/requesthandler.sh ${HOME}
-COPY app/script/watchrequest.sh ${HOME}
-COPY app/script/walletoperations.sh ${HOME}
-COPY app/script/confirmation.sh ${HOME}
-COPY app/script/startproxy.sh ${HOME}
-COPY app/script/trace.sh ${HOME}
-COPY app/script/sendtobitcoinnode.sh ${HOME}
-COPY app/script/responsetoclient.sh ${HOME}
-COPY app/script/importaddress.sh ${HOME}
-COPY app/script/sql.sh ${HOME}
-COPY app/script/computefees.sh ${HOME}
-COPY app/script/unwatchrequest.sh ${HOME}
-COPY app/script/getactivewatches.sh ${HOME}
-COPY app/script/manage_missed_conf.sh ${HOME}
-COPY app/script/tests.sh ${HOME}
-COPY app/script/tests-cb.sh ${HOME}
-COPY --from=cyphernode/clightning:v0.6.2 /usr/bin/lightning-cli ${HOME}
-
 WORKDIR ${HOME}
 
+COPY app/data/* ./
+COPY app/script/* ./
+COPY --from=cyphernode/clightning:v0.6.2 /usr/bin/lightning-cli .
+
 RUN chmod +x startproxy.sh requesthandler.sh lightning-cli sqlmigrate*.sh \
  && chmod o+w . \
  && mkdir db