From 31ed355911a0fc5e6aa4551274ac864b6e1661ae Mon Sep 17 00:00:00 2001 From: lander86 Date: Wed, 17 Nov 2021 18:26:16 +0100 Subject: [PATCH 1/2] adding JAVA_HOME path Signed-off-by: lander86 --- ci/entrypoint.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ci/entrypoint.sh b/ci/entrypoint.sh index a9461642..d0b62c9e 100755 --- a/ci/entrypoint.sh +++ b/ci/entrypoint.sh @@ -60,5 +60,10 @@ gosu zenbuilder rustc --version # Fix ownership recursively chown -RH zenbuilder:zenbuilder /build +# Set JAVA_HOME +export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 +echo $JAVA_HOME +export PATH=$PATH:$JAVA_HOME/bin + exec gosu zenbuilder /usr/local/bin//entrypoint_setup_gpg.sh "$@" From 42ac49ce83190507e3d11e9a9f266f44bcc21554 Mon Sep 17 00:00:00 2001 From: lander86 Date: Wed, 17 Nov 2021 18:41:33 +0100 Subject: [PATCH 2/2] fix typo in BUILD.md and add java check in docker entrypoint Signed-off-by: lander86 --- BUILD.md | 4 ++-- ci/entrypoint.sh | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/BUILD.md b/BUILD.md index 08eb4e27..a5e2980d 100644 --- a/BUILD.md +++ b/BUILD.md @@ -6,8 +6,8 @@ rustup install 1.51.0 ``` After that, use `cargo`, the standard Rust build tool, to build the library: ```bash -git clone https://github.com/HorizenOfficial/ginger-lib.git -cd ginger-lib +git clone https://github.com/HorizenOfficial/zendoo-sc-cryptolib.git +cd zendoo-sc-cryptolib cargo build --release ``` This library comes with unit tests for each of the provided crates. Run the tests with: diff --git a/ci/entrypoint.sh b/ci/entrypoint.sh index d0b62c9e..6b4f8845 100755 --- a/ci/entrypoint.sh +++ b/ci/entrypoint.sh @@ -64,6 +64,7 @@ chown -RH zenbuilder:zenbuilder /build export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 echo $JAVA_HOME export PATH=$PATH:$JAVA_HOME/bin +java -version exec gosu zenbuilder /usr/local/bin//entrypoint_setup_gpg.sh "$@"