Merge pull request #832 from Squidly271/revert-782-containerStart

Revert "dockerMan: Selectable start upon install"
This commit is contained in:
tom mortensen
2021-05-05 12:55:25 -07:00
committed by GitHub
@@ -113,14 +113,13 @@ if (isset($_POST['contName'])) {
goto END;
}
}
$startContainer = filter_var($_POST['contStart'],FILTER_VALIDATE_BOOLEAN);
$startContainer = true;
// Remove existing container
if ($DockerClient->doesContainerExist($Name)) {
// attempt graceful stop of container first
$oldContainerInfo = $DockerClient->getContainerDetails($Name);
if (!empty($oldContainerInfo) && !empty($oldContainerInfo['State']) && !empty($oldContainerInfo['State']['Running'])) {
// attempt graceful stop of container first
$startContainer = true;
stopContainer($Name);
}
// force kill container if still running after 10 seconds
@@ -883,16 +882,10 @@ _(Privileged)_:
 
: <a href="javascript:addConfigPopup()"><i class="fa fa-fw fa-plus"></i> _(Add another Path, Port, Variable, Label or Device)_</a>
<?if ($xmlType != "edit"):?>
&nbsp;
: <input type='checkbox' name='contStart' checked> <span class='orange-text'>_(Start Container After Install)_</span>
<?endif;?>
&nbsp;
: <input type="submit" value="<?=$xmlType=='edit' ? "_(Apply)_" : " _(Apply)_ "?>"><input type="button" value="_(Done)_" onclick="done()">
<?if ($authoringMode):?><button type="submit" name="dryRun" value="true" onclick="$('*[required]').prop('required', null);">_(Save)_</button><?endif;?>
</form>
</div>
@@ -1055,7 +1048,7 @@ function load_contOverview() {
// Handle code block being created by authors indenting (manually editing the xml and spacing)
new_overview = new_overview.replaceAll(" ","&nbsp;&nbsp;&nbsp;&nbsp;");
new_overview = marked(new_overview);
} else
} else
new_overview = new_overview.replaceAll("\n","");
$("#contDescription").html(new_overview);
}