diff --git a/README.md b/README.md index 6491ab47f6..43fe846167 100644 --- a/README.md +++ b/README.md @@ -69,6 +69,11 @@ Build $ cargo build --all ``` +Then to run a minimal local cluster +```bash +$ ./run.sh +``` + Testing --- diff --git a/sdk/docker-solana/entrypoint.sh b/run.sh similarity index 89% rename from sdk/docker-solana/entrypoint.sh rename to run.sh index b78b43b061..51036cd400 100755 --- a/sdk/docker-solana/entrypoint.sh +++ b/run.sh @@ -8,7 +8,7 @@ set -e # Prefer possible `cargo build --all` binaries over PATH binaries -PATH=$PWD/target/debug:$PATH +PATH=$PWD/targt/debug:$PATH ok=true for program in solana-{genesis,keygen,fullnode{,-config}}; do @@ -16,7 +16,10 @@ for program in solana-{genesis,keygen,fullnode{,-config}}; do done $ok || { echo - echo "Unable to locate required programs. Try running: cargo build --all" + echo "Unable to locate required programs. Try building them first with:" + echo + echo " $ cargo build --all" + echo exit 1 } diff --git a/sdk/docker-solana/Dockerfile b/sdk/docker-solana/Dockerfile index 9916955b55..1811955003 100644 --- a/sdk/docker-solana/Dockerfile +++ b/sdk/docker-solana/Dockerfile @@ -9,5 +9,5 @@ RUN apt update && \ rm -rf /var/lib/apt/lists/* COPY usr/bin /usr/bin/ -ENTRYPOINT [ "/usr/bin/solana-entrypoint.sh" ] +ENTRYPOINT [ "/usr/bin/solana-run.sh" ] CMD [""] diff --git a/sdk/docker-solana/build.sh b/sdk/docker-solana/build.sh index 6f8adcc7ad..ba444ea3ff 100755 --- a/sdk/docker-solana/build.sh +++ b/sdk/docker-solana/build.sh @@ -14,7 +14,7 @@ rm -rf usr/ ../../ci/docker-run.sh solanalabs/rust:1.31.0 \ scripts/cargo-install-all.sh sdk/docker-solana/usr -cp -f entrypoint.sh usr/bin/solana-entrypoint.sh +cp -f ../../run.sh usr/bin/solana-run.sh docker build -t solanalabs/solana:"$CHANNEL" .