mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-03-07 10:30:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

improve Docker mkdir permissions so nginx can access files

Browse Source
This commit is contained in:
Eric Schultz
2017-03-23 11:42:06 -05:00
parent b694c29937
commit 5882bb554a
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/dynamix.docker.manager/include/DockerClient.php
View File

@@ -27,7 +27,7 @@ $dockerManPaths = [
#load emhttp variables if needed.
if (!isset($var)) {
if (!is_file("$docroot/state/var.ini")) shell_exec("wget -qO /dev/null localhost:$(lsof -nPc emhttp | grep -Po 'TCP[^\d]*\K\d+')");
if (!is_file("$docroot/state/var.ini")) shell_exec("wget -qO /dev/null 127.0.0.1:$(lsof -i -P -sTCP:LISTEN|grep -Pom1 '^emhttp.*:\K\d+')");
$var = @parse_ini_file("$docroot/state/var.ini");
}
if (!isset($eth0) && is_file("$docroot/state/network.ini")) {
@@ -88,7 +88,7 @@ class DockerTemplates {
$dirs[] = $type;
}
foreach ($dirs as $dir) {
if (!is_dir($dir)) @mkdir($dir, 0770, true);
if (!is_dir($dir)) @mkdir($dir, 0755, true);
$tmpls = array_merge($tmpls, $this->listDir($dir, "xml"));
}
return $tmpls;
@@ -362,8 +362,8 @@ class DockerTemplates {
preg_match_all("/(.*?):([\w]*$)/i", $Repository, $matches);
$tempPath = sprintf("%s/%s-%s-%s.png", $dockerManPaths['images-ram'], preg_replace('%\/|\\\%', '-', $matches[1][0]), $matches[2][0], 'icon');
$storagePath = sprintf("%s/%s-%s-%s.png", $dockerManPaths['images-storage'], preg_replace('%\/|\\\%', '-', $matches[1][0]), $matches[2][0], 'icon');
if (!is_dir(dirname($tempPath))) @mkdir(dirname($tempPath), 0770, true);
if (!is_dir(dirname($storagePath))) @mkdir(dirname($storagePath), 0770, true);
if (!is_dir(dirname($tempPath))) @mkdir(dirname($tempPath), 0755, true);
if (!is_dir(dirname($storagePath))) @mkdir(dirname($storagePath), 0755, true);
if (!is_file($tempPath)) {
if (!is_file($storagePath)) {
$this->download_url($imgUrl, $storagePath);
@@ -992,7 +992,7 @@ class DockerUtil {
public static function saveJSON($path, $content) {
if (!is_dir(dirname($path))) @mkdir(dirname($path), 0770, true);
if (!is_dir(dirname($path))) @mkdir(dirname($path), 0755, true);
return file_put_contents($path, json_encode($content, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
}