From 5ad74bf8c44b24c133481e5f3beffe76cafc3652 Mon Sep 17 00:00:00 2001 From: matt raffel Date: Wed, 16 Jan 2019 14:50:32 -0700 Subject: [PATCH 1/6] upgrading rust compiler version Signed-off-by: matt raffel --- devops/ext/docker/rust/xenial/Dockerfile.0.8.0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devops/ext/docker/rust/xenial/Dockerfile.0.8.0 b/devops/ext/docker/rust/xenial/Dockerfile.0.8.0 index 3c5208dec..92c85d945 100644 --- a/devops/ext/docker/rust/xenial/Dockerfile.0.8.0 +++ b/devops/ext/docker/rust/xenial/Dockerfile.0.8.0 @@ -3,7 +3,7 @@ FROM evernym/dockerbase:base-xenial-0.5.0 ARG RUST_VERSION -ENV RUST_VERSION=${RUST_VERSION:-1.27.0} +ENV RUST_VERSION=${RUST_VERSION:-1.31.0} ENV RUSTUP_HOME=/usr/local/rustup \ CARGO_HOME=/usr/local/cargo \ PATH=/usr/local/cargo/bin:$PATH From 93099b6ce4542a2bca4888b0331651fc2a2545ad Mon Sep 17 00:00:00 2001 From: matt raffel Date: Thu, 17 Jan 2019 09:18:11 -0700 Subject: [PATCH 2/6] fixes libsodium dl url Signed-off-by: matt raffel --- libsovtoken/dev/ubuntu/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libsovtoken/dev/ubuntu/Dockerfile b/libsovtoken/dev/ubuntu/Dockerfile index a26da5476..e5b5ed19f 100644 --- a/libsovtoken/dev/ubuntu/Dockerfile +++ b/libsovtoken/dev/ubuntu/Dockerfile @@ -11,7 +11,7 @@ RUN apt-get -qq update -y && apt-get -qq install -y sudo zip unzip cmake autocon && useradd -m -d /home/token_user -s /bin/bash -p $(openssl passwd -1 "token") token_user \ && usermod -aG sudo token_user \ && cd /tmp \ - && curl https://download.libsodium.org/libsodium/releases/libsodium-1.0.14.tar.gz | tar -xz \ + && curl https://download.libsodium.org/libsodium/releases/old/libsodium-1.0.14.tar.gz | tar -xz \ && cd libsodium-1.0.14 \ && ./autogen.sh \ && ./configure \ From 88fd8e434a5b1c821a44549b9ea078cc258da3bb Mon Sep 17 00:00:00 2001 From: matt raffel Date: Thu, 17 Jan 2019 09:32:06 -0700 Subject: [PATCH 3/6] updated ci build version Signed-off-by: matt raffel --- devops/docker/ci/xenial/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devops/docker/ci/xenial/Dockerfile b/devops/docker/ci/xenial/Dockerfile index 61394d401..c01a8c6ea 100644 --- a/devops/docker/ci/xenial/Dockerfile +++ b/devops/docker/ci/xenial/Dockerfile @@ -69,4 +69,4 @@ COPY libsovtoken-ci-entrypoint.sh /usr/local/bin/ RUN chmod +x /usr/local/bin/libsovtoken-ci-entrypoint.sh ENTRYPOINT ["libsovtoken-ci-entrypoint.sh"] -ENV LIBSOVTOKEN_CI_ENV_VERSION=0.49.0 \ No newline at end of file +ENV LIBSOVTOKEN_CI_ENV_VERSION=0.50.0 From 03036b4f0ba2ce680e8ff7b1406bfeb2048654ca Mon Sep 17 00:00:00 2001 From: matt raffel Date: Thu, 17 Jan 2019 09:43:58 -0700 Subject: [PATCH 4/6] updating versions of dockerfile deps Signed-off-by: matt raffel --- devops/docker/base/xenial/Dockerfile | 4 ++-- devops/docker/ci/xenial/Dockerfile | 2 +- devops/ext/docker/rust/xenial/Dockerfile.0.9.0 | 18 ++++++++++++++++++ 3 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 devops/ext/docker/rust/xenial/Dockerfile.0.9.0 diff --git a/devops/docker/base/xenial/Dockerfile b/devops/docker/base/xenial/Dockerfile index a93d2db5c..c8d07a377 100644 --- a/devops/docker/base/xenial/Dockerfile +++ b/devops/docker/base/xenial/Dockerfile @@ -1,4 +1,4 @@ -FROM evernym/dockerbase:rust-xenial-0.8.0 +FROM evernym/dockerbase:rust-xenial-0.9.0 # TODO LABEL maintainer="Name " ARG u_id=1000 @@ -47,4 +47,4 @@ RUN cd /tmp/libsovtoken \ # TODO CMD ENTRYPOINT ... -ENV LIBSOVTOKEN_BASE_ENV_VERSION=0.12.0 \ No newline at end of file +ENV LIBSOVTOKEN_BASE_ENV_VERSION=0.13.0 diff --git a/devops/docker/ci/xenial/Dockerfile b/devops/docker/ci/xenial/Dockerfile index c01a8c6ea..94c79180e 100644 --- a/devops/docker/ci/xenial/Dockerfile +++ b/devops/docker/ci/xenial/Dockerfile @@ -1,4 +1,4 @@ -FROM evernym/libsovtoken:base-xenial-0.12.0 +FROM evernym/libsovtoken:base-xenial-0.13.0 # TODO LABEL maintainer="Name " ARG LIBINDY_CRYPTO_VERSION diff --git a/devops/ext/docker/rust/xenial/Dockerfile.0.9.0 b/devops/ext/docker/rust/xenial/Dockerfile.0.9.0 new file mode 100644 index 000000000..80dcf1c27 --- /dev/null +++ b/devops/ext/docker/rust/xenial/Dockerfile.0.9.0 @@ -0,0 +1,18 @@ +FROM evernym/dockerbase:base-xenial-0.5.0 +# TODO LABEL maintainer="Name " + +ARG RUST_VERSION + +ENV RUST_VERSION=${RUST_VERSION:-1.31.0} +ENV RUSTUP_HOME=/usr/local/rustup \ + CARGO_HOME=/usr/local/cargo \ + PATH=/usr/local/cargo/bin:$PATH +RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --no-modify-path --default-toolchain $RUST_VERSION \ + && chmod -R a+w $RUSTUP_HOME $CARGO_HOME \ + && rustup --version \ + && cargo --version \ + && rustc --version + +# TODO CMD ENTRYPOINT ... + +ENV RUST_ENV_VERSION=0.9.0 From 32686e250de05322e21f4442410fb8be2f11cc4f Mon Sep 17 00:00:00 2001 From: matt raffel Date: Fri, 18 Jan 2019 08:50:30 -0700 Subject: [PATCH 5/6] updating for libsodium Signed-off-by: matt raffel --- devops/docker/base/xenial/Dockerfile | 4 ++-- devops/docker/ci/xenial/Dockerfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/devops/docker/base/xenial/Dockerfile b/devops/docker/base/xenial/Dockerfile index c8d07a377..225139956 100644 --- a/devops/docker/base/xenial/Dockerfile +++ b/devops/docker/base/xenial/Dockerfile @@ -13,7 +13,7 @@ ENV LIBSODIUM_INC_DIR=/usr/include # install libsodium from the sources ENV LIBSODIUM_VERSION=1.0.14 RUN cd /tmp \ - && curl https://download.libsodium.org/libsodium/releases/libsodium-${LIBSODIUM_VERSION}.tar.gz | tar -xz \ + && curl https://download.libsodium.org/libsodium/releases/old/libsodium-${LIBSODIUM_VERSION}.tar.gz | tar -xz \ && cd /tmp/libsodium-${LIBSODIUM_VERSION} \ && ./configure --prefix=/usr/local/ && make && make install \ && ldconfig \ @@ -47,4 +47,4 @@ RUN cd /tmp/libsovtoken \ # TODO CMD ENTRYPOINT ... -ENV LIBSOVTOKEN_BASE_ENV_VERSION=0.13.0 +ENV LIBSOVTOKEN_BASE_ENV_VERSION=0.14.0 diff --git a/devops/docker/ci/xenial/Dockerfile b/devops/docker/ci/xenial/Dockerfile index 94c79180e..98c2d7e08 100644 --- a/devops/docker/ci/xenial/Dockerfile +++ b/devops/docker/ci/xenial/Dockerfile @@ -1,4 +1,4 @@ -FROM evernym/libsovtoken:base-xenial-0.13.0 +FROM evernym/libsovtoken:base-xenial-0.14.0 # TODO LABEL maintainer="Name " ARG LIBINDY_CRYPTO_VERSION From 26b092a2a92142cbea6386528bb1a24007110362 Mon Sep 17 00:00:00 2001 From: Matt Raffel Date: Thu, 14 Feb 2019 10:57:02 -0700 Subject: [PATCH 6/6] fixes misspelling Signed-off-by: Matt Raffel --- README.md | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 41677adab..c01810e66 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ # LibSovToken -Adds Sovrin's token functionality to HyperLedger's Indy-SDK. +Adds Sovrin's token functionality to HyperLedger's Indy-SDK. @@ -45,25 +45,25 @@ Adds Sovrin's token functionality to HyperLedger's Indy-SDK. git clone https://github.com/hyperledger/indy-sdk.git cd indy-sdk - git checkout stable + git checkout stable cd libindy - cargo clean + cargo clean cargo update cargo build - + Libsovtoken build needs to know how to find Indy-SDK. This is done through the environment variable LIBINDY_DIR. - + Create an environment variable LIBINDY_DIR. Have it point the directory containing indy-sdk binaries. - + Use `pwd` to get path to current directory - + Add this to your bash profile: - - # EXAMPLE + + # EXAMPLE export LIBINDY_DIR='/my/path/to/indy-sdk/libindy/target/debug/' - + *Note* anytime you get latest for indy-sdk, you must rebuild the libraries before building libsovtoken, as the libsovtoken build does not compile indy-sdk. @@ -78,12 +78,12 @@ Adds Sovrin's token functionality to HyperLedger's Indy-SDK. ### Build the pool - cd devops/indy-pool/ && docker build -t indy_pool . + cd devops/indy-pool/ && docker build -t indy_pool . - + -### run the poool +### run the pool docker run -itd -p 9701-9708:9701-9708 indy_pool @@ -110,4 +110,3 @@ Adds Sovrin's token functionality to HyperLedger's Indy-SDK. ## How To Contribute Please follow the guide [here](./doc/pull-request.md). -