From 1fc0404a91bdb63f360863feb0f2717d2d1ba17e Mon Sep 17 00:00:00 2001
From: HoraceZhang <impressioncr@hotmail.com>
Date: Fri, 18 Oct 2024 09:51:17 +0800
Subject: [PATCH] fix build

---
 Dockerfile | 17 +++--------------
 build.sh   | 13 ++++++++++++-
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index aeb0d2d..8e80402 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,28 +2,17 @@ FROM golang:1.22.4-bullseye as build
 
 WORKDIR /opt/node/
 
-RUN apt-get update && apt-get install -y curl grep ca-certificates
-
-RUN curl -o fetch.sh https://raw.githubusercontent.com/lushdog/quil-docker/refs/heads/main/fetch.sh && chmod +x fetch.sh && ./fetch.sh
-
-RUN chmod +x node
-
 RUN go install github.com/fullstorydev/grpcurl/cmd/grpcurl@v1.9.1
 
-
 FROM ubuntu:22.04
 
 ENV GOEXPERIMENT=arenas
 
-RUN apt-get update && apt-get install -y ca-certificates
+RUN apt-get update && apt-get install -y curl grep ca-certificates
 
-COPY --from=build /opt/node/node /usr/local/bin
-COPY --from=build /opt/node/node.dgst /usr/local/bin
-COPY --from=build /opt/node/node.dgst.sig.* /usr/local/bin
+WORKDIR /opt/node/
 
-COPY --from=build /opt/node/qclient /usr/local/bin
-COPY --from=build /opt/node/qclient.dgst /usr/local/bin
-COPY --from=build /opt/node/qclient.dgst.sig.* /usr/local/bin
+COPY ./node_file/ /usr/local/bin
 
 COPY --from=build /go/bin/grpcurl /usr/local/bin
 
diff --git a/build.sh b/build.sh
index bedc3ca..f68dafe 100644
--- a/build.sh
+++ b/build.sh
@@ -40,8 +40,19 @@ fetchQclient() {
     done
 }
 
+fetch
+fetchQclient
+
+chmod +x node
+chmod +x qclient
+
+rm -rf node_file
 mkdir -p node_file
-mv ./* node_file/
+mv ./node node_file/
+mv ./qclient node_file/
+mv ./node.* node_file/
+mv ./qclient.* node_file/
 
 docker build -f Dockerfile -t trancelife/quilibrium:latest .
 
+docker push trancelife/quilibrium:latest