getting there
need to wait for another round of updates to containers
This commit is contained in:
Squidly271
parent
aef79c3484
commit
ebaeb81ee5
Binary file not shown.
@ -79,10 +79,17 @@ if ( is_file($caPaths['addConverted']) ) {
|
||||
}
|
||||
$date = (date("n/d"));
|
||||
|
||||
// Check for updates to apps (run in background)
|
||||
// Force check for updates to apps (run in background) - Only check once per day when entering in CA
|
||||
|
||||
exec("echo '$docroot/plugins/dynamix.docker.manager/scripts/dockerupdate check nonotify > /dev/null 2>&1' | at now >/dev/null");
|
||||
exec("echo '$docroot/plugins/dynamix.plugin.manager/scripts/plugin checkall > /dev/null 2>&1' | at now >/dev/null");
|
||||
if ( ( time() - @filemtime("/tmp/plugins/community.applications.plg") ) > 86400 ) {
|
||||
exec("echo '$docroot/plugins/dynamix.docker.manager/scripts/dockerupdate check nonotify > /dev/null 2>&1' | at now >/dev/null");
|
||||
foreach (glob("/var/log/plugins/*.plg") as $plg) {
|
||||
if ( $plg == "/var/log/plugins/community.applications.plg" || $plg == "unRAIDServer.plg" )
|
||||
continue; // avoid possible race condition
|
||||
|
||||
exec("echo '$docroot/plugins/dynamix.plugin.manager/scripts/plugin check ".basename($plg)." > /dev/null 2>&1' | at now >/dev/null");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
function tr($string,$ret=false) {
|
||||
@ -264,7 +271,7 @@ $(function(){
|
||||
if ( popupVisible(this) ) return;
|
||||
var container = $(this).attr("data-name");
|
||||
var docker = [container];
|
||||
openBox('/plugins/community.applications/scripts/installMulti.php&upgrade=true&docker='+container,"<?tr('Update Container')?>",600,900,true,"refreshDisplay");
|
||||
openBox('/plugins/<?=$plugin?>/scripts/installMulti.php?upgrade=true&docker='+docker,"<?tr('Update Container')?>",600,900,true,"refreshDisplay");
|
||||
});
|
||||
|
||||
$('.mainArea').on("click",".ca_href",function() {
|
||||
@ -966,17 +973,17 @@ function popupVisible(el) {
|
||||
return $(".popupHolder").is(":visible");
|
||||
}
|
||||
|
||||
function installPlugin(pluginURL,popup=false) {
|
||||
function installPlugin(pluginURL,popup=false,update=false) {
|
||||
if ( ! popup)
|
||||
if ( popupVisible() )
|
||||
return;
|
||||
|
||||
type = update ? "update" : "install";
|
||||
$(".tooltipstered").tooltipster("hide");
|
||||
disableSearch();
|
||||
<? if ( $translations ): ?>
|
||||
openBox('/plugins/community.applications/scripts/pluginInstall.sh&arg1=install&arg2='+pluginURL,"<?tr('Install Plugin')?>",600,900,true,"refreshDisplay");
|
||||
openBox('/plugins/community.applications/scripts/pluginInstall.sh&arg1='+type+'&arg2='+pluginURL,"<?tr('Install Plugin')?>",600,900,true,"refreshDisplay");
|
||||
<? else: ?>
|
||||
my_openBox('/plugins/community.applications/scripts/pluginInstall.sh&arg1=install&arg2='+pluginURL,"<?tr('Install Plugin')?>",600,900,true,"refreshDisplay");
|
||||
my_openBox('/plugins/community.applications/scripts/pluginInstall.sh&arg1='+type+'&arg2='+pluginURL,"<?tr('Install Plugin')?>",600,900,true,"refreshDisplay");
|
||||
<? endif; ?>
|
||||
}
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
767d6f2203fed9541daeb57bbf7b58b3 ./Apps.page
|
||||
83b3f89cd42e8601c7c217d5b4889c81 ./CA_notices.page
|
||||
a1d4483fcfb8794def67cafab1cd4a06 ./CommunityApps.page
|
||||
1a90c8b77cb75f79d57b1a9b2285add4 ./CommunityApps.page
|
||||
6db73582f22dab13d329e862067ee84e ./PluginAPI.page
|
||||
b398273cf7daa62ab00d2de2336ca25f ./README.md
|
||||
a9d4cd0e4e1f37cbe3806b952a96ddb1 ./ca_settings.page
|
||||
@ -17,9 +17,9 @@ e1b21f84d170c618893784002be3e4ad ./include/exec.php
|
||||
eb76c1b6ed3da5e5b393f22d2ec18430 ./javascript/libraries.js
|
||||
e29c13353bc1277fc2c3597782d7c954 ./skins/Narrow/css.php
|
||||
adc2d62d429accb264cedad58e6ef7a5 ./skins/Narrow/skin.html
|
||||
cea67529c80395912bbca3f522921d48 ./skins/Narrow/skin.php
|
||||
01a2b427ddd0eb019d7166d1356037fe ./skins/Narrow/skin.php
|
||||
430966e5646376b62905b63a30de7102 ./scripts/PluginAPI.php
|
||||
195dd26d8a21d879aafad0e20851b8d3 ./scripts/installMulti.php
|
||||
cef8c79608f95fff58473bc65af2525f ./scripts/installMulti.php
|
||||
ce2c904b6a40c4677a3ff3484776959e ./scripts/installMultiPlugin.sh
|
||||
524afab04ca930f59117a846f819fb2f ./scripts/installPluginUpdate.sh
|
||||
5846421e95b475e1156c3f68164ccc4f ./scripts/languageInstall.sh
|
||||
|
||||
@ -15,19 +15,36 @@ if ( $translations ) {
|
||||
require_once "$docroot/plugins/community.applications/include/paths.php";
|
||||
require_once "$docroot/plugins/dynamix/include/Wrappers.php";
|
||||
require_once "$docroot/plugins/community.applications/include/helpers.php";
|
||||
require_once "$docroot/plugins/dynamix.docker.manager/include/DockerClient.php";
|
||||
|
||||
$caSettings['dockerRunning'] = true;
|
||||
$unRaidVersion = parse_ini_file($caPaths['unRaidVersion']);
|
||||
$translations = is_file("$docroot/plugins/dynamix/include/Translations.php");
|
||||
|
||||
$DockerClient = new DockerClient();
|
||||
$DockerTemplates = new DockerTemplates();
|
||||
|
||||
$running = getRunningContainers();
|
||||
|
||||
$exeFile = "/usr/local/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php";
|
||||
$javascript = file_get_contents("/usr/local/emhttp/plugins/dynamix/javascript/dynamix.js");
|
||||
echo "<script>$javascript</script>";
|
||||
|
||||
$dockers = explode(",",$_GET['docker']);
|
||||
if ( $_GET['upgrade'] ) {
|
||||
foreach ( $dockers as $container ) {
|
||||
if ( $running[$container]['running'] ) {
|
||||
echo "Stopping $container...\n";
|
||||
myStopContainer($running[$container]['Id']);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ( $_GET['docker'] ) {
|
||||
echo "<div id='output'>";
|
||||
$dockers = explode(",",$_GET['docker']);
|
||||
|
||||
$msg = $_GET['upgrade'] ? "Upgrading docker application %s" : "Installing docker applications %s";
|
||||
echo sprintf(tr($msg)),str_replace(",",", ",$_GET['docker']))."<br>";
|
||||
echo sprintf(tr($msg),str_replace(",",", ",$_GET['docker']))."<br>";
|
||||
$_GET['updateContainer'] = true;
|
||||
$_GET['ct'] = $dockers;
|
||||
$_GET['communityApplications'] = true;
|
||||
@ -104,6 +121,13 @@ function addCloseButton() {
|
||||
echo "<script>top.Shadowbox.close();</script>";
|
||||
}
|
||||
@unlink("/tmp/community.applications/tempFiles/newCreateDocker.php");
|
||||
} else {
|
||||
foreach ( $dockers as $container ) {
|
||||
if ( $running[$container]['running'] ) {
|
||||
passthru("docker start $container");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
?>
|
||||
@ -211,7 +211,7 @@ function my_display_apps($file,$pageNumber=1,$selectedApps=false,$startup=false)
|
||||
$template['display_pluginInstallIcon'] = "<a style='cursor:pointer' class='ca_tooltip ca_fa-install appIcons' title='".tr("Install plugin")."' onclick=installPlugin('{$template['PluginURL']}');></a>";
|
||||
}
|
||||
if ( $template['UpdateAvailable'] ) {
|
||||
$template['display_pluginUpdate'] = "<a style='cursor:pointer' class='ca_tooltip ca_fa-update appIcons ca_href' title='".tr("Update plugin")."' data-target='_self' data-href='/Apps/Plugins'></a>";
|
||||
$template['display_pluginUpdate'] = "<a style='cursor:pointer' class='ca_tooltip ca_fa-update appIcons updatePlugin' title='".tr("Update plugin")."' onclick=installPlugin('$pluginName',false,true);></a>";
|
||||
}
|
||||
} else {
|
||||
if ( $caSettings['dockerRunning'] ) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user