Merge remote-tracking branch 'causefx/v2-develop' into netdata-tweaks

api/config/default.php

@@ -381,4 +381,5 @@ return array(
 	'netdata4Enabled' => false,
 	'netdata5Enabled' => false,
 	'netdata6Enabled' => false,
+	'netdata7Enabled' => false
 );

api/functions/organizr-functions.php

@@ -2640,9 +2640,14 @@ function settingsPathChecks()
 
 function dockerUpdate()
 {
+	$dockerUpdate = null;
 	chdir('/etc/cont-init.d/');
-	$dockerUpdate = shell_exec('./30-install');
-	return $dockerUpdate;
+	if (file_exists('./30-install')) {
+		$dockerUpdate = shell_exec('./30-install');
+	} elseif (file_exists('./40-install')) {
+		$dockerUpdate = shell_exec('./40-install');
+	}
+	return $dockerUpdate ?? 'Update Failed';
 }
 
 function windowsUpdate()