GEODE-3071: Pull config of docker volumes into top level script so that they can be overridden
Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/07e8986e Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/07e8986e Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/07e8986e Branch: refs/heads/feature/GEODE-2804v3 Commit: 07e8986e3deb722c0beea380eac00a18c86844aa Parents: b26fa51 Author: Jens Deppe <jde...@pivotal.io> Authored: Mon Jun 19 07:42:57 2017 -0700 Committer: Jens Deppe <jde...@pivotal.io> Committed: Mon Jun 19 07:48:27 2017 -0700 ---------------------------------------------------------------------- build.gradle | 5 +++++ gradle/docker.gradle | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/07e8986e/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index 57372b3..4feb879 100755 --- a/build.gradle +++ b/build.gradle @@ -74,6 +74,11 @@ if (name == 'geode') { ext.scriptDir = 'gradle' } +if (project.hasProperty('parallelDunit')) { + def pwd = System.getenv('PWD') + ext.dunitDockerVolumes = ["${pwd}":pwd] +} + apply from: "${scriptDir}/utilities.gradle" apply from: "${scriptDir}/java.gradle" apply from: "${scriptDir}/dependency-resolution.gradle" http://git-wip-us.apache.org/repos/asf/geode/blob/07e8986e/gradle/docker.gradle ---------------------------------------------------------------------- diff --git a/gradle/docker.gradle b/gradle/docker.gradle index b67c073..7971974 100644 --- a/gradle/docker.gradle +++ b/gradle/docker.gradle @@ -47,11 +47,11 @@ def dockerConfig = { // volumes mounted to the containers // in a form: host_dir : container_dir - def pwd = System.getenv('PWD') def gradleHome = System.getenv('GRADLE_USER_HOME') ?: "${System.getenv('HOME')}/.gradle" volumes = ["${gradleHome}":gradleHome] - volumes << ["${pwd}":pwd] + // Add volumes configured by top-level build script + volumes << project.dunitDockerVolumes // specify the user for starting Gradle test worker within the container. user = dunitDockerUser
