Skip to content

Some bugfixes #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eschultz merged 5 commits into from
Mar 15, 2016
Merged

Some bugfixes #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9d37b78
Export ports as variable if Network is set to host
gfjardim Mar 14, 2016
d304921
Deal with deprecation of auto creating host paths
gfjardim Mar 14, 2016
fea7985
Remove deprecated stylesheet (gh-buttons.css)
gfjardim Mar 14, 2016
0289168
Patch jQuery Ui widget to Dynamic black theme.
gfjardim Mar 14, 2016
bd06cae
Create a default name for config if it's empty
gfjardim Mar 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion plugins/dynamix.docker.manager/DockerContainers.page
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ $DockerClient = new DockerClient();
$DockerUpdate = new DockerUpdate();
$DockerTemplates = new DockerTemplates();
?>
<link type="text/css" rel="stylesheet" href="/plugins/dynamix.docker.manager/styles/gh-buttons.css">
<link type="text/css" rel="stylesheet" href="/webGui/styles/jquery.ui.css">
<link type="text/css" rel="stylesheet" href="/webGui/styles/jquery.switchbutton.css">
<link type="text/css" rel="stylesheet" href="/webGui/styles/context.standalone.css">
Expand Down
31 changes: 26 additions & 5 deletions plugins/dynamix.docker.manager/include/CreateDocker.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ function xmlToVar($xml) {
return $out;
}

function xmlToCommand($xml) {
function xmlToCommand($xml, $create_paths=false) {
global $var;
$xml = xmlToVar($xml);
$cmdName = (strlen($xml['Name'])) ? '--name="'.$xml['Name'].'"' : "";
Expand All @@ -349,10 +349,20 @@ function xmlToCommand($xml) {
if (!strlen($containerConfig)) continue;
if ($confType == "path") {
$Volumes[] = sprintf('"%s":"%s":%s', $hostConfig, $containerConfig, $Mode);
if ( ! file_exists($hostConfig) && $create_paths ) {
@mkdir($hostConfig, 0777, true);
@chown($hostConfig, 99);
@chgrp($hostConfig, 100);
}
} elseif ($confType == 'port') {
$Ports[] = sprintf("%s:%s/%s", $hostConfig, $containerConfig, $Mode);
# Export ports as variable if Network is set to host
if (strtolower($xml['Network']) == 'host') {
$Variables[] = strtoupper(sprintf('"%s_PORT_%s"="%s"', $Mode, $containerConfig, $hostConfig));
} else {
$Ports[] = sprintf("%s:%s/%s", $hostConfig, $containerConfig, $Mode);
}
} elseif ($confType == "variable") {
$Variables[] = sprintf('%s="%s"', $containerConfig, $hostConfig);
$Variables[] = sprintf('"%s"="%s"', $containerConfig, $hostConfig);
} elseif ($confType == "device") {
$Devices[] = '"'.$containerConfig.'"';
}
Expand Down Expand Up @@ -410,12 +420,14 @@ function setXmlVal(&$xml, $value, $el, $attr = null, $pos = 0) {
if (isset($_POST['contName'])) {

$postXML = postToXML($_POST, true);
$dry_run = ($_POST['dryRun'] == "true") ? true : false;
$create_paths = $dry_run ? false : true;

// Get the command line
list($cmd, $Name, $Repository) = xmlToCommand($postXML);
list($cmd, $Name, $Repository) = xmlToCommand($postXML, $create_paths);

// Run dry
if ($_POST['dryRun'] == "true") {
if ($dry_run) {
echo "<h2>XML</h2>";
echo "<pre>".htmlentities($postXML)."</pre>";
echo "<h2>COMMAND:</h2>";
Expand Down Expand Up @@ -606,6 +618,7 @@ function setXmlVal(&$xml, $value, $el, $attr = null, $pos = 0) {
<link type="text/css" rel="stylesheet" href="/webGui/styles/jquery.ui.css">
<link type="text/css" rel="stylesheet" href="/webGui/styles/jquery.switchbutton.css">
<link type="text/css" rel="stylesheet" href="/webGui/styles/jquery.filetree.css">
<link rel="stylesheet" type="text/css" href="/plugins/dynamix.docker.manager/styles/style-<?=$display['theme'];?>.css">
<style>
body{-webkit-overflow-scrolling:touch;}
.fileTree{width:240px;height:150px;overflow:scroll;position:absolute;z-index:100;display:none;margin-bottom: 100px;}
Expand Down Expand Up @@ -799,6 +812,9 @@ function addConfigPopup() {
["Name","Target","Default","Mode","Description","Type","Display","Required","Mask","Value"].forEach(function(e){
Opts[e] = getVal(Element, e);
});
if ( ! Opts["Name"] ){
Opts["Name"] = makeName(Opts["Type"]);
}
Opts.Description = (Opts.Description.length) ? Opts.Description : "Container "+Opts.Type+": "+Opts.Target;
if (Opts.Required == "true") {
Opts.Buttons = "<span class='advanced'><button type='button' onclick='editConfigPopup("+confNum+")'> Edit</button> ";
Expand Down Expand Up @@ -897,6 +913,11 @@ function removeConfig(num) {
$('#ConfigNum' + num).fadeOut("fast", function() { $(this).remove(); });
}

function makeName(type) {
i = $("#configLocation input[name^='confType'][value='"+type+"']").length + 1;
return type + " "+i;
}

function toggleMode(el) {
var mode = $(el).parent().siblings('#Mode');
var valueDiv = $(el).parent().siblings('#Value');
Expand Down
Loading