DevInfra/github-local-actions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix regex

Browse Source 
Signed-off-by: Sanjula Ganepola <sanjulagane@gmail.com>
This commit is contained in:
Sanjula Ganepola
2024-11-26 00:38:43 -05:00
parent a60b1c697f
commit e15b7bb71f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/componentsManager.ts
View File

@@ -34,7 +34,7 @@ export enum ExtensionStatus {
export class ComponentsManager { export class ComponentsManager {
static actVersionRegExp: RegExp = /act version (.+)/; static actVersionRegExp: RegExp = /act version (.+)/;
static dockerVersionRegExp: RegExp = /Client:\n(.+\n)?\sVersion:\s+(.+)/; static dockerVersionRegExp: RegExp = /Docker Engine Version:\s(.+)/;
async getComponents(): Promise<Component<CliStatus | ExtensionStatus>[]> { async getComponents(): Promise<Component<CliStatus | ExtensionStatus>[]> {
const components: Component<CliStatus | ExtensionStatus>[] = []; const components: Component<CliStatus | ExtensionStatus>[] = [];
@@ -129,7 +129,7 @@ export class ComponentsManager {
} }
}); });
const dockerCliInfo = await this.getCliInfo('docker version', ComponentsManager.dockerVersionRegExp, true, true); const dockerCliInfo = await this.getCliInfo(`docker version --format "Docker Engine Version: {{.Client.Version}}"`, ComponentsManager.dockerVersionRegExp, true, true);
const dockerDesktopPath = ConfigurationManager.get<string>(Section.dockerDesktopPath); const dockerDesktopPath = ConfigurationManager.get<string>(Section.dockerDesktopPath);
components.push({ components.push({
name: 'Docker Engine', name: 'Docker Engine',
@@ -187,7 +187,7 @@ export class ComponentsManager {
await delay(4000); await delay(4000);
// Check again for docker status // Check again for docker status
const newDockerCliInfo = await this.getCliInfo('docker version', ComponentsManager.dockerVersionRegExp, true, true); const newDockerCliInfo = await this.getCliInfo(`docker version --format "Docker Engine Version: {{.Client.Version}}"`, ComponentsManager.dockerVersionRegExp, true, true);
if (dockerCliInfo.status !== newDockerCliInfo.status) { if (dockerCliInfo.status !== newDockerCliInfo.status) {
componentsTreeDataProvider.refresh(); componentsTreeDataProvider.refresh();
} else { } else {
@@ -241,7 +241,7 @@ export class ComponentsManager {
await delay(4000); await delay(4000);
// Check again for docker status // Check again for docker status
const newDockerCliInfo = await this.getCliInfo('docker version', ComponentsManager.dockerVersionRegExp, true, true); const newDockerCliInfo = await this.getCliInfo(`docker version --format "Docker Engine Version: {{.Client.Version}}"`, ComponentsManager.dockerVersionRegExp, true, true);
if (dockerCliInfo.status !== newDockerCliInfo.status) { if (dockerCliInfo.status !== newDockerCliInfo.status) {
componentsTreeDataProvider.refresh(); componentsTreeDataProvider.refresh();
} }