From a9b3f0e897f8dcdfd0e4e594d93e299b1849605b Mon Sep 17 00:00:00 2001 From: Kirill Fedoseev Date: Wed, 4 Sep 2019 17:24:39 +0300 Subject: [PATCH 1/3] Change build tss process to use Cargo.lock file --- src/tss/Dockerfile-local | 5 +++-- src/tss/multi-party-ecdsa | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/tss/Dockerfile-local b/src/tss/Dockerfile-local index 632aadf..909a9b8 100644 --- a/src/tss/Dockerfile-local +++ b/src/tss/Dockerfile-local @@ -10,12 +10,13 @@ ENV PATH=/root/.cargo/bin:$PATH WORKDIR /tss COPY ./multi-party-ecdsa/Cargo.toml /tss/ +COPY ./multi-party-ecdsa/Cargo.lock /tss/ COPY ./multi-party-ecdsa/src/lib.rs /tss/src/lib.rs -RUN cargo build --release || true +RUN cargo build --locked --release || true COPY ./multi-party-ecdsa /tss/ -RUN cargo build --release +RUN cargo build --locked --release CMD echo Done diff --git a/src/tss/multi-party-ecdsa b/src/tss/multi-party-ecdsa index 1b71aae..8f44762 160000 --- a/src/tss/multi-party-ecdsa +++ b/src/tss/multi-party-ecdsa @@ -1 +1 @@ -Subproject commit 1b71aae16f2c8c497f8d10067efcf522e6ad575b +Subproject commit 8f4476240ffcd7b651177c6f3d9849e6ef48f6a0 From beadb5047ee383e1ef5b02db85edd8cb03960611 Mon Sep 17 00:00:00 2001 From: Kirill Fedoseev Date: Fri, 6 Sep 2019 21:30:55 +0300 Subject: [PATCH 2/3] Update submodule --- src/tss/multi-party-ecdsa | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tss/multi-party-ecdsa b/src/tss/multi-party-ecdsa index 8f44762..73a6db9 160000 --- a/src/tss/multi-party-ecdsa +++ b/src/tss/multi-party-ecdsa @@ -1 +1 @@ -Subproject commit 8f4476240ffcd7b651177c6f3d9849e6ef48f6a0 +Subproject commit 73a6db93f4805b27f5c0f2b2c139869e8cecf581 From 39d341a33bdde46b6bc7736cbc368cd4db3508b6 Mon Sep 17 00:00:00 2001 From: Kirill Fedoseev Date: Tue, 17 Sep 2019 18:44:15 +0300 Subject: [PATCH 3/3] Added docker mount points for contracts compilation --- demo/start-environment.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/demo/start-environment.sh b/demo/start-environment.sh index 795dc0b..ab562ac 100755 --- a/demo/start-environment.sh +++ b/demo/start-environment.sh @@ -32,7 +32,7 @@ deploy_all() { echo "Building deploy docker image" docker build -t deploy_test . > /dev/null 2>&1 echo "Deploying" - docker run --network blockchain_home --rm --env-file .env deploy_test --network development --reset > /dev/null 2>&1 + docker run --network blockchain_home --rm -v "$(pwd)/build:/build/build" --env-file .env deploy_test --network development --reset > /dev/null 2>&1 @@ -43,7 +43,7 @@ deploy_all() { echo "Building deploy docker image" docker build -t deploy_home . > /dev/null 2>&1 echo "Deploying" - docker run --network blockchain_home --rm --env-file .env deploy_home --network development --reset > /dev/null 2>&1 + docker run --network blockchain_home --rm -v "$(pwd)/build:/build/build" --env-file .env deploy_home --network development --reset > /dev/null 2>&1 @@ -54,7 +54,7 @@ deploy_all() { echo "Building deploy docker image" docker build -t deploy_side . > /dev/null 2>&1 echo "Deploying" - docker run --network blockchain_side --rm --env-file .env deploy_side --network development --reset > /dev/null 2>&1 + docker run --network blockchain_side --rm -v "$(pwd)/build:/build/build" --env-file .env deploy_side --network development --reset > /dev/null 2>&1 }