Merge pull request #57 from crazy-max/sock-output

sock output to get docker socket path
crazy-max · Feb 29, 2024 · 38c0711 · 38c0711
2 parents fc6fa62 + c6f8a8a
commit 38c0711
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ on:
   pull_request:
 
 env:
-  DOCKER_VERSION: v23.0.6
+  DOCKER_VERSION: v24.0.9
 
 jobs:
   main:
@@ -67,7 +67,7 @@ jobs:
         name: Set up Docker
         uses: ./
         with:
-          version: v23.0.0-rc.4
+          version: v24.0.0-rc.4
           channel: test
       -
         name: Dump context

diff --git a/README.md b/README.md
@@ -19,6 +19,7 @@ ___
   * [Define custom `limactl start` arguments (macOS)](#define-custom-limactl-start-arguments-macos)
 * [Customizing](#customizing)
   * [inputs](#inputs)
+  * [outputs](#outputs)
 * [Contributing](#contributing)
 * [License](#license)
 
@@ -106,6 +107,14 @@ The following inputs can be used as `step.with` keys
 | `daemon-config` | String |                       | [Docker daemon JSON configuration](https://docs.docker.com/engine/reference/commandline/dockerd/#daemon-configuration-file) |
 | `context`       | String | `setup-docker-action` | Docker context name.                                                                                                        |
 
+### outputs
+
+The following outputs are available
+
+| Name   | Type   | Description        |
+|--------|--------|--------------------|
+| `sock` | String | Docker socket path |
+
 ## Contributing
 
 Want to contribute? Awesome! The most basic way to show your support is to star

diff --git a/__tests__/context.test.ts b/__tests__/context.test.ts
@@ -17,10 +17,10 @@ describe('getInputs', () => {
     [
       0,
       new Map<string, string>([
-        ['version', 'v23.0.1'],
+        ['version', 'v24.0.8'],
       ]),
       {
-        version: 'v23.0.1',
+        version: 'v24.0.8',
         channel: '',
         context: '',
         daemonConfig: '',
@@ -29,13 +29,13 @@ describe('getInputs', () => {
     [
       1,
       new Map<string, string>([
-        ['version', 'v23.0.0-rc.4'],
+        ['version', 'v24.0.0-rc.4'],
         ['channel', 'test'],
         ['context', 'foo'],
         ['daemon-config', `{"debug":true,"features":{"containerd-snapshotter":true}}`],
       ]),
       {
-        version: 'v23.0.0-rc.4',
+        version: 'v24.0.0-rc.4',
         channel: 'test',
         context: 'foo',
         daemonConfig: `{"debug":true,"features":{"containerd-snapshotter":true}}`,

diff --git a/action.yml b/action.yml
@@ -8,7 +8,7 @@ branding:
 
 inputs:
   version:
-    description: 'Docker CE version. (e.g, v23.0.1)'
+    description: 'Docker CE version. (e.g, v24.0.9)'
     required: false
     default: 'latest'
   channel:
@@ -21,6 +21,10 @@ inputs:
     description: 'Docker context name. (default setup-docker-action)'
     required: false
 
+outputs:
+  sock:
+    description: "Docker socket path"
+
 runs:
   using: 'node20'
   main: 'dist/index.js'

diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/main.ts b/src/main.ts
@@ -34,7 +34,11 @@ actionsToolkit.run(
     }
     if (toolDir) {
       stateHelper.setRunDir(runDir);
-      await install.install();
+      const sockPath = await install.install();
+      await core.group(`Setting outputs`, async () => {
+        core.info(`sock=${sockPath}`);
+        core.setOutput('sock', sockPath);
+      });
     }
 
     await core.group(`Docker info`, async () => {