ExternalVendorCode/balena-cli
1
0
Fork 0
mirror of https://github.com/balena-io/balena-cli.git synced 2025-06-23 10:05:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update dependencies (multibuild, dockerode, docker-toolbelt, docker-progress)

Browse Source 
Update resin-multibuild from 4.7.2 to 4.11.0

Change-type: patch
This commit is contained in:
Paulo Castro
2021-04-27 14:58:54 +01:00
parent d9821939d9
commit 2c922ee6d2
11 changed files with 889 additions and 494 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/commands/scan.ts
View File

@ -1,6 +1,6 @@
/**
* @license
* Copyright 2020 Balena Ltd.
* Copyright 2017-2021 Balena Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -92,13 +92,13 @@ export default class ScanCmd extends Command {
);
const engineReachableDevices: boolean[] = await Promise.all(
localDevices.map(async ({ address }: { address: string }) => {
const docker = dockerUtils.createClient({
const docker = await dockerUtils.createClient({
host: address,
port: dockerPort,
timeout: dockerTimeout,
}) as any;
});
try {
await docker.pingAsync();
await docker.ping();
return true;
} catch (err) {
return false;
@ -132,14 +132,14 @@ export default class ScanCmd extends Command {
// Query devices for info
const devicesInfo = await Promise.all(
developmentDevices.map(async ({ host, address }) => {
const docker = dockerUtils.createClient({
const docker = await dockerUtils.createClient({
host: address,
port: dockerPort,
timeout: dockerTimeout,
}) as any;
});
const [dockerInfo, dockerVersion] = await Promise.all([
docker.infoAsync().catchReturn('Could not get Docker info'),
docker.versionAsync().catchReturn('Could not get Docker version'),
docker.info(),
docker.version(),
]);
return {
host,
@ -165,7 +165,13 @@ export default class ScanCmd extends Command {
});
}
const cmdOutput = productionDevicesInfo.concat(devicesInfo);
const cmdOutput: Array<{
host: string;
address: string;
osVariant: string;
dockerInfo: any;
dockerVersion: import('dockerode').DockerVersion | undefined;
}> = [...productionDevicesInfo, ...devicesInfo];
// Output results
if (!options.json && cmdOutput.length === 0) {