Commit 985a3d0c authored by AdamSimpson's avatar AdamSimpson
Browse files

Source variables instead of preserve environment with sudo

parent 2f04b496

Builder/scripts/docker-builder-backend.sh

+2 −0
Original line number Diff line number Diff line 
#!/bin/bash



source /home/builder/environment.sh



# Test for any arguments, such as --debug

for i in "$@"

do

Builder/scripts/singularity-builder-backend.sh

+2 −0
Original line number Diff line number Diff line 
#!/bin/bash



source /home/builder/environment.sh



# Test for any arguments, such as --debug

for i in "$@"

do

Builder/src/main.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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");

    }