causefx пре 7 година
родитељ
комит
f9db4c3b55
3 измењених фајлова са 8 додато и 9 уклоњено
  1. 4 5
      api/functions/organizr-functions.php
  2. 2 2
      api/index.php
  3. 2 2
      js/functions.js

+ 4 - 5
api/functions/organizr-functions.php

@@ -2023,10 +2023,9 @@ function settingsPathChecks()
 	return $result . $items;
 }
 
-function rebootDocker()
+function dockerUpdate()
 {
-	$output = '';
-	$return_var = '';
-	exec('reboot', $output, $return_var);
-	return $output . ' - ' . $return_var;
+	chdir('/etc/cont-init.d/');
+	$dockerUpdate = shell_exec('./30-install');
+	return $dockerUpdate;
 }

+ 2 - 2
api/index.php

@@ -1274,13 +1274,13 @@ switch ($function) {
 				break;
 		}
 		break;
-	case 'v1_reboot_docker':
+	case 'v1_docker_update':
 		switch ($method) {
 			case 'GET':
 				if (qualifyRequest(1)) {
 					$result['status'] = 'success';
 					$result['statusText'] = 'success';
-					$result['data'] = rebootDocker();
+					$result['data'] = dockerUpdate();
 				} else {
 					$result['status'] = 'error';
 					$result['statusText'] = 'API/Token invalid or not set';

+ 2 - 2
js/functions.js

@@ -3107,10 +3107,10 @@ function countdown(remaining) {
 	$('#update-seconds').text(remaining);
     setTimeout(function(){ countdown(remaining - 1); }, 1000);
 }
-function rebootDocker(){
+function dockerUpdate(){
     if(activeInfo.settings.misc.docker){
         messageSingle(window.lang.translate('[DO NOT CLOSE WINDOW]'),window.lang.translate('Starting Update Process'),activeInfo.settings.notifications.position,'#FFF','success','60000');
-        organizrAPI('GET','api/?v1/reboot/docker').success(function(data) {
+        organizrAPI('GET','api/?v1/docker/update').success(function(data) {
             try {
                 var json = JSON.parse(data);
             }catch(e) {