From d1c90271be5228f6a4a4876dbfc9b0e2daa7eb97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Wed, 18 Nov 2015 15:54:02 +0000
Subject: [PATCH] added doku for installatin in README

---
 ChangeLog            | 16 ++++++++++++++++
 README               | 24 +++++++++++++++++++++++-
 html/details.php     | 13 +++++++++++--
 html/manage.php      | 13 +++++++++++--
 html/overview.php    | 12 +++++++++++-
 html/servicedock.css |  4 ++--
 6 files changed, 74 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4f29e0b..eed1671 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2015-11-18 13:24  marc
+
+	* configure.ac, html/details.php, html/index.html.in,
+	  html/jquery-ui.css, html/jquery-ui.js, html/jquery.ui.all.css,
+	  html/makefile.am, html/manage.php, html/overview.php,
+	  html/servicedock.css: fixed display bugs and added tabs for logs
+	  and dump
+
+2015-11-15 23:07  marc
+
+	* ChangeLog, configure.ac, doc/doxyfile.in, html/action.php,
+	  html/details.php, html/index.html.in, html/jquery.js,
+	  html/makefile.am, html/manage.php, html/menu.svg,
+	  html/overview.php, html/servicedock.css, html/servicedock.js,
+	  html/viz.js: first release
+
 2015-11-14 11:43  marc
 
 	* ., AUTHORS, COPYING, ChangeLog, INSTALL, NEWS, README,
diff --git a/README b/README
index 2ff05cc..e898d44 100644
--- a/README
+++ b/README
@@ -1,3 +1,25 @@
-servicedock
+ServiceDock https://servicedock.ch
 
 Run Docker as a Service.
+
+Installation:
+
+  sudo pkg -i servicedock_*.deb
+  sudo apt-get install apache2 apache2-utils libapache2-mod-php5
+  sudo adduser www-data docker
+  sudo htdigest -c /etc/apache2/servicedock.digest "private area" $(whoami)
+  sudo dd of=/etc/apache2/conf-available/servicedock.conf <<EOF
+Alias /servicedock /usr/share/servicedock/html
+<Location /servicedock>
+    AuthType Digest
+    AuthName "private area"
+    AuthDigestDomain "/servicedock/" "http://dev0004/servicedock/"
+    AuthDigestProvider file
+    AuthUserFile "servicedock.digest"
+    Require valid-user
+</Location>
+EOF
+  sudo a2enconf servicedock
+  sudo a2enmod auth_digest
+  sudo service apache2 reload
+  
\ No newline at end of file
diff --git a/html/details.php b/html/details.php
index 1f9838a..95dbdd8 100644
--- a/html/details.php
+++ b/html/details.php
@@ -19,14 +19,23 @@ $containers=json_decode(join($res), true);
 foreach ($containers as $c) {
   $name = preg_replace(',^/,', '', $c['Name']);
   $ports = "<ul>";
-  if ($c['NetworkSettings']['Ports'])
+  if ($c['NetworkSettings']['Ports']) {
     foreach ($c['NetworkSettings']['Ports'] as $from => $to) {
       if ($to)
         foreach ($to as $p) {
           if (isset($p['HostPort']))
-            $ports.="<li>-p ".($p['HostIp']!="0.0.0.0"?$p['HostIp'].":":"").$p['HostPort'].':'.$from.'</li>';
+            $ports.="<li>-p ".($p['HostIp']&&$p['HostIp']!="0.0.0.0"?$p['HostIp'].":":"").$p['HostPort'].':'.$from.'</li>';
         }
     }
+  } elseif ($c['HostConfig']['PortBindings']) {
+    foreach ($c['HostConfig']['PortBindings'] as $from => $to) {
+      if ($to)
+        foreach ($to as $p) {
+          if (isset($p['HostPort']))
+            $ports.="<li>-p ".($p['HostIp']&&$p['HostIp']!="0.0.0.0"?$p['HostIp'].":":"").$p['HostPort'].':'.$from.'</li>';
+        }
+    }
+  }
   $ports .= "</ul>";
   $volumes = "?";
   $links = "<ul>";
diff --git a/html/manage.php b/html/manage.php
index 7176fdc..2b1ac2c 100644
--- a/html/manage.php
+++ b/html/manage.php
@@ -10,7 +10,7 @@ echo "</thead><tbody>";
 foreach ($containers as $c) {
   $name = preg_replace(',^/,', '', $c['Name']);
   $ports = "<ul>";
-  if ($c['NetworkSettings']['Ports'])
+  if ($c['NetworkSettings']['Ports']) {
     foreach ($c['NetworkSettings']['Ports'] as $from => $to) {
       if ($to)
         foreach ($to as $p) {
@@ -18,6 +18,15 @@ foreach ($containers as $c) {
             $ports.="<li>".($p['HostIp']!="0.0.0.0"?$p['HostIp'].":":"").$p['HostPort'].':'.$from.'</li>';
         }
     }
+  } elseif ($c['HostConfig']['PortBindings']) {
+    foreach ($c['HostConfig']['PortBindings'] as $from => $to) {
+      if ($to)
+        foreach ($to as $p) {
+          if (isset($p['HostPort']))
+            $ports.="<li>".($p['HostIp']&&$p['HostIp']!="0.0.0.0"?$p['HostIp'].":":"").$p['HostPort'].':'.$from.'</li>';
+        }
+    }
+  }
   $ports .= "</ul>";
   $links = "<ul>";
   if ($c['HostConfig']['Links'])
@@ -29,7 +38,7 @@ foreach ($containers as $c) {
   elseif ($c['State']['Restarting']) {$status = "restarted"; $actions=Array();}
   elseif ($c['State']['Paused']) {$status = "paused"; $actions=Array("unpause", "rm");}
   elseif ($c['State']['Running']) {$status = "running"; $actions=Array("pause", "stop");}
-  else {$status="dead"; $actions=Array("start", "remove");}
+  else {$status="dead"; $actions=Array("start", "rm");}
   $action="";
   foreach($actions as $a)
     $action.='<a class="toolbutton" href="javascript:action('."'".$c['Id']."', '".$a."'".');">'.$a.'</a>';
diff --git a/html/overview.php b/html/overview.php
index f3cee31..f7aabd3 100644
--- a/html/overview.php
+++ b/html/overview.php
@@ -17,7 +17,7 @@ if ($ret==0) {
   foreach ($containers as $c) {
     $name = preg_replace(',^/,', '', $c['Name']);
     $ports = null;
-    if ($c['NetworkSettings']['Ports'])
+    if ($c['NetworkSettings']['Ports']) {
       foreach ($c['NetworkSettings']['Ports'] as $ps) {
         if (isset($ps))
           foreach ($ps as $p) {
@@ -26,6 +26,16 @@ if ($ret==0) {
               else $ports = $p['HostPort'];
           }
       }
+    } elseif ($c['HostConfig']['PortBindings']) {
+      foreach ($c['HostConfig']['PortBindings'] as $ps) {
+        if (isset($ps))
+          foreach ($ps as $p) {
+            if (isset($p['HostPort']))
+              if (isset($ports)) $ports .= ", ".$p['HostPort'];
+              else $ports = $p['HostPort'];
+          }
+      }
+    }
     $attrs=$name.'\\n'.$c['Config']['Image'].'",URL="javascript:details('."'".$c['Id']."'".')",style=filled';
     if (isset($ports)) $attrs = $ports.'\\n'.$attrs.',peripheries=2';
     if ($c['State']['Dead']) $attrs.=',fillcolor=red';
diff --git a/html/servicedock.css b/html/servicedock.css
index bed8dfb..8c6ba19 100644
--- a/html/servicedock.css
+++ b/html/servicedock.css
@@ -18,7 +18,7 @@ div {
 }
 
 svg {
-  width: 100%;
+  max-width: 100%;
   height: auto;
 }
 
@@ -147,7 +147,7 @@ table.docker li+li {
   top: 0;
   margin: 0;
   padding: 0 1em 0 1em;
-  background-color: green;
+  background-color: blue;
   color: white;
 }
 #header #togglemenu {