Skip to content

Commit

Permalink
Change how docker checked if running
Browse files Browse the repository at this point in the history
Handles edge case where the docker image is mounted, but docker itself
isn't running.
  • Loading branch information
Squidly271 committed Nov 25, 2017
1 parent 7b7f034 commit a2e0247
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
Binary file modified archive/community.applications-2017.11.25.txz
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
$officialRepo = str_replace("*","'",$communitySettings['favourite']);
$separateOfficial = true;
}
if ( is_dir("/var/lib/docker/containers") ) {
if ( is_file("/var/run/dockerd.pid") && is_dir("/proc/".@file_get_contents("/var/run/dockerd.pid")) ) {
$communitySettings['dockerRunning'] = "true";
} else {
$communitySettings['dockerSearch'] = "no";
Expand Down Expand Up @@ -1576,6 +1576,9 @@ function displaySearchResults($pageNumber,$viewMode) {
# now correlate that to a template;
# this section handles containers that have not been renamed from the appfeed
$all_files = glob("/boot/config/plugins/dockerMan/templates-user/*.xml");
if ( ! $all_files ) {
$all_files = array();
}
if ( $installed == "true" ) {
foreach ($info as $installedDocker) {
$installedImage = $installedDocker['Image'];
Expand Down

0 comments on commit a2e0247

Please sign in to comment.