diff --git a/archive/community.applications-2021.07.09-x86_64-1.txz b/archive/community.applications-2021.07.09-x86_64-1.txz new file mode 100644 index 00000000..7d30c4bf Binary files /dev/null and b/archive/community.applications-2021.07.09-x86_64-1.txz differ diff --git a/source/community.applications/usr/local/emhttp/plugins/community.applications/CommunityApps.page b/source/community.applications/usr/local/emhttp/plugins/community.applications/CommunityApps.page index b7d13866..7856b124 100644 --- a/source/community.applications/usr/local/emhttp/plugins/community.applications/CommunityApps.page +++ b/source/community.applications/usr/local/emhttp/plugins/community.applications/CommunityApps.page @@ -263,7 +263,8 @@ $(function(){ $('.mainArea').on("click",".dockerUpdate",function() { if ( popupVisible(this) ) return; var container = $(this).attr("data-name"); - updateContainer(container); + var docker = [container]; + openBox('/plugins/community.applications/scripts/installMulti.php&upgrade=true&docker='+container,"",600,900,true,"refreshDisplay"); }); $('.mainArea').on("click",".ca_href",function() { diff --git a/source/community.applications/usr/local/emhttp/plugins/community.applications/ca.md5 b/source/community.applications/usr/local/emhttp/plugins/community.applications/ca.md5 index 9474c806..3bb1b4f2 100644 --- a/source/community.applications/usr/local/emhttp/plugins/community.applications/ca.md5 +++ b/source/community.applications/usr/local/emhttp/plugins/community.applications/ca.md5 @@ -1,6 +1,6 @@ 767d6f2203fed9541daeb57bbf7b58b3 ./Apps.page 83b3f89cd42e8601c7c217d5b4889c81 ./CA_notices.page -1b0c503ba117ce02c544f64bbbb226b1 ./CommunityApps.page +a1d4483fcfb8794def67cafab1cd4a06 ./CommunityApps.page 6db73582f22dab13d329e862067ee84e ./PluginAPI.page b398273cf7daa62ab00d2de2336ca25f ./README.md a9d4cd0e4e1f37cbe3806b952a96ddb1 ./ca_settings.page @@ -19,7 +19,7 @@ e29c13353bc1277fc2c3597782d7c954 ./skins/Narrow/css.php adc2d62d429accb264cedad58e6ef7a5 ./skins/Narrow/skin.html cea67529c80395912bbca3f522921d48 ./skins/Narrow/skin.php 430966e5646376b62905b63a30de7102 ./scripts/PluginAPI.php -e474ec681bf833969bffcf19baed2b0c ./scripts/installMulti.php +195dd26d8a21d879aafad0e20851b8d3 ./scripts/installMulti.php ce2c904b6a40c4677a3ff3484776959e ./scripts/installMultiPlugin.sh 524afab04ca930f59117a846f819fb2f ./scripts/installPluginUpdate.sh 5846421e95b475e1156c3f68164ccc4f ./scripts/languageInstall.sh diff --git a/source/community.applications/usr/local/emhttp/plugins/community.applications/scripts/installMulti.php b/source/community.applications/usr/local/emhttp/plugins/community.applications/scripts/installMulti.php index 9c5bef9a..7fc19ba4 100644 --- a/source/community.applications/usr/local/emhttp/plugins/community.applications/scripts/installMulti.php +++ b/source/community.applications/usr/local/emhttp/plugins/community.applications/scripts/installMulti.php @@ -26,7 +26,8 @@ echo ""; if ( $_GET['docker'] ) { echo "
"; $dockers = explode(",",$_GET['docker']); - echo sprintf(tr("Installing docker applications %s"),str_replace(",",", ",$_GET['docker']))."
"; + $msg = $_GET['upgrade'] ? "Upgrading docker application %s" : "Installing docker applications %s"; + echo sprintf(tr($msg)),str_replace(",",", ",$_GET['docker']))."
"; $_GET['updateContainer'] = true; $_GET['ct'] = $dockers; $_GET['communityApplications'] = true; @@ -69,38 +70,40 @@ function addCloseButton() { } $docker")."
"; - unset($output); - exec("docker start $docker 2>&1",$output,$retval); - if ($retval) { - $failFlag = true; - echo sprintf(tr("%s failed to start. You should install it by itself to fix the errors"),"$docker")."
"; - foreach ($output as $line) { - echo "$line
"; + if ( ! $_GET['upgrade'] ) { + foreach ($dockers as $docker) { + echo sprintf(tr("Starting %s"),"$docker")."
"; + unset($output); + exec("docker start $docker 2>&1",$output,$retval); + if ($retval) { + $failFlag = true; + echo sprintf(tr("%s failed to start. You should install it by itself to fix the errors"),"$docker")."
"; + foreach ($output as $line) { + echo "$line
"; + } + echo "
"; } - echo "
"; } - } - echo "
".tr("Setting installed applications to autostart")."
"; - $autostartFile = @file("/var/lib/docker/unraid-autostart",FILE_IGNORE_NEW_LINES); - if ( ! $autostartFile ) { - $autostartFile = array(); - } - foreach ($autostartFile as $line) { - $autostart[$line] = true; - } - foreach ($dockers as $docker) { - $autostart[$docker] = true; - } - $autostartFile = implode("\n",array_keys($autostart)); - file_put_contents("/var/lib/docker/unraid-autostart",$autostartFile); + echo "
".tr("Setting installed applications to autostart")."
"; + $autostartFile = @file("/var/lib/docker/unraid-autostart",FILE_IGNORE_NEW_LINES); + if ( ! $autostartFile ) { + $autostartFile = array(); + } + foreach ($autostartFile as $line) { + $autostart[$line] = true; + } + foreach ($dockers as $docker) { + $autostart[$docker] = true; + } + $autostartFile = implode("\n",array_keys($autostart)); + file_put_contents("/var/lib/docker/unraid-autostart",$autostartFile); - if ( $failFlag || !$_GET['plugin']) { - echo "
".tr("Docker Application Installation finished")."
"; - } else { - echo ""; + if ( $failFlag || !$_GET['plugin']) { + echo "
".tr("Docker Application Installation finished")."
"; + } else { + echo ""; + } + @unlink("/tmp/community.applications/tempFiles/newCreateDocker.php"); } - @unlink("/tmp/community.applications/tempFiles/newCreateDocker.php"); } ?> \ No newline at end of file