diff --git a/configure.ac b/configure.ac index 3f9ad2b..63e3c4a 100644 --- a/configure.ac +++ b/configure.ac @@ -10,7 +10,7 @@ m4_define(x_package_name, servicedock) # project's name m4_define(x_major, 0) # project's major version -m4_define(x_minor, 2) # project's minor version +m4_define(x_minor, 5) # project's minor version m4_include(ax_init_standard_project.m4) AC_INIT(x_package_name, x_version, x_bugreport, x_package_name) AM_INIT_AUTOMAKE([1.9 tar-pax]) diff --git a/html/details.php b/html/details.php index d00b108..1f9838a 100644 --- a/html/details.php +++ b/html/details.php @@ -4,9 +4,18 @@ if (!preg_match(',^[a-f0-9]+$,', $container)) exit(1); exec('docker inspect '.$container, $res, $ret); if ($ret!=0) exit(1); $containers=json_decode(join($res), true); -echo "\n"; -echo "\n"; -echo ""; +?> +
+ +
+
NamePortsVolumesLinksEnvironmentsImageCommand
+ + +"; @@ -32,14 +41,23 @@ foreach ($containers as $c) { $envs.="
  • -e ".$env."
  • "; $envs .= ""; $image = $c['Config']['Image']; + $command = ""; if ($c['Config']['Cmd']) $command = join(" ", $c['Config']['Cmd']); $status="dead"; if ($c['State']['Dead']) $status = "dead"; elseif ($c['State']['Restarting']) $status = "restarted"; elseif ($c['State']['Paused']) $status = "paused"; elseif ($c['State']['Running']) $status = "running"; - echo "\n"; + echo ''."\n"; } echo "
    NamePortsVolumesLinksEnvironmentsImageCommand
    docker run -d --name ${name}${ports}${volumes}${links}${envs}${image}${command}
    '.$name.''.$ports.''.$volumes.''.$links.''.$envs.''.$image.''.$command.'
    "; -echo "
    \n".join("\n", $res)."\n
    " +echo'
    '; +exec('docker logs '.$container, $logs, $ret); +echo "
    \n".join("\n", $logs)."\n
    "; +echo'
    '; +echo "
    \n".join("\n", $res)."\n
    "; +echo'
    '; ?> + diff --git a/html/index.html.in b/html/index.html.in index 05012dc..a6b3780 100644 --- a/html/index.html.in +++ b/html/index.html.in @@ -4,7 +4,9 @@ + + ServiceDock: Docker as a Service @@ -16,13 +18,13 @@

    ServiceDock @PACKAGE_VERSION@ - Docker as a Service

    [unknown] - +
    -