You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2020/01/16 08:44:31 UTC

[plc4x] 02/02: Updated the prerequisiteCheck to only do the docker-check if the "with-docker" profile is enabled.

This is an automated email from the ASF dual-hosted git repository.

cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git

commit 1e6df7563ad909d365d1402729699b61c70019bd
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Thu Jan 16 09:34:05 2020 +0100

    Updated the prerequisiteCheck to only do the docker-check if the "with-docker" profile is enabled.
---
 src/main/script/prerequisiteCheck.groovy | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/script/prerequisiteCheck.groovy b/src/main/script/prerequisiteCheck.groovy
index 484013f..4bc7266 100644
--- a/src/main/script/prerequisiteCheck.groovy
+++ b/src/main/script/prerequisiteCheck.groovy
@@ -293,6 +293,7 @@ println "Detected Arch: " + arch
 println "Enabled profiles:"
 def boostEnabled = false
 def cppEnabled = false
+def dockerEnabled = false;
 def dotnetEnabled = false
 def javaEnabled = true
 def pythonEnabled = false
@@ -306,6 +307,9 @@ for (def activeProfile : activeProfiles) {
     } else if(activeProfile == "with-cpp") {
         cppEnabled = true
         println "cpp"
+    } else if(activeProfile == "with-docker") {
+        dockerEnabled = true
+        println "docker"
     } else if(activeProfile == "with-dotnet") {
         dotnetEnabled = true
         println "dotnet"
@@ -382,7 +386,7 @@ if(!boostEnabled && cppEnabled) {
     checkBoost()
 }
 
-if(sandboxEnabled) {
+if(sandboxEnabled && dockerEnabled) {
     checkDocker()
 }