Merge pull request #57 from crazy-max/fix-docker-context

docker: fix context command

__tests__/buildkit/buildkit.test.ts

@@ -32,9 +32,9 @@ jest.spyOn(Builder.prototype, 'inspect').mockImplementation(async (): Promise<Bu
     lastActivity: new Date('2023-01-16 09:45:23 +0000 UTC'),
     nodes: [
       {
-        buildkitVersion: 'v0.11.0',
-        buildkitdFlags: '--debug --allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host',
-        driverOpts: ['BUILDKIT_STEP_LOG_MAX_SIZE=10485760', 'BUILDKIT_STEP_LOG_MAX_SPEED=10485760', 'JAEGER_TRACE=localhost:6831', 'image=moby/buildkit:latest', 'network=host'],
+        buildkit: 'v0.11.0',
+        'buildkitd-flags': '--debug --allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host',
+        'driver-opts': ['BUILDKIT_STEP_LOG_MAX_SIZE=10485760', 'BUILDKIT_STEP_LOG_MAX_SPEED=10485760', 'JAEGER_TRACE=localhost:6831', 'image=moby/buildkit:latest', 'network=host'],
         endpoint: 'unix:///var/run/docker.sock',
         name: 'builder20',
         platforms: 'linux/amd64,linux/amd64/v2,linux/amd64/v3,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6',

__tests__/buildx/builder.test.ts

@@ -35,9 +35,9 @@ jest.spyOn(Builder.prototype, 'inspect').mockImplementation(async (): Promise<Bu
     lastActivity: new Date('2023-01-16 09:45:23 +0000 UTC'),
     nodes: [
       {
-        buildkitVersion: 'v0.11.0',
-        buildkitdFlags: '--debug --allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host',
-        driverOpts: ['BUILDKIT_STEP_LOG_MAX_SIZE=10485760', 'BUILDKIT_STEP_LOG_MAX_SPEED=10485760', 'JAEGER_TRACE=localhost:6831', 'image=moby/buildkit:latest', 'network=host'],
+        buildkit: 'v0.11.0',
+        'buildkitd-flags': '--debug --allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host',
+        'driver-opts': ['BUILDKIT_STEP_LOG_MAX_SIZE=10485760', 'BUILDKIT_STEP_LOG_MAX_SPEED=10485760', 'JAEGER_TRACE=localhost:6831', 'image=moby/buildkit:latest', 'network=host'],
         endpoint: 'unix:///var/run/docker.sock',
         name: 'builder20',
         platforms: 'linux/amd64,linux/amd64/v2,linux/amd64/v3,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6',
@@ -71,8 +71,8 @@ describe('parseInspect', () => {
            "name": "builder-5cb467f7-0940-47e1-b94b-d51f54054d620",
            "endpoint": "unix:///var/run/docker.sock",
            "status": "running",
-           "buildkitdFlags": "--allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host",
-           "buildkitVersion": "v0.10.4",
+           "buildkitd-flags": "--allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host",
+           "buildkit": "v0.10.4",
            "platforms": "linux/amd64,linux/amd64/v2,linux/amd64/v3,linux/amd64/v4,linux/arm64,linux/riscv64,linux/386,linux/arm/v7,linux/arm/v6"
          }
        ]
@@ -87,12 +87,12 @@ describe('parseInspect', () => {
          {
            "name": "builder-5f449644-ff29-48af-8344-abb0292d06730",
            "endpoint": "unix:///var/run/docker.sock",
-           "driverOpts": [
+           "driver-opts": [
              "image=moby/buildkit:latest"
            ],
            "status": "running",
-           "buildkitdFlags": "--allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host",
-           "buildkitVersion": "v0.10.4",
+           "buildkitd-flags": "--allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host",
+           "buildkit": "v0.10.4",
            "platforms": "linux/amd64,linux/amd64/v2,linux/amd64/v3,linux/amd64/v4,linux/386"
          }
        ]
@@ -107,13 +107,13 @@ describe('parseInspect', () => {
          {
            "name": "builder-9929e463-7954-4dc3-89cd-514cca29ff800",
            "endpoint": "unix:///var/run/docker.sock",
-           "driverOpts": [
+           "driver-opts": [
              "image=moby/buildkit:master",
              "network=host"
            ],
            "status": "running",
-           "buildkitdFlags": "--allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host",
-           "buildkitVersion": "3fab389",
+           "buildkitd-flags": "--allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host",
+           "buildkit": "3fab389",
            "platforms": "linux/amd64,linux/amd64/v2,linux/amd64/v3,linux/amd64/v4,linux/386"
          }
        ]
@@ -129,7 +129,7 @@ describe('parseInspect', () => {
            "name": "default",
            "endpoint": "default",
            "status": "running",
-           "buildkitVersion": "20.10.17",
+           "buildkit": "20.10.17",
            "platforms": "linux/amd64,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/arm/v7,linux/arm/v6"
          }
        ]
@@ -144,7 +144,7 @@ describe('parseInspect', () => {
          {
            "name": "aws_graviton2",
            "endpoint": "tcp://1.23.45.67:1234",
-           "driverOpts": [
+           "driver-opts": [
              "cert=/home/user/.certs/aws_graviton2/cert.pem",
              "key=/home/user/.certs/aws_graviton2/key.pem",
              "cacert=/home/user/.certs/aws_graviton2/ca.pem"
@@ -163,7 +163,7 @@ describe('parseInspect', () => {
            "name": "builder-17cfff01-48d9-4c3d-9332-9992e308a5100",
            "endpoint": "unix:///var/run/docker.sock",
            "status": "running",
-           "buildkitdFlags": "--allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host",
+           "buildkitd-flags": "--allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host",
            "platforms": "linux/amd64,linux/amd64/v2,linux/amd64/v3,linux/386"
          }
        ],
@@ -179,9 +179,9 @@ describe('parseInspect', () => {
        "lastActivity": new Date("2023-01-16T09:45:23.000Z"),
        "nodes": [
          {
-           "buildkitVersion": "v0.11.0",
-           "buildkitdFlags": "--debug --allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host",
-           "driverOpts": [
+           "buildkit": "v0.11.0",
+           "buildkitd-flags": "--debug --allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host",
+           "driver-opts": [
              "BUILDKIT_STEP_LOG_MAX_SIZE=10485760",
              "BUILDKIT_STEP_LOG_MAX_SPEED=10485760",
              "JAEGER_TRACE=localhost:6831",

__tests__/docker.test.ts

@@ -57,6 +57,19 @@ describe('isAvailable', () => {
   });
 });
 
+describe('context', () => {
+  it('call docker context show', async () => {
+    const execSpy = jest.spyOn(Exec, 'getExecOutput');
+    await Docker.context().catch(() => {
+      // noop
+    });
+    expect(execSpy).toHaveBeenCalledWith(`docker`, ['context', 'inspect', '--format', '{{.Name}}'], {
+      ignoreReturnCode: true,
+      silent: true
+    });
+  });
+});
+
 describe('printVersion', () => {
   it('call docker version', async () => {
     const execSpy = jest.spyOn(Exec, 'exec');

src/buildkit/buildkit.ts

@@ -39,14 +39,14 @@ export class BuildKit {
   }
 
   public async getVersion(node: NodeInfo): Promise<string | undefined> {
-    if (!node.buildkitVersion && node.name) {
+    if (!node.buildkit && node.name) {
       try {
         return await this.getVersionWithinImage(node.name);
       } catch (e) {
         core.warning(e);
       }
     }
-    return node.buildkitVersion;
+    return node.buildkit;
   }
 
   private async getVersionWithinImage(nodeName: string): Promise<string> {
@@ -80,7 +80,7 @@ export class BuildKit {
       builderInfo = await new Builder({buildx: this.buildx}).inspect(builderName);
     }
     for (const node of builderInfo.nodes) {
-      let bkversion = node.buildkitVersion;
+      let bkversion = node.buildkit;
       core.debug(`BuildKit.versionSatisfies ${bkversion}: ${range}`);
       if (!bkversion) {
         try {

src/buildx/builder.ts

@@ -80,7 +80,7 @@ export class Builder {
           break;
         }
         case 'driver options': {
-          node.driverOpts = (value.match(/(\w+)="([^"]*)"/g) || []).map(v => v.replace(/^(.*)="(.*)"$/g, '$1=$2'));
+          node['driver-opts'] = (value.match(/(\w+)="([^"]*)"/g) || []).map(v => v.replace(/^(.*)="(.*)"$/g, '$1=$2'));
           break;
         }
         case 'status': {
@@ -88,11 +88,11 @@ export class Builder {
           break;
         }
         case 'flags': {
-          node.buildkitdFlags = value;
+          node['buildkitd-flags'] = value;
           break;
         }
         case 'buildkit': {
-          node.buildkitVersion = value;
+          node.buildkit = value;
           break;
         }
         case 'platforms': {

src/docker.ts

@@ -38,6 +38,22 @@ export class Docker {
       });
   }
 
+  public static async context(name?: string): Promise<string> {
+    const args = ['context', 'inspect', '--format', '{{.Name}}'];
+    if (name) {
+      args.push(name);
+    }
+    return await Exec.getExecOutput(`docker`, args, {
+      ignoreReturnCode: true,
+      silent: true
+    }).then(res => {
+      if (res.stderr.length > 0 && res.exitCode != 0) {
+        throw new Error(res.stderr);
+      }
+      return res.stdout.trim();
+    });
+  }
+
   public static async printVersion(): Promise<void> {
     await Exec.exec('docker', ['version']);
   }

src/types/builder.ts

@@ -21,16 +21,6 @@ export interface BuilderInfo {
   nodes: NodeInfo[];
 }
 
-export interface NodeInfo {
-  name?: string;
-  endpoint?: string;
-  driverOpts?: Array<string>;
-  status?: string;
-  buildkitdFlags?: string;
-  buildkitVersion?: string;
-  platforms?: string;
-}
-
 export interface Node {
   name?: string;
   endpoint?: string;
@@ -38,3 +28,8 @@ export interface Node {
   'buildkitd-flags'?: string;
   platforms?: string;
 }
+
+export interface NodeInfo extends Node {
+  status?: string;
+  buildkit?: string;
+}