8 Commits

Author SHA1 Message Date
192d2ce3a8 Update .drone.yml
Some checks reported errors
continuous-integration/drone/push Build was killed
continuous-integration/drone/tag Build was killed
2025-03-28 15:07:35 +00:00
490503f476 upgrade changes
Some checks reported errors
continuous-integration/drone/push Build was killed
2025-03-26 20:04:08 +01:00
184ec08938 Merge branch 'main' of ssh://git.format.hu/safebox/web-installer
Some checks reported errors
continuous-integration/drone/push Build was killed
2025-03-26 13:00:04 +01:00
75b2212f8f search for updates 2025-03-26 12:59:53 +01:00
c745c05eb5 Update .drone.yml
All checks were successful
continuous-integration/drone/push Build is passing
2025-03-22 15:56:59 +00:00
7377f5290c change service table id
All checks were successful
continuous-integration/drone/push Build is passing
2025-03-19 14:15:58 +01:00
594a430eb9 check_upgrade
All checks were successful
continuous-integration/drone/push Build is passing
2025-03-19 14:12:32 +01:00
ae4a031584 change update service name 2025-03-19 14:08:58 +01:00
4 changed files with 30 additions and 16 deletions

View File

@@ -6,10 +6,9 @@ node_selector:
physical-node: dev1
trigger:
branch:
- main
event:
- push
- tag
workspace:
path: /drone/src
@@ -30,6 +29,9 @@ steps:
platforms:
- linux/amd64
- linux/arm64
when:
event:
- push
- name: pull image to dockerhub
image: docker.io/owncloudci/drone-docker-buildx:4
@@ -44,4 +46,7 @@ steps:
from_secret: dockerhub-password
platforms:
- linux/amd64
- linux/arm64
- linux/arm64
when:
event:
- tag

View File

@@ -127,7 +127,7 @@ function get_vpn_url($domain,$passkey) {
}
function show_service($name, $containers) {
$str = '<table id="'.$name.'">';
$str = '<table id="service_'.$name.'">';
$str .= "<tr><th>{$name}</th></tr>";
$containers = trim($containers);
$arr = explode("|",$containers);
@@ -141,14 +141,14 @@ function show_service($name, $containers) {
}
function show_service_update($name, $update, $uptodate) {
$str = '<table id="'.$name.'">';
$str = '<table id="update_'.$name.'">';
$str .= "<tr><th>{$name}</th></tr>";
$update = trim($update);
if (!empty($update)) {
$arr = explode(" ",$update);
foreach ($arr as $container) {
$str .= "<tr><td>&nbsp;</td><td>".$container."</td><td>UPDATE AVAILABLE</td><td><a href=\"#\" onclick=\"update('{$name}')\">UPDATE</a></td></tr>";
$str .= "<tr><td>&nbsp;</td><td>".$container."</td><td>UPDATE AVAILABLE</td><td><a href=\"#\" onclick=\"upgrade('{$name}')\">UPDATE</a></td></tr>";
}
}

View File

@@ -106,8 +106,10 @@
<fieldset>
<legend>Updates</legend>
<div style="text-align:left">
<a href="javascript:void()" id="update_btn">Search for updates</a>
</div>
<div id="updates" style="text-align:left">
<a href="javascript:void()" id="update_btn">Search updates</a>
</div>
</fieldset>
<br>
@@ -277,17 +279,24 @@ function get_updates() {
});
}
function update(service) {
if (service=='framework') {
framework_upgrade();
}
else alert(service+' update under construction');
function check_upgrade() {
var url = 'scan.php?op=check_upgrade';
jQuery.get(url, function(data) {
console.log('check_upgrade: '+data);
if (data=="WAIT" || data=="") {
setTimeout(check_upgrade, 1000);
}
else {
// TODO
}
});
}
function framework_upgrade() {
var url = 'scan.php?op=upgrade';
function upgrade(service) {
var url = 'scan.php?op=upgrade&service='+service;
console.log('upgrade start: '+service);
jQuery.get(url, function(data) {
console.log('framework upgrade: '+data);
console.log('upgrade end: '+service);
if (data=="OK") {
setTimeout(check_upgrade, 1000);
}

View File

@@ -389,7 +389,7 @@ switch ($_GET["op"]) {
else echo "WAIT";
break;
case "upgrade":
$arr = array("NAME" => "framework", "ACTION" => "upgrade");
$arr = array("NAME" => $_GET["service"], "ACTION" => "upgrade");
$json = json_encode($arr, JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT);
if (set_output("upgrade",$json)) echo "OK";