iniApp
/
podmanImageManager
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
sbyrd 2020-12-18 22:10:12 -05:00
parent ef7d996bf4 b5c0c0e180
commit f14b92ad46
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
image.php
View File

@ -19,6 +19,7 @@ class image extends objectStructs
public function __construct($vars) public function __construct($vars)
{ {
$this->Log(__FUNCTION__ . " load image object with: ".print_r($vars,true));
if (is_array($vars)) if (is_array($vars))
{ {
$this->imageName = (isset($vars['image']) ? $vars['image'] : $this->imageName = (isset($vars['image']) ? $vars['image'] :
@ -38,6 +39,8 @@ class image extends objectStructs
$annotations = $vars['imageBasic']->annotations; $annotations = $vars['imageBasic']->annotations;
elseif (isset($vars['annotations'])) elseif (isset($vars['annotations']))
$annotations = $vars['annotations']; $annotations = $vars['annotations'];
else
$annotations = array();
$this->annotations = new imageAnnotations($annotations); $this->annotations = new imageAnnotations($annotations);
if (isset($vars['imageConfig'])) if (isset($vars['imageConfig']))

10
imageAnnotations.php
View File

@ -19,10 +19,12 @@ class imageAnnotations extends objectStructs
public function __construct($Result = null) public function __construct($Result = null)
{ {
parent::__construct($Result); parent::__construct($Result);
if ($this->roles and empty($this->roles) )
{ $this->Log(__FUNCTION__ . " Load imageAnnotations with".print_r($Result,true));
$this->roles = explode(',',$this->roles); if (is_string($Result->roles))
} $this->roles = explode(',',$Result->roles);
} }
public function hasRole( string $Role) public function hasRole( string $Role)

3
podmanImageManager.php
View File

@ -114,6 +114,7 @@ class podmanImageManager implements podmanImageManagerInterface
try { try {
$ImageRaw = $this->doRequest($ImageManifestURL, null, array('Accept: application/vnd.oci.image.manifest.v1+json'),true); $ImageRaw = $this->doRequest($ImageManifestURL, null, array('Accept: application/vnd.oci.image.manifest.v1+json'),true);
// echo "<br> image maniest<br><pre>".print_r($ImageRaw,true)."</pre>"; // echo "<br> image maniest<br><pre>".print_r($ImageRaw,true)."</pre>";
} }
catch (\Exception $e) catch (\Exception $e)
{ {
@ -130,6 +131,8 @@ class podmanImageManager implements podmanImageManagerInterface
$Image = new image( array('name'=>$ImageNameComplete, 'imageBasic'=>$ImageRaw, 'imageConfig'=>$ImageConfigRaw)); $Image = new image( array('name'=>$ImageNameComplete, 'imageBasic'=>$ImageRaw, 'imageConfig'=>$ImageConfigRaw));
if ($Image) if ($Image)
{ {
file_put_contents('/var/www/vhosts/whmcsbeta.u2-web.com/httpdocs/modules/servers/iniApp_WHMCS/log.txt', "image: ".print_r($Image,true), FILE_APPEND);
if ($imageTag === $tag ) if ($imageTag === $tag )
return $Image; return $Image;
} }