From ef471811f743a43545c1e5cdb314f0b3ed1e2299 Mon Sep 17 00:00:00 2001 From: schaeff Date: Sat, 30 Jun 2018 00:54:28 -0400 Subject: [PATCH] revert dockerfile, fix build options --- Dockerfile | 4 ++-- build.sh | 2 +- zokrates/Cargo.toml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 476639d6..b4927914 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,5 +35,5 @@ WORKDIR /root/ COPY . ZoKrates -#RUN cd ZoKrates \ -# && ./build.sh +RUN cd ZoKrates \ + && ./build.sh diff --git a/build.sh b/build.sh index 1f1cad71..444d6b65 100755 --- a/build.sh +++ b/build.sh @@ -4,7 +4,7 @@ set -e cd zokrates-cli -if [ $WITH_LIBSNARK ]; then +if [ -n "$WITH_LIBSNARK" ]; then cargo build --features libsnark else cargo build diff --git a/zokrates/Cargo.toml b/zokrates/Cargo.toml index 8a4827e2..ea0ae340 100644 --- a/zokrates/Cargo.toml +++ b/zokrates/Cargo.toml @@ -6,7 +6,7 @@ repository = "https://github.com/JacobEberhardt/ZoKrates.git" build = "build.rs" [features] -default = ["libsnark"] +default = [] libsnark = [] [dependencies]