From 539fa8ad0e9cd9fed45f4be8b2a63f8fda02a67e Mon Sep 17 00:00:00 2001 From: Aleksei Doroganov Date: Fri, 27 Dec 2019 18:44:40 +0300 Subject: [PATCH] Corda docker filtered https repository fix and gradle 4.10.3 Signed-off-by: Aleksei Doroganov --- devops/profile/develop/Dockerfile-corda | 2 +- docker.gradle | 1 + gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/devops/profile/develop/Dockerfile-corda b/devops/profile/develop/Dockerfile-corda index 10f4a5e6..66c38d5f 100644 --- a/devops/profile/develop/Dockerfile-corda +++ b/devops/profile/develop/Dockerfile-corda @@ -4,7 +4,7 @@ RUN apt-get update && apt-get install -y openjdk-8-jre-headless software-propert # Install libindy RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88 && \ - add-apt-repository "deb https://repo.sovrin.org/sdk/deb xenial stable" + add-apt-repository -n "deb https://repo.sovrin.org/sdk/deb xenial stable" # -o Acquire::https::*::Verify-Peer=false is to make build work in environments with filtered https RUN apt-get -o Acquire::https::repo.sovrin.org::Verify-Peer=false update && \ apt-get -o Acquire::https::repo.sovrin.org::Verify-Peer=false install -y libindy=1.8.2 diff --git a/docker.gradle b/docker.gradle index fc3a0879..f0c472ea 100644 --- a/docker.gradle +++ b/docker.gradle @@ -42,6 +42,7 @@ dockerCompose { cordaComposeUp.shouldRunAfter(agentsComposeUp) baseimagesComposeBuild.dependsOn("bootstrap") cordaComposeBuild.dependsOn("bootstrap") + cordaComposeBuild.dependsOn(baseimagesComposeBuild) cordaComposeBuild.mustRunAfter(baseimagesComposeBuild) backendsComposeBuild.dependsOn(":webapp:assemble") backendsComposeBuild.dependsOn("bootstrap") diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a4fc03df..ae45383b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists