Merge pull request #17 from make-software/release-v148

NCTL image updated to casper-node v148

Author: mrkara

README.md

@@ -147,7 +147,7 @@ jobs:
         # Docker Hub image
         image: makesoftware/casper-nctl:latest
         options: --name casper-nctl
-        environment:
+        env:
           PREDEFINED_ACCOUNTS: 'true'
           MINIMUM_ROUND_EXPONENT: '12'
           MAXIMUM_ROUND_EXPONENT: '14'

casper-nctl.Dockerfile

@@ -1,6 +1,6 @@
 FROM ubuntu:focal
 
-ARG GITBRANCH=release-1.4.4
+ARG GITBRANCH=release-1.4.8
 
 # DEBIAN_FRONTEND required for tzdata dependency install
 RUN apt-get update \
@@ -17,7 +17,7 @@ RUN curl -Ls https://github.com/Kitware/CMake/releases/download/v3.17.3/cmake-3.
 
 # install rust nigthly and rustup
 RUN curl -f -L https://static.rust-lang.org/rustup.sh -O \
-    && sh rustup.sh -y --default-toolchain "nightly-2021-12-15"
+    && sh rustup.sh -y 
 ENV PATH="$PATH:/root/.cargo/bin"
 
 # set few environment variables needed for the nctl build scripts
@@ -27,8 +27,10 @@ ENV NCTL_COMPILE_TARGET="release"
 
 # clone the casper-node repos and build binaries
 RUN git clone https://github.com/casper-network/casper-node-launcher.git ~/casper-node-launcher \
-    && cd ~/casper-node-launcher && cargo build --release \
-    && git clone -b $GITBRANCH https://github.com/casper-network/casper-node.git ~/casper-node \
+    && cd ~/casper-node-launcher && cargo build --release
+RUN git clone -b main https://github.com/casper-ecosystem/casper-client-rs ~/casper-client-rs \
+    && cd ~/casper-client-rs && cargo build --release
+RUN git clone -b $GITBRANCH https://github.com/casper-network/casper-node.git ~/casper-node \
     && source ~/casper-node/utils/nctl/sh/assets/compile.sh 
 
 # run clean-build-artifacts.sh to remove intermediate files and keep the image lighter
@@ -59,13 +61,15 @@ WORKDIR /home/casper
 RUN python3 -m pip install toml
 
 COPY --from=0 --chown=casper:casper /root/casper-node-launcher ./casper-node-launcher
+COPY --from=0 --chown=casper:casper /root/casper-client-rs ./casper-client-rs
 COPY --from=0 --chown=casper:casper /root/casper-node ./casper-node
 
 ENV NCTL="/home/casper/casper-node/utils/nctl"
 ENV NCTL_CASPER_HOME="/home/casper/casper-node"
 ENV NCTL_CASPER_NODE_LAUNCHER_HOME="/home/casper/casper-node-launcher"
+ENV NCTL_CASPER_CLIENT_HOME="/home/casper/casper-client-rs"
 RUN echo "source casper-node/utils/nctl/activate" >> .bashrc
-RUN echo "alias casper-client=/home/casper/casper-node/target/release/casper-client" >> .bashrc
+RUN echo "alias casper-client=/home/casper/casper-client-rs/target/release/casper-client" >> .bashrc
 
 COPY --chown=casper:casper ./restart.sh .
 COPY --chown=casper:casper ./net-1-predefined-accounts.tar.gz .

clean-build-artifacts.sh

@@ -10,3 +10,6 @@ rm -r casper-node/target/wasm32-unknown-unknown/release/.fingerprint
 rm -r casper-node-launcher/target/release/build
 rm -r casper-node-launcher/target/release/deps
 rm -r casper-node-launcher/target/release/.fingerprint
+rm -r casper-client-rs/target/release/build
+rm -r casper-client-rs/target/release/deps
+rm -r casper-client-rs/target/release/.fingerprint

docker-compose.yml

@@ -2,19 +2,19 @@ version: '3'
 
 services:
   mynctl:
-    image: makesoftware/casper-nctl
+    image: makesoftware/casper-nctl:latest
     container_name: mynctl
     ports:
       - 11101-11105:11101-11105
       - 14101-14105:14101-14105
       - 18101-18105:18101-18105
-    #environment:
-      #PREDEFINED_ACCOUNTS: 'true'
+    environment:
+      PREDEFINED_ACCOUNTS: 'true'
       #PATH_TO_CONFIG_TOML: '/home/casper/config/config.toml'
       #PATH_TO_CHAINSPEC: '/home/casper/config/chainspec.toml'
       #MINIMUM_ROUND_EXPONENT: '12'
       #MAXIMUM_ROUND_EXPONENT: '14'
-      #DEPLOY_DELAY: '15sec'
+      DEPLOY_DELAY: '5sec'
 
   cors-anywhere:
     container_name: cors-anywhere

hooks/post_push

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+#tag new image as latest
+docker tag $IMAGE_NAME $DOCKER_REPO:latest
+docker push $DOCKER_REPO:latest

restart.sh

@@ -14,7 +14,7 @@ PATH_TO_CONFIG_TOML=${PATH_TO_CONFIG_TOML:-"${NCTL_CASPER_HOME}/resources/local/
 ##
 [[ $DEPLOY_DELAY != "" ]] && sed -E "s/^#?(deploy_delay = ).+$/\1 '$DEPLOY_DELAY'/" $PATH_TO_CONFIG_TOML > $PATH_TO_CONFIG_TOML.mod && PATH_TO_CONFIG_TOML=$PATH_TO_CONFIG_TOML.mod
 
-alias casper-client=/home/casper/casper-node/target/release/casper-client
+alias casper-client=/home/casper/casper-client-rs/target/release/casper-client
 source $NCTL/activate
 source $NCTL/sh/assets/teardown.sh
 source $NCTL/sh/assets/setup.sh config_path=$PATH_TO_CONFIG_TOML chainspec_path=$PATH_TO_CHAINSPEC

test/test_nctl.py

@@ -62,7 +62,7 @@ def test_assets_are_present(host):
 
 def test_casper_client_is_present(host):
 
-    cmd = host.run("/home/casper/casper-node/target/release/casper-client --help")
+    cmd = host.run("/home/casper/casper-client-rs/target/release/casper-client --help")
     assert cmd.rc == 0
 
 def test_rpc_is_responsive(host):