Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
  • Loading branch information
jasl committed Dec 10, 2021
1 parent 77d23f2 commit d773ec5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 8 deletions.
3 changes: 1 addition & 2 deletions dockerfile.d/start_node.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/bin/bash

WORK_PATH=$(dirname $(readlink -f "$0"))
DATA_PATH="$HOME/data"

NODE_NAME="${NODE_NAME:-"khala-node"}"
Expand Down Expand Up @@ -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 \
Expand Down
8 changes: 2 additions & 6 deletions node.Dockerfile
Original file line number Diff line number Diff line change
@@ -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'

Expand Down Expand Up @@ -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

Expand All @@ -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"]

0 comments on commit d773ec5

Please sign in to comment.