Update .drone.yml

.drone.yml

@@ -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
@@ -45,3 +47,6 @@ steps:
       platforms:
         - linux/amd64
         - linux/arm64
+    when:  
+      event:
+        - tag

functions.php

@@ -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>UPDATE</td></tr>";
+			$str .= "<tr><td>&nbsp;</td><td>".$container."</td><td>UPDATE AVAILABLE</td><td><a href=\"#\" onclick=\"upgrade('{$name}')\">UPDATE</a></td></tr>";
 		}
 	}
 

manage.html

@@ -66,7 +66,8 @@
 		</div>
 		<div class="row">
 		    <div class="mb-3">
-			<button class="btn btn-lg btn-primary btn-block" type="submit" id="vpn_save_btn"> Save </button>
+			<button class="btn btn-lg btn-primary btn-block" type="submit" id="vpn_save_btn"> Save </button> &nbsp;
+			<button class="btn btn-lg btn-primary btn-block" type="button" id="vpn_cancel_btn"> Cancel </button>
 		    </div>
 		</div>
 	</form>
@@ -105,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>
@@ -276,6 +279,30 @@ function get_updates() {
   });
 }
 
+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 upgrade(service) {
+  var url  = 'scan.php?op=upgrade&service='+service;
+  console.log('upgrade start: '+service);
+  jQuery.get(url, function(data) {
+        console.log('upgrade end: '+service);
+          if (data=="OK") {
+                setTimeout(check_upgrade, 1000);
+          }
+  });
+}
+
 function load_template(additional) {
 
   jQuery("div.deployment").each(function(index) {
@@ -472,6 +499,10 @@ jQuery(document).ready(function(){
 		jQuery('#settings').hide();
 	});
 
+	jQuery('#vpn_cancel_btn').click(function() {
+		jQuery('#vpn').hide();
+	});
+
 	jQuery('#update_btn').click(function() {
 		jQuery('#updates').html('Looking for updates... Please wait...');
 		get_updates();

scan.php

@@ -230,11 +230,11 @@ switch ($_GET["op"]) {
 							echo "
 							<div class=\"mb-3\" style=\"margin-left:30px;\">
 							<button class=\"btn btn-lg btn-primary btn-block\" type=\"button\" id=\"uninstall_{$template->name}_btn\" onclick=\"uninstall('{$template->name}')\">Uninstall</button>
-							</div>
-							<div class=\"mb-3\" style=\"margin-left:30px;\">
-							<button class=\"btn btn-lg btn-primary btn-block\" type=\"button\" id=\"cancel_{$template->name}_btn\">Cancel</button>
 							</div>";
 						}
+						echo "<div class=\"mb-3\" style=\"margin-left:30px;\">
+						<button class=\"btn btn-lg btn-primary btn-block\" type=\"button\" id=\"cancel_{$template->name}_btn\">Cancel</button>
+						</div>";
                                                 echo "
                                                 </div>
                                                 </form></fieldset>
@@ -376,7 +376,25 @@ switch ($_GET["op"]) {
                 }
                 echo $text;
         break;
+        case "check_upgrade":
+                $arr = check_response("upgrade");
+                if (!empty($arr)) {
+                        foreach ($arr as $key=>$data) {
+                                if ($key=="upgrade") {
+                                        var_dump($arr);
+                                        //remove_response("$key");
+                                }
+                        }
+                }
+                else echo "WAIT";
+        break;
+        case "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";
+                else echo "ERROR";
+        break;
 	case "repositories":
 		$arr = array("STATUS" => 0);
 		$json = json_encode($arr, JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT);