docker
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
laci
2024-07-02 12:37:09 +02:00
parent 378cc23b01
commit dfcbfb8451
3 changed files with 19 additions and 10 deletions

View File

@@ -145,7 +145,7 @@
</select> </select>
</div> </div>
</div> </div>
<div id="div_additionals"> <div id="div_additionals" class="hidden">
<div class="row"> <div class="row">
<div class="mb-3"> <div class="mb-3">
<label for="service_dir">Please add directory path of service files: (/etc/user/config/services/)</label> <label for="service_dir">Please add directory path of service files: (/etc/user/config/services/)</label>

View File

@@ -2,6 +2,10 @@
putenv('WEBINSTALL=true'); putenv('WEBINSTALL=true');
// TEMP
putenv('HOME=/home/hael');
putenv('USER=hael');
putenv('DOCKER_REGISTRY_URL='.$_POST["registry"]); putenv('DOCKER_REGISTRY_URL='.$_POST["registry"]);
if ($_POST["smarthost"]=="Y") { if ($_POST["smarthost"]=="Y") {
@@ -44,6 +48,9 @@ putenv('ADDITIONAL='.$_POST["additional"]);
// check ENV variables // check ENV variables
$output = shell_exec("set"); $output = shell_exec("set");
echo "<pre>".$output."</pre>";
$output = shell_exec("sh install.sh");
echo $output; echo $output;
?> ?>

View File

@@ -647,6 +647,7 @@ else
ACTION="install"; ACTION="install";
fi; fi;
if [ "$WEBINSTALL" == "" ]; then
if [ "$USER" != "root" ] ; then if [ "$USER" != "root" ] ; then
echo "You are not logged in as root." echo "You are not logged in as root."
echo "Do you want to continue and run $ACTION script as "$USER" user using sudo? (Y/n)"; echo "Do you want to continue and run $ACTION script as "$USER" user using sudo? (Y/n)";
@@ -658,6 +659,7 @@ if [ "$USER" != "root" ] ; then
SUDO_CMD="sudo "; SUDO_CMD="sudo ";
fi; fi;
fi; fi;
fi;
if [ "$1" == "remove" ]; then if [ "$1" == "remove" ]; then
# uninstall; # uninstall;