From d773ec54f346f173e45dee6973f422266a762cea Mon Sep 17 00:00:00 2001
From: jasl <jasl9187@hotmail.com>
Date: Fri, 10 Dec 2021 18:55:40 +0800
Subject: [PATCH] Update

---
 dockerfile.d/start_node.sh | 3 +--
 node.Dockerfile            | 8 ++------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/dockerfile.d/start_node.sh b/dockerfile.d/start_node.sh
index c0c3096..565960c 100755
--- a/dockerfile.d/start_node.sh
+++ b/dockerfile.d/start_node.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 
-WORK_PATH=$(dirname $(readlink -f "$0"))
 DATA_PATH="$HOME/data"
 
 NODE_NAME="${NODE_NAME:-"khala-node"}"
@@ -43,7 +42,7 @@ esac
 
 echo "Starting Khala node as role '${NODE_ROLE}' with extra parachain args '${PARACHAIN_EXTRA_ARGS}' extra relaychain args '${RELAYCHAIN_EXTRA_ARGS}'"
 
-$WORK_PATH/khala-node \
+/usr/local/bin/khala-node \
   --chain $PARACHAIN \
   --base-path $DATA_PATH \
   --name $NODE_NAME \
diff --git a/node.Dockerfile b/node.Dockerfile
index fc600f2..f5a78f6 100644
--- a/node.Dockerfile
+++ b/node.Dockerfile
@@ -1,7 +1,7 @@
 FROM ubuntu:20.04 AS builder
 
 ARG DEBIAN_FRONTEND='noninteractive'
-ARG RUST_TOOLCHAIN='nightly-2021-09-01'
+ARG RUST_TOOLCHAIN='nightly-2021-11-11'
 ARG PHALA_GIT_REPO='https://github.com/Phala-Network/khala-parachain.git'
 ARG PHALA_GIT_TAG='master'
 
@@ -33,8 +33,6 @@ WORKDIR /root
 RUN apt-get update && \
     apt-get install -y apt-utils apt-transport-https software-properties-common readline-common curl vim wget gnupg gnupg2 gnupg-agent ca-certificates tini
 
-COPY --from=builder /root/khala-node .
-# Can binary be exposed in the user directory, because it needs permission when starting docker when it is placed in the /root directory, and an error will be reported when starting
 COPY --from=builder /root/khala-node /usr/local/bin/khala-node
 ADD dockerfile.d/start_node.sh ./start_node.sh
 
@@ -54,6 +52,4 @@ EXPOSE 9945
 EXPOSE 30333
 EXPOSE 30334
 
-ENTRYPOINT ["/usr/bin/tini", "--"]
-
-CMD ["/bin/bash", "./start_node.sh"]
+ENTRYPOINT ["/usr/local/bin/khala-node"]