From 8c87003230c773016cbd4b6c41967e4a257a7847 Mon Sep 17 00:00:00 2001 From: "artem.ivanov" Date: Wed, 5 Jun 2019 10:18:56 +0300 Subject: [PATCH 1/5] use AUTH_RULES command for Libsovtoken tests Signed-off-by: artem.ivanov --- devops/docker/ci/xenial/Dockerfile | 6 +- devops/indy-pool/Dockerfile | 8 +-- libsovtoken/tests/utils/payment/fees.rs | 76 ++++++++++--------------- 3 files changed, 36 insertions(+), 54 deletions(-) diff --git a/devops/docker/ci/xenial/Dockerfile b/devops/docker/ci/xenial/Dockerfile index 1f30fbe75..e9e249f97 100644 --- a/devops/docker/ci/xenial/Dockerfile +++ b/devops/docker/ci/xenial/Dockerfile @@ -36,9 +36,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ # or python3-rocksdb are not specified here) ENV LIBINDY_CRYPTO_VERSION ${LIBINDY_CRYPTO_VERSION:-0.4.5} ENV PYTHON3_INDY_CRYPTO_VERSION ${PYTHON3_INDY_CRYPTO_VERSION:-0.4.5} -ENV INDY_PLENUM_VERSION ${INDY_PLENUM_VERSION:-1.8.0~dev802} +ENV INDY_PLENUM_VERSION ${INDY_PLENUM_VERSION:-1.8.0~dev808} ENV INDY_ANONCREDS_VERSION ${INDY_ANONCREDS_VERSION:-1.0.32} -ENV INDY_NODE_VERSION ${INDY_NODE_VERSION:-1.8.0~dev943} +ENV INDY_NODE_VERSION ${INDY_NODE_VERSION:-1.8.0~dev987} ENV TOKEN_VER ${TOKEN_VER:-0.9.6~33} RUN echo "deb https://repo.sovrin.org/sdk/deb xenial master" >> /etc/apt/sources.list RUN echo "deb https://repo.sovrin.org/deb xenial master" >> /etc/apt/sources.list \ @@ -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.58.0 +ENV LIBSOVTOKEN_CI_ENV_VERSION=0.59.0 diff --git a/devops/indy-pool/Dockerfile b/devops/indy-pool/Dockerfile index 6405d86dd..f0b720d64 100644 --- a/devops/indy-pool/Dockerfile +++ b/devops/indy-pool/Dockerfile @@ -22,13 +22,13 @@ ARG uid=1000 ARG indy_stream=master -ARG indy_plenum_ver=1.8.0~dev802 -ARG indy_node_ver=1.8.0~dev943 +ARG indy_plenum_ver=1.9.0~dev808 +ARG indy_node_ver=1.9.0~dev987 ARG indy_anoncreds_ver=1.0.32 ARG python3_indy_crypto_ver=0.4.5 ARG indy_crypto_ver=0.4.5 -ARG token_ver=0.9.6~33 -ARG fees_ver=0.9.6~33 +ARG token_ver=0.9.6~36 +ARG fees_ver=0.9.6~36 # Install environment RUN apt-get update -y && apt-get install -y \ diff --git a/libsovtoken/tests/utils/payment/fees.rs b/libsovtoken/tests/utils/payment/fees.rs index c91f88599..bc3abc34a 100644 --- a/libsovtoken/tests/utils/payment/fees.rs +++ b/libsovtoken/tests/utils/payment/fees.rs @@ -42,16 +42,22 @@ pub struct GetAuthRuleResult { /** Enum of the constraint type within the GAT_AUTH_RULE result data # parameters - ROLE - The final constraint - Combination - Combine multiple constraints all of them must be met - Empty - action is forbidden + Role - The final constraint + And - Combine multiple constraints all of them must be met + Or - Combine multiple constraints any of them must be met + Forbidden - action is forbidden */ #[derive(Serialize, Deserialize, Debug, Clone)] -#[serde(untagged)] +#[serde(tag = "constraint_id")] pub enum Constraint { - CombinationConstraint(CombinationConstraint), + #[serde(rename = "OR")] + OrConstraint(CombinationConstraint), + #[serde(rename = "AND")] + AndConstraint(CombinationConstraint), + #[serde(rename = "ROLE")] RoleConstraint(RoleConstraint), - EmptyConstraint(EmptyConstraint), + #[serde(rename = "FORBIDDEN")] + ForbiddenConstraint(ForbiddenConstraint), } /** @@ -64,7 +70,6 @@ pub enum Constraint { */ #[derive(Serialize, Deserialize, Debug, Clone)] pub struct RoleConstraint { - pub constraint_id: String, pub sig_count: Option, pub role: Option, #[serde(skip_serializing_if = "Option::is_none")] @@ -78,7 +83,7 @@ pub struct RoleConstraint { */ #[derive(Serialize, Deserialize, Debug, Clone)] #[serde(deny_unknown_fields)] -pub struct EmptyConstraint {} +pub struct ForbiddenConstraint {} /** The constraint metadata @@ -97,7 +102,6 @@ pub struct Metadata { */ #[derive(Serialize, Deserialize, Debug, Clone)] pub struct CombinationConstraint { - pub constraint_id: String, pub auth_constraints: Vec } @@ -139,49 +143,27 @@ pub fn set_auth_rules_fee(pool_handle: i32, wallet_handle: i32, submitter_did: & let fees: HashMap = ::serde_json::from_str(txn_fees).unwrap(); - let mut responses: Vec>> = Vec::new(); + let mut auth_rules: Vec = auth_rules.clone(); - for (txn_, fee_alias) in fees { - for auth_rule in auth_rules.iter() { - if auth_rule.auth_type == txn_ { - let mut constraint = auth_rule.constraint.clone(); - _set_fee_to_constraint(&mut constraint, &fee_alias); - - match constraint { - Constraint::EmptyConstraint(_) => {} - mut constraint @ _ => { - responses.push(_send_auth_rule(pool_handle, wallet_handle, submitter_did, auth_rule, &constraint)); - } - } + auth_rules + .iter_mut() + .for_each(|auth_rule| { + if let Some(fee_alias) = fees.get(&auth_rule.auth_type) { + _set_fee_to_constraint(&mut auth_rule.constraint, &fee_alias); } - } - } + }); - let _response = responses - .into_iter() - .map(|response| _check_auth_rule_responses(response)) - .collect::>(); + _send_auth_rules(pool_handle, wallet_handle, submitter_did, &auth_rules) } -fn _send_auth_rule(pool_handle: i32, wallet_handle: i32, submitter_did: &str, - auth_rule: &AuthRule, constraint: &Constraint) -> Box> { - let constraint_json = ::serde_json::to_string(&constraint).unwrap(); - - let auth_rule_request = ::indy::ledger::build_auth_rule_request(submitter_did, - &auth_rule.auth_type, - &auth_rule.auth_action, - &auth_rule.field, - auth_rule.old_value.as_ref().map(String::as_str), - auth_rule.new_value.as_ref().map(String::as_str), - &constraint_json, - ).wait().unwrap(); +fn _send_auth_rules(pool_handle: i32, wallet_handle: i32, submitter_did: &str, data: &Vec) { + let data = ::serde_json::to_string(&data).unwrap(); - ::indy::ledger::sign_and_submit_request(pool_handle, wallet_handle, submitter_did, &auth_rule_request) -} + let auth_rules_request = ::indy::ledger::libindy_build_auth_rules_request(submitter_did, &data).wait().unwrap(); + + let auth_rules_response = ::indy::ledger::sign_and_submit_request(pool_handle, wallet_handle, submitter_did, &auth_rules_request).wait().unwrap(); -fn _check_auth_rule_responses(response: Box>) { - let response = response.wait().unwrap(); - let response: serde_json::Value = ::serde_json::from_str(&response).unwrap(); + let response: serde_json::Value = ::serde_json::from_str(&auth_rules_response).unwrap(); assert_eq!("REPLY", response["op"].as_str().unwrap()); } @@ -208,12 +190,12 @@ fn _set_fee_to_constraint(constraint: &mut Constraint, fee_alias: &str) { Constraint::RoleConstraint(constraint) => { constraint.metadata.as_mut().map(|meta| meta.fees = Some(fee_alias.to_string())); } - Constraint::CombinationConstraint(constraint) => { + Constraint::AndConstraint(constraint) | Constraint::OrConstraint(constraint) => { for mut constraint in constraint.auth_constraints.iter_mut() { _set_fee_to_constraint(&mut constraint, fee_alias) } } - Constraint::EmptyConstraint(_) => {} + Constraint::ForbiddenConstraint(_) => {} } } From f0c98ee7ce91cbc7f1633fbd26e0eb4ba24b33b7 Mon Sep 17 00:00:00 2001 From: "artem.ivanov" Date: Wed, 5 Jun 2019 18:15:09 +0300 Subject: [PATCH 2/5] Updated Libindy version Signed-off-by: artem.ivanov --- devops/Makefile | 2 +- devops/aws-codebuild/Jenkinsfile.cd | 4 ++-- devops/aws-codebuild/Jenkinsfile.ci | 4 ++-- devops/docker/base/xenial/Dockerfile | 6 +++--- devops/docker/ci/xenial/Dockerfile | 2 +- libsovtoken/Cargo.toml | 4 ++-- libsovtoken/tests/utils/payment/fees.rs | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/devops/Makefile b/devops/Makefile index 29bd7858d..86a91752b 100644 --- a/devops/Makefile +++ b/devops/Makefile @@ -45,7 +45,7 @@ FPM_P_VENDOR := Sovrin FPM_P_DESCRIPTION := libsovtoken written in Rust FPM_P_NAME = $(PACKAGE_NAME) FPM_P_VERSION ?= $(SRC_VERSION) -FPM_P_DEPENDS = libindy(>=1.9.0~75) +FPM_P_DEPENDS = libindy(>=1.9.0~1125) FPM_P_OUTPUT_DIR = $(LIB_TARGET_DIR) FPM_ARGS = $(LIB_DYNAMIC)=/usr/lib/ diff --git a/devops/aws-codebuild/Jenkinsfile.cd b/devops/aws-codebuild/Jenkinsfile.cd index e84eae49d..b0795e664 100644 --- a/devops/aws-codebuild/Jenkinsfile.cd +++ b/devops/aws-codebuild/Jenkinsfile.cd @@ -15,8 +15,8 @@ String srcVersion gitHubUserCredId = env.GITHUB_BOT_USER ?: 'sovbot-github' sovrinPackagingRepo = env.SOVRIN_PACKAGING_REPO ?: 'https://github.com/sovrin-foundation/sovrin-packaging' sovrinPackagingBranch = env.SOVRIN_PACKAGING_BRANCH ?: 'master' -LIBINDY_STREAM = "rc" -LIBINDY_VERSION = "1.9.0-75" +LIBINDY_STREAM = "master" +LIBINDY_VERSION = "1.9.0-1125" def downloadPackagingUtils() { git branch: sovrinPackagingBranch, credentialsId: gitHubUserCredId, url: sovrinPackagingRepo diff --git a/devops/aws-codebuild/Jenkinsfile.ci b/devops/aws-codebuild/Jenkinsfile.ci index e59ececd8..1bf1bfe33 100644 --- a/devops/aws-codebuild/Jenkinsfile.ci +++ b/devops/aws-codebuild/Jenkinsfile.ci @@ -7,8 +7,8 @@ def sovLibrary = library(identifier: 'sovrin-aws-codebuild@master', retriever: m logger = sovLibrary.Logger.new(this) notifier = sovLibrary.Notifier.new(this) logger.setGlobalLevel('TRACE') -LIBINDY_STREAM = "rc" -LIBINDY_VERSION = "1.9.0-75" +LIBINDY_STREAM = "master" +LIBINDY_VERSION = "1.9.0-1125" def nodeLabels = [ codeBuild: env.LIBSOVTOKEN_CODEBUILD_NODE_LABEL ?: 'codebuild', diff --git a/devops/docker/base/xenial/Dockerfile b/devops/docker/base/xenial/Dockerfile index ca81f21dd..2c70b22d2 100644 --- a/devops/docker/base/xenial/Dockerfile +++ b/devops/docker/base/xenial/Dockerfile @@ -21,9 +21,9 @@ RUN cd /tmp \ # need for libsodium to be reachable via pkg-config (sodiumoxide uses it) ENV PKG_CONFIG_PATH /usr/local/lib/pkgconfig:$PKG_CONFIG_PATH # TODO ??? is it really needed -ENV LIBINDY_VERSION=1.9.0~75 +ENV LIBINDY_VERSION=1.9.0~1125 RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 68DB5E88 \ - && echo "deb https://repo.sovrin.org/sdk/deb xenial rc" >> /etc/apt/sources.list \ + && echo "deb https://repo.sovrin.org/sdk/deb xenial master" >> /etc/apt/sources.list \ && apt-get update && apt-get install -y --no-install-recommends \ libssl-dev \ libindy=${LIBINDY_VERSION} \ @@ -47,4 +47,4 @@ RUN cd /tmp/libsovtoken \ # TODO CMD ENTRYPOINT ... -ENV LIBSOVTOKEN_BASE_ENV_VERSION=0.23.0 +ENV LIBSOVTOKEN_BASE_ENV_VERSION=0.24.0 diff --git a/devops/docker/ci/xenial/Dockerfile b/devops/docker/ci/xenial/Dockerfile index e9e249f97..0fb6b1f34 100644 --- a/devops/docker/ci/xenial/Dockerfile +++ b/devops/docker/ci/xenial/Dockerfile @@ -1,4 +1,4 @@ -FROM sovrin/libsovtoken:base-xenial-0.23.0 +FROM sovrin/libsovtoken:base-xenial-0.24.0 # TODO LABEL maintainer="Name " ARG LIBINDY_CRYPTO_VERSION diff --git a/libsovtoken/Cargo.toml b/libsovtoken/Cargo.toml index c1dd74f4c..c12670570 100644 --- a/libsovtoken/Cargo.toml +++ b/libsovtoken/Cargo.toml @@ -28,8 +28,8 @@ libc = "0.2.41" log = "0.4.6" openssl = "0.10.20" rand = "0.3" -indy-sys = "1.9.0-rc-75" -indy = "1.9.0-rc-75" +indy-sys = "1.9.0-dev-1125" +indy = "1.9.0-dev-1125" serde = "1.0.89" serde_derive = "1.0.89" serde_json = "1.0.39" diff --git a/libsovtoken/tests/utils/payment/fees.rs b/libsovtoken/tests/utils/payment/fees.rs index bc3abc34a..dfe35d7df 100644 --- a/libsovtoken/tests/utils/payment/fees.rs +++ b/libsovtoken/tests/utils/payment/fees.rs @@ -159,7 +159,7 @@ pub fn set_auth_rules_fee(pool_handle: i32, wallet_handle: i32, submitter_did: & fn _send_auth_rules(pool_handle: i32, wallet_handle: i32, submitter_did: &str, data: &Vec) { let data = ::serde_json::to_string(&data).unwrap(); - let auth_rules_request = ::indy::ledger::libindy_build_auth_rules_request(submitter_did, &data).wait().unwrap(); + let auth_rules_request = ::indy::ledger::build_auth_rules_request(submitter_did, &data).wait().unwrap(); let auth_rules_response = ::indy::ledger::sign_and_submit_request(pool_handle, wallet_handle, submitter_did, &auth_rules_request).wait().unwrap(); From db992af385f0548d169ff54944ae5827edf737ba Mon Sep 17 00:00:00 2001 From: Sergey Minaev Date: Thu, 6 Jun 2019 11:57:15 +0300 Subject: [PATCH 3/5] Fix node/plenum dep version in pool Dockerfile Signed-off-by: Sergey Minaev --- devops/indy-pool/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devops/indy-pool/Dockerfile b/devops/indy-pool/Dockerfile index f0b720d64..84ad347e9 100644 --- a/devops/indy-pool/Dockerfile +++ b/devops/indy-pool/Dockerfile @@ -22,8 +22,8 @@ ARG uid=1000 ARG indy_stream=master -ARG indy_plenum_ver=1.9.0~dev808 -ARG indy_node_ver=1.9.0~dev987 +ARG indy_plenum_ver=1.8.0~dev808 +ARG indy_node_ver=1.8.0~dev987 ARG indy_anoncreds_ver=1.0.32 ARG python3_indy_crypto_ver=0.4.5 ARG indy_crypto_ver=0.4.5 From 14497fccea33f9d156471adc537c16e449f62334 Mon Sep 17 00:00:00 2001 From: Sergey Minaev Date: Fri, 7 Jun 2019 13:05:50 +0300 Subject: [PATCH 4/5] Bump deps versions. Signed-off-by: Sergey Minaev --- devops/docker/ci/xenial/Dockerfile | 8 ++++---- devops/indy-pool/Dockerfile | 8 ++++---- libsovtoken/Cargo.toml | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/devops/docker/ci/xenial/Dockerfile b/devops/docker/ci/xenial/Dockerfile index 0fb6b1f34..3c7baddb0 100644 --- a/devops/docker/ci/xenial/Dockerfile +++ b/devops/docker/ci/xenial/Dockerfile @@ -36,10 +36,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ # or python3-rocksdb are not specified here) ENV LIBINDY_CRYPTO_VERSION ${LIBINDY_CRYPTO_VERSION:-0.4.5} ENV PYTHON3_INDY_CRYPTO_VERSION ${PYTHON3_INDY_CRYPTO_VERSION:-0.4.5} -ENV INDY_PLENUM_VERSION ${INDY_PLENUM_VERSION:-1.8.0~dev808} +ENV INDY_PLENUM_VERSION ${INDY_PLENUM_VERSION:-1.9.0~dev808} ENV INDY_ANONCREDS_VERSION ${INDY_ANONCREDS_VERSION:-1.0.32} -ENV INDY_NODE_VERSION ${INDY_NODE_VERSION:-1.8.0~dev987} -ENV TOKEN_VER ${TOKEN_VER:-0.9.6~33} +ENV INDY_NODE_VERSION ${INDY_NODE_VERSION:-1.9.0~dev987} +ENV TOKEN_VER ${TOKEN_VER:-0.9.13~41} RUN echo "deb https://repo.sovrin.org/sdk/deb xenial master" >> /etc/apt/sources.list RUN echo "deb https://repo.sovrin.org/deb xenial master" >> /etc/apt/sources.list \ && apt-get update && apt-get install -y --no-install-recommends \ @@ -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.59.0 +ENV LIBSOVTOKEN_CI_ENV_VERSION=0.60.0 diff --git a/devops/indy-pool/Dockerfile b/devops/indy-pool/Dockerfile index 84ad347e9..b0ba8a5d0 100644 --- a/devops/indy-pool/Dockerfile +++ b/devops/indy-pool/Dockerfile @@ -22,13 +22,13 @@ ARG uid=1000 ARG indy_stream=master -ARG indy_plenum_ver=1.8.0~dev808 -ARG indy_node_ver=1.8.0~dev987 +ARG indy_plenum_ver=1.9.0~dev808 +ARG indy_node_ver=1.9.0~dev987 ARG indy_anoncreds_ver=1.0.32 ARG python3_indy_crypto_ver=0.4.5 ARG indy_crypto_ver=0.4.5 -ARG token_ver=0.9.6~36 -ARG fees_ver=0.9.6~36 +ARG token_ver=0.9.13~41 +ARG fees_ver=0.9.13~41 # Install environment RUN apt-get update -y && apt-get install -y \ diff --git a/libsovtoken/Cargo.toml b/libsovtoken/Cargo.toml index c12670570..4f4112364 100644 --- a/libsovtoken/Cargo.toml +++ b/libsovtoken/Cargo.toml @@ -28,8 +28,8 @@ libc = "0.2.41" log = "0.4.6" openssl = "0.10.20" rand = "0.3" -indy-sys = "1.9.0-dev-1125" -indy = "1.9.0-dev-1125" +indy-sys = "=1.9.0-dev-1130" +indy = "=1.9.0-dev-1130" serde = "1.0.89" serde_derive = "1.0.89" serde_json = "1.0.39" From 73240d8f7b5b8ade118dda4adabb4b01fe5e2d5f Mon Sep 17 00:00:00 2001 From: Sergey Minaev Date: Fri, 7 Jun 2019 17:35:11 +0300 Subject: [PATCH 5/5] Sync libindy versions in deps. Signed-off-by: Sergey Minaev --- devops/Makefile | 2 +- devops/aws-codebuild/Jenkinsfile.cd | 2 +- devops/aws-codebuild/Jenkinsfile.ci | 2 +- devops/docker/base/xenial/Dockerfile | 4 ++-- devops/docker/ci/xenial/Dockerfile | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/devops/Makefile b/devops/Makefile index 86a91752b..e4841fc15 100644 --- a/devops/Makefile +++ b/devops/Makefile @@ -45,7 +45,7 @@ FPM_P_VENDOR := Sovrin FPM_P_DESCRIPTION := libsovtoken written in Rust FPM_P_NAME = $(PACKAGE_NAME) FPM_P_VERSION ?= $(SRC_VERSION) -FPM_P_DEPENDS = libindy(>=1.9.0~1125) +FPM_P_DEPENDS = libindy(>=1.9.0~1130) FPM_P_OUTPUT_DIR = $(LIB_TARGET_DIR) FPM_ARGS = $(LIB_DYNAMIC)=/usr/lib/ diff --git a/devops/aws-codebuild/Jenkinsfile.cd b/devops/aws-codebuild/Jenkinsfile.cd index b0795e664..26ede5084 100644 --- a/devops/aws-codebuild/Jenkinsfile.cd +++ b/devops/aws-codebuild/Jenkinsfile.cd @@ -16,7 +16,7 @@ gitHubUserCredId = env.GITHUB_BOT_USER ?: 'sovbot-github' sovrinPackagingRepo = env.SOVRIN_PACKAGING_REPO ?: 'https://github.com/sovrin-foundation/sovrin-packaging' sovrinPackagingBranch = env.SOVRIN_PACKAGING_BRANCH ?: 'master' LIBINDY_STREAM = "master" -LIBINDY_VERSION = "1.9.0-1125" +LIBINDY_VERSION = "1.9.0-1130" def downloadPackagingUtils() { git branch: sovrinPackagingBranch, credentialsId: gitHubUserCredId, url: sovrinPackagingRepo diff --git a/devops/aws-codebuild/Jenkinsfile.ci b/devops/aws-codebuild/Jenkinsfile.ci index 1bf1bfe33..f0ea0951f 100644 --- a/devops/aws-codebuild/Jenkinsfile.ci +++ b/devops/aws-codebuild/Jenkinsfile.ci @@ -8,7 +8,7 @@ logger = sovLibrary.Logger.new(this) notifier = sovLibrary.Notifier.new(this) logger.setGlobalLevel('TRACE') LIBINDY_STREAM = "master" -LIBINDY_VERSION = "1.9.0-1125" +LIBINDY_VERSION = "1.9.0-1130" def nodeLabels = [ codeBuild: env.LIBSOVTOKEN_CODEBUILD_NODE_LABEL ?: 'codebuild', diff --git a/devops/docker/base/xenial/Dockerfile b/devops/docker/base/xenial/Dockerfile index 2c70b22d2..821d18291 100644 --- a/devops/docker/base/xenial/Dockerfile +++ b/devops/docker/base/xenial/Dockerfile @@ -21,7 +21,7 @@ RUN cd /tmp \ # need for libsodium to be reachable via pkg-config (sodiumoxide uses it) ENV PKG_CONFIG_PATH /usr/local/lib/pkgconfig:$PKG_CONFIG_PATH # TODO ??? is it really needed -ENV LIBINDY_VERSION=1.9.0~1125 +ENV LIBINDY_VERSION=1.9.0~1130 RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 68DB5E88 \ && echo "deb https://repo.sovrin.org/sdk/deb xenial master" >> /etc/apt/sources.list \ && apt-get update && apt-get install -y --no-install-recommends \ @@ -47,4 +47,4 @@ RUN cd /tmp/libsovtoken \ # TODO CMD ENTRYPOINT ... -ENV LIBSOVTOKEN_BASE_ENV_VERSION=0.24.0 +ENV LIBSOVTOKEN_BASE_ENV_VERSION=0.25.0 diff --git a/devops/docker/ci/xenial/Dockerfile b/devops/docker/ci/xenial/Dockerfile index 3c7baddb0..31ee37797 100644 --- a/devops/docker/ci/xenial/Dockerfile +++ b/devops/docker/ci/xenial/Dockerfile @@ -1,4 +1,4 @@ -FROM sovrin/libsovtoken:base-xenial-0.24.0 +FROM sovrin/libsovtoken:base-xenial-0.25.0 # TODO LABEL maintainer="Name " ARG LIBINDY_CRYPTO_VERSION @@ -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.60.0 +ENV LIBSOVTOKEN_CI_ENV_VERSION=0.61.0