From 87f48422996fa1a5c6d385631f24e9ef8ab6cc44 Mon Sep 17 00:00:00 2001
From: Colin Lyons <colin@tercet.io>
Date: Sun, 15 Jan 2023 15:55:24 +0000
Subject: [PATCH] cleanup of btcd

---
 docker/btcd/btcd.Dockerfile | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/docker/btcd/btcd.Dockerfile b/docker/btcd/btcd.Dockerfile
index 09d95089..a1939f7d 100644
--- a/docker/btcd/btcd.Dockerfile
+++ b/docker/btcd/btcd.Dockerfile
@@ -19,19 +19,14 @@ WORKDIR $GOPATH/src/${git_repository}
 
 RUN git checkout ${git_tag}
 
-# Source/Target release defaults
-ARG ARCH=amd64
-ARG GOARCH=amd64
-
-ENV GO111MODULE=on GOOS=linux
-
-WORKDIR $GOPATH/src/${git_repository}
-
+# We should bake this into scratch as some point.
 RUN cp sample-btcd.conf /tmp/btcd.conf
 
+ARG ARCH=amd64
+ARG GOARCH=amd64
 RUN set -ex \
-  && CGO_ENABLED=0 go build --ldflags '-w -s' -o /tmp/bin/btcd . \
-  && CGO_ENABLED=0 go build --ldflags '-w -s' -o /tmp/bin/ ./cmd/...
+  && GO111MODULE=on GOOS=linux CGO_ENABLED=0 go build --ldflags '-w -s' -o /tmp/bin/btcd . \
+  && GO111MODULE=on GOOS=linux CGO_ENABLED=0 go build --ldflags '-w -s' -o /tmp/bin/ ./cmd/...
 
 # ---
 # Target Configuration