Source variables instead of preserve environment with sudo

olcf · Feb 18, 2018 · 985a3d0 · 985a3d0
1 parent 2f04b49
commit 985a3d0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/Builder/scripts/docker-builder-backend.sh b/Builder/scripts/docker-builder-backend.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+source /home/builder/environment.sh
+
 # Test for any arguments, such as --debug
 for i in "$@"
 do

diff --git a/Builder/scripts/singularity-builder-backend.sh b/Builder/scripts/singularity-builder-backend.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+source /home/builder/environment.sh
+
 # Test for any arguments, such as --debug
 for i in "$@"
 do

diff --git a/Builder/src/main.cpp b/Builder/src/main.cpp
@@ -80,9 +80,9 @@ std::string build_command(const ClientData &client_data) {
 
     // Basic build command
     if (client_data.backend == BackendType::singularity) {
-        build_command = "/usr/bin/sudo -E /usr/local/bin/singularity-builder-backend.sh";
+        build_command = "/usr/bin/sudo /usr/local/bin/singularity-builder-backend.sh";
     } else if (client_data.backend == BackendType::docker) {
-        build_command = "/usr/bin/sudo -E /usr/local/bin/docker-builder-backend.sh";
+        build_command = "/usr/bin/sudo /usr/local/bin/docker-builder-backend.sh";
     } else {
         throw std::runtime_error("Invalid builder backend");
     }