From 89f7fcbba4565828d04952b4fe8e5c58bdaf48fa Mon Sep 17 00:00:00 2001
From: Eric Schultz <eric@startuperic.com>
Date: Sun, 7 May 2017 15:27:52 -0500
Subject: [PATCH] webGui: allow custom IP addresses for individual Docker
 containers

---
 .../DockerContainers.page                     |  4 +-
 .../DockerSettings.page                       |  8 ++-
 .../include/CreateDocker.php                  | 63 +++++++++++++++----
 .../include/DockerClient.php                  | 24 +++++--
 4 files changed, 76 insertions(+), 23 deletions(-)

diff --git a/plugins/dynamix.docker.manager/DockerContainers.page b/plugins/dynamix.docker.manager/DockerContainers.page
index 491275dcb..4bf68a658 100644
--- a/plugins/dynamix.docker.manager/DockerContainers.page
+++ b/plugins/dynamix.docker.manager/DockerContainers.page
@@ -4,8 +4,8 @@ Cond="(pgrep('dockerd')!==false)"
 Markdown="false"
 ---
 <?PHP
-/* Copyright 2005-2016, Lime Technology
- * Copyright 2014-2016, Guilherme Jardim, Eric Schultz, Jon Panozzo.
+/* Copyright 2005-2017, Lime Technology
+ * Copyright 2014-2017, Guilherme Jardim, Eric Schultz, Jon Panozzo.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
diff --git a/plugins/dynamix.docker.manager/DockerSettings.page b/plugins/dynamix.docker.manager/DockerSettings.page
index ecc4dadc5..bfff6d71e 100644
--- a/plugins/dynamix.docker.manager/DockerSettings.page
+++ b/plugins/dynamix.docker.manager/DockerSettings.page
@@ -4,8 +4,8 @@ Icon="dynamix.docker.manager.png"
 Markdown="false"
 ---
 <?PHP
-/* Copyright 2005-2016, Lime Technology
- * Copyright 2014-2016, Guilherme Jardim, Eric Schultz, Jon Panozzo.
+/* Copyright 2005-2017, Lime Technology
+ * Copyright 2014-2017, Guilherme Jardim, Eric Schultz, Jon Panozzo.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -13,6 +13,8 @@ Markdown="false"
  *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
+ *
+ * Added custom network and IPv6 support - Bergware April 2017
  */
 ?>
 <?
@@ -299,7 +301,7 @@ $(function() {
     $.cookie('dockersettings_view_mode', $('.advancedview').is(':checked') ? 'advanced' : 'basic', { expires: 3650 });
   });
 
-  showStatus('pid','docker');
+  showStatus('pid','dockerd');
 
   <?if ($var['fsState'] == "Started"):?>
     $("#DOCKER_APP_CONFIG_PATH").fileTreeAttach();
diff --git a/plugins/dynamix.docker.manager/include/CreateDocker.php b/plugins/dynamix.docker.manager/include/CreateDocker.php
index be2b51695..a4ecf9f52 100644
--- a/plugins/dynamix.docker.manager/include/CreateDocker.php
+++ b/plugins/dynamix.docker.manager/include/CreateDocker.php
@@ -1,8 +1,6 @@
 <?PHP
-/* Copyright 2005-2016, Lime Technology
- * Copyright 2015-2016, Guilherme Jardim, Eric Schultz, Jon Panozzo.
- *
- * Adaptations by Bergware International (May 2016)
+/* Copyright 2005-2017, Lime Technology
+ * Copyright 2014-2017, Guilherme Jardim, Eric Schultz, Jon Panozzo.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -10,10 +8,12 @@
  *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
+ *
+ * Added custom network and IPv6 support - Bergware April 2017
  */
 ?>
 <?
-$docroot = @$docroot ?: $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot = $docroot ?: $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
 
 ignore_user_abort(true);
 
@@ -32,6 +32,15 @@ $DockerTemplates = new DockerTemplates();
 
 $echo = function($m){ echo "<pre>".print_r($m, true)."</pre>"; };
 
+exec("docker network ls --filter driver='macvlan' --format='{{.Name}}'", $custom);
+$subnet = ['bridge'=>'', 'host'=>'', 'none'=>''];
+foreach ($custom as $network) {
+  $subnets = [];
+  $values = exec("docker network inspect --format='{{range .IPAM.Config}}{{.Subnet}} {{end}}' $network");
+  foreach (explode(' ',$values) as $value) $subnets[] = strpos($value,':')===false ?  "IPv4: $value" : "IPv6: $value";
+  $subnet[$network] = implode(', ',$subnets);
+}
+
 function stopContainer($name) {
   global $DockerClient;
   $waitID = mt_rand();
@@ -189,6 +198,7 @@ function postToXML($post, $setOwnership = false) {
   $xml->Repository         = xml_encode(trim($post['contRepository']));
   $xml->Registry           = xml_encode(trim($post['contRegistry']));
   $xml->Network            = xml_encode($post['contNetwork']);
+  $xml->MyIP               = xml_encode($post['contMyIP']);
   $xml->Privileged         = (strtolower($post["contPrivileged"]) == 'on') ? 'true' : 'false';
   $xml->Support            = xml_encode($post['contSupport']);
   $xml->Overview           = xml_encode($post['contOverview']);
@@ -251,6 +261,7 @@ function xmlToVar($xml) {
   $out['Repository']  = xml_decode($xml->Repository);
   $out['Registry']    = xml_decode($xml->Registry);
   $out['Network']     = (isset($xml->Network)) ? xml_decode($xml->Network) : xml_decode($xml->Network['Default']);
+  $out['MyIP']        = isset($xml->MyIP) ? xml_decode($xml->MyIP) : '';
   $out['Privileged']  = xml_decode($xml->Privileged);
   $out['Support']     = xml_decode($xml->Support);
   $out['Overview']    = stripslashes(xml_decode($xml->Overview));
@@ -362,6 +373,7 @@ function xmlToCommand($xml, $create_paths=false) {
   $cmdName       = (strlen($xml['Name'])) ? '--name="'.$xml['Name'].'"' : "";
   $cmdPrivileged = (strtolower($xml['Privileged']) == 'true') ? '--privileged="true"' : "";
   $cmdNetwork    = '--net="'.strtolower($xml['Network']).'"';
+  $cmdMyIP       = $xml['MyIP'] ? (strpos($xml['MyIP'],':')===false?'--ip="':'--ip6="').$xml['MyIP'].'"' : '';
   $Volumes       = [''];
   $Ports         = [''];
   $Variables     = [''];
@@ -386,10 +398,10 @@ function xmlToCommand($xml, $create_paths=false) {
       }
     } elseif ($confType == 'port') {
       # Export ports as variable if Network is set to host
-      if (strtolower($xml['Network']) == 'host') {
+      if (preg_match('/^(host|eth[0-9]|br[0-9]|bond[0-9])/',strtolower($xml['Network']))) {
         $Variables[] = strtoupper(sprintf('"%s_PORT_%s"="%s"', $Mode, $containerConfig, $hostConfig));
       # Export ports as port if Network is set to bridge
-      } elseif (strtolower($xml['Network']) == 'bridge') {
+      } elseif (strtolower($xml['Network'])== 'bridge') {
         $Ports[] = sprintf("%s:%s/%s", $hostConfig, $containerConfig, $Mode);
       # No export of ports if Network is set to none
       }
@@ -399,9 +411,10 @@ function xmlToCommand($xml, $create_paths=false) {
       $Devices[] = '"'.$hostConfig.'"';
     }
   }
-  $cmd = sprintf('/plugins/dynamix.docker.manager/scripts/docker create %s %s %s %s %s %s %s %s %s',
+  $cmd = sprintf('/plugins/dynamix.docker.manager/scripts/docker create %s %s %s %s %s %s %s %s %s %s',
                  $cmdName,
                  $cmdNetwork,
+                 $cmdMyIP,
                  $cmdPrivileged,
                  implode(' -e ', $Variables),
                  implode(' -p ', $Ports),
@@ -1041,7 +1054,7 @@ $showAdditionalInfo = '';
       } else {
         targetDiv.hide();
       }
-      if (network==0 || network==1) {
+      if (network==0 || network==1 || network>2) {
         valueDiv.find('#dt2').text('Host Port:');
         valueDiv.show();
       } else {
@@ -1355,13 +1368,20 @@ $showAdditionalInfo = '';
       <tr <?=$showAdditionalInfo?>>
         <td>Network Type:</td>
         <td>
-          <select name="contNetwork" class="narrow">
-            <option value="bridge">Bridge</option>
-            <option value="host">Host</option>
-            <option value="none">None</option>
+          <select name="contNetwork" class="narrow" onchange="showSubnet(this.value)">
+          <?=mk_option(0,'bridge','Bridge')?>
+          <?=mk_option(0,'host','Host')?>
+          <?=mk_option(0,'none','None')?>
+          <?foreach ($custom as $network):?>
+          <?=mk_option(0,$network,$network)?>
+          <?endforeach;?>
           </select>
         </td>
       </tr>
+      <tr class="myIP" style="display:none">
+        <td>Fixed IP address (optional):</td>
+        <td><input type="text" name="contMyIP" class="textPath"><span id="myIP"></span></td>
+      </tr>
       <tr <?=$showAdditionalInfo?>>
         <td colspan="2" class="inline_help">
           <blockquote class="inline_help">
@@ -1519,6 +1539,20 @@ $showAdditionalInfo = '';
 </div>
 
 <script type="text/javascript">
+  var subnet = {};
+<?foreach ($subnet as $network => $value):?>
+  subnet['<?=$network?>'] = 'Subnet - <?=$value?>';
+<?endforeach;?>
+
+  function showSubnet(bridge) {
+    if (bridge.match(/^(br|eth|bond)[0-9]/) !== null) {
+      $('.myIP').show();
+      $('#myIP').html(subnet[bridge]);
+    } else {
+      $('.myIP').hide();
+      $('input[name="contMyIP"]').val('');
+    }
+  }
   function reloadTriggers() {
     $(".basic").toggle(!$(".advanced-switch:first").is(":checked"));
     $(".advanced").toggle($(".advanced-switch:first").is(":checked"));
@@ -1607,6 +1641,9 @@ $showAdditionalInfo = '';
       $('#canvas').find('#Overview:first').hide();
     }
 
+    // Show associated subnet with fixed IP (if existing)
+    showSubnet($('select[name="contNetwork"]').val());
+
     // Add list of deployed host ports
     $("#configLocationPorts").html(makeUsedPorts(UsedPorts,$('input[name="contName"]').val()));
 
diff --git a/plugins/dynamix.docker.manager/include/DockerClient.php b/plugins/dynamix.docker.manager/include/DockerClient.php
index 4d883d197..4fb586c1a 100644
--- a/plugins/dynamix.docker.manager/include/DockerClient.php
+++ b/plugins/dynamix.docker.manager/include/DockerClient.php
@@ -1,6 +1,6 @@
 <?PHP
-/* Copyright 2005-2016, Lime Technology
- * Copyright 2014-2016, Guilherme Jardim, Eric Schultz, Jon Panozzo.
+/* Copyright 2005-2017, Lime Technology
+ * Copyright 2014-2017, Guilherme Jardim, Eric Schultz, Jon Panozzo.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -8,10 +8,12 @@
  *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
+ *
+ * Added custom network and IPv6 support - Bergware April 2017
  */
 ?>
 <?
-$docroot = $docroot ?: @$_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot = $docroot ?: $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
 
 $dockerManPaths = [
 	'plugin'            => '/usr/local/emhttp/plugins/dynamix.docker.manager',
@@ -260,9 +262,21 @@ class DockerTemplates {
 		}
 
 		$WebUI = $this->getTemplateValue($Repository, "WebUI");
-
+		$myIP = $this->getTemplateValue($Repository, "MyIP");
+		$network = $this->getTemplateValue($Repository, "Network");
+		if (!$myIP) {
+      if (preg_match('%^(br|eth|bond)[0-9]%',$network)) {
+			  $name = $this->getTemplateValue($Repository, "Name");
+			  $ipv4 = exec("docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $name");
+			  $ipv6 = exec("docker inspect --format='{{range .NetworkSettings.Networks}}{{.GlobalIPv6Address}}{{end}}' $name");
+        $myIP = $ipv4 ?: $ipv6 ?: $eth0['IPADDR:0'];
+      } else {
+        $myIP = $eth0["IPADDR:0"];
+      }
+		}
 		if (preg_match("%\[IP\]%", $WebUI)) {
-			$WebUI = preg_replace("%\[IP\]%", $eth0["IPADDR:0"], $WebUI);
+			$replace = strpos($myIP,':')===false ? '%\[IP\]%' : '%IP%';
+			$WebUI = preg_replace($replace, $myIP, $WebUI);
 		}
 		if (preg_match("%\[PORT:(\d+)\]%", $WebUI, $matches)) {
 			$ConfigPort = $matches[1];