aljaz/flutter_server_box
1
1
Fork 0
mirror of https://github.com/lollipopkit/flutter_server_box.git synced 2025-12-17 07:14:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: bad detection of docker installation on fish

Browse Source
This commit is contained in:
PaperCube
2024-02-13 22:15:00 +00:00
parent 694854a89f
commit 71e6e18e09
2 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/data/model/container/version.dart
View File

@@ -49,7 +49,7 @@ class ContainerdClient {
factory ContainerdClient.fromJson(Map<String, dynamic> json) => factory ContainerdClient.fromJson(Map<String, dynamic> json) =>
ContainerdClient( ContainerdClient(
apiVersion: json["APIVersion"], apiVersion: json["ApiVersion"], // should be ApiVersion?
version: json["Version"], version: json["Version"],
goVersion: json["GoVersion"], goVersion: json["GoVersion"],
gitCommit: json["GitCommit"], gitCommit: json["GitCommit"],

35
lib/data/provider/container.dart
View File

@@ -12,7 +12,8 @@ import 'package:toolbox/data/model/container/version.dart';
import 'package:toolbox/data/res/logger.dart'; import 'package:toolbox/data/res/logger.dart';
import 'package:toolbox/data/res/store.dart'; import 'package:toolbox/data/res/store.dart';
final _dockerNotFound = RegExp(r'command not found|Unknown command'); final _dockerNotFound =
RegExp(r"command not found|Unknown command|Command '\w+' not found");
class ContainerProvider extends ChangeNotifier { class ContainerProvider extends ChangeNotifier {
SSHClient? client; SSHClient? client;
@@ -43,15 +44,44 @@ class ContainerProvider extends ChangeNotifier {
await refresh(); await refresh();
} }
Future<bool> _checkDockerInstalled(SSHClient client) async {
final session = await client.execute("docker");
await session.done;
// print('docker code: ${session.exitCode}');
return session.exitCode == 0;
}
String _removeSudoPrompts(String value) {
final regex = RegExp(r"\[sudo\] password for \w+:");
if (value.startsWith(regex)){
return value.replaceFirstMapped(regex, (match) => "");
}
return value;
}
Future<void> refresh() async { Future<void> refresh() async {
var raw = ''; var raw = '';
var rawErr = '';
print('exec: ${_wrap(ContainerCmdType.execAll(type))}');
await client?.execWithPwd( await client?.execWithPwd(
_wrap(ContainerCmdType.execAll(type)), _wrap(ContainerCmdType.execAll(type)),
context: context, context: context,
onStdout: (data, _) => raw = '$raw$data', onStdout: (data, _) => raw = '$raw$data',
onStderr: (data, _) => raw = '$rawErr$data',
); );
if (raw.contains(_dockerNotFound)) { raw = _removeSudoPrompts(raw);
rawErr = _removeSudoPrompts(rawErr);
print('result raw [$raw, $rawErr]');
final dockerInstalled = await _checkDockerInstalled(client!);
// print("docker installed = $dockerInstalled");
if (!dockerInstalled ||
raw.contains(_dockerNotFound) ||
rawErr.contains(_dockerNotFound)) {
error = ContainerErr(type: ContainerErrType.notInstalled); error = ContainerErr(type: ContainerErrType.notInstalled);
notifyListeners(); notifyListeners();
return; return;
@@ -71,6 +101,7 @@ class ContainerProvider extends ChangeNotifier {
// Parse docker version // Parse docker version
final verRaw = ContainerCmdType.version.find(segments); final verRaw = ContainerCmdType.version.find(segments);
print('version raw = $verRaw\n');
try { try {
final containerVersion = Containerd.fromRawJson(verRaw); final containerVersion = Containerd.fromRawJson(verRaw);
version = containerVersion.client.version; version = containerVersion.client.version;