Merge pull request #163 from docker/dependabot/npm_and_yarn/docker/actions-toolkit-0.61.0

build(deps): bump @docker/actions-toolkit from 0.57.0 to 0.61.0

Author: crazy-max

.github/workflows/ci.yml

@@ -305,3 +305,27 @@ jobs:
           docker info
         env:
           DOCKER_HOST: ${{ steps.setup_docker.outputs.tcp }}
+
+  undock-regctl-version:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        undock_version:
+          - ''
+          - v0.9.0
+        regctl_version:
+          - ''
+          - v0.8.2
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v4
+      -
+        name: Set up Docker
+        uses: ./
+        with:
+          version: type=image
+        env:
+          UNDOCK_VERSION: ${{ matrix.undock_version }}
+          REGCTL_VERSION: ${{ matrix.regctl_version }}

dist/index.js

@@ -27,7 +27,7 @@
   "packageManager": "yarn@3.6.3",
   "dependencies": {
     "@actions/core": "^1.11.1",
-    "@docker/actions-toolkit": "^0.57.0"
+    "@docker/actions-toolkit": "^0.61.0"
   },
   "devDependencies": {
     "@types/node": "^20.6.0",

dist/index.js.map

@@ -5,10 +5,17 @@ import * as core from '@actions/core';
 import * as actionsToolkit from '@docker/actions-toolkit';
 import {Install} from '@docker/actions-toolkit/lib/docker/install';
 import {Docker} from '@docker/actions-toolkit/lib/docker/docker';
+import {Install as RegclientInstall} from '@docker/actions-toolkit/lib/regclient/install';
+import {Regctl} from '@docker/actions-toolkit/lib/regclient/regctl';
+import {Install as UndockInstall} from '@docker/actions-toolkit/lib/undock/install';
+import {Undock} from '@docker/actions-toolkit/lib/undock/undock';
 
 import * as context from './context';
 import * as stateHelper from './state-helper';
 
+const regctlDefaultVersion = 'v0.8.3';
+const undockDefaultVersion = 'v0.10.0';
+
 actionsToolkit.run(
   // main
   async () => {
@@ -19,6 +26,29 @@ actionsToolkit.run(
       throw new Error(`'default' context cannot be used.`);
     }
 
+    if (input.source.type === 'image') {
+      await core.group(`Download and install regctl`, async () => {
+        const regclientInstall = new RegclientInstall();
+        const regclientBinPath = await regclientInstall.download(
+          process.env.REGCTL_VERSION && process.env.REGCTL_VERSION.trim()
+            ? process.env.REGCTL_VERSION
+            : regctlDefaultVersion,
+          true
+        );
+        await regclientInstall.install(regclientBinPath);
+      });
+      await core.group(`Download and install undock`, async () => {
+        const undockInstall = new UndockInstall();
+        const undockBinPath = await undockInstall.download(
+          process.env.UNDOCK_VERSION && process.env.UNDOCK_VERSION.trim()
+            ? process.env.UNDOCK_VERSION
+            : undockDefaultVersion,
+          true
+        );
+        await undockInstall.install(undockBinPath);
+      });
+    }
+
     let tcpPort: number | undefined;
     let tcpAddress: string | undefined;
     if (input.tcpPort) {
@@ -32,7 +62,9 @@ actionsToolkit.run(
       rootless: input.rootless,
       contextName: input.context || 'setup-docker-action',
       daemonConfig: input.daemonConfig,
-      localTCPPort: tcpPort
+      localTCPPort: tcpPort,
+      regctl: new Regctl(),
+      undock: new Undock()
     });
     let toolDir;
     if (!(await Docker.isAvailable()) || input.source) {
@@ -71,7 +103,9 @@ actionsToolkit.run(
       return;
     }
     const install = new Install({
-      runDir: stateHelper.runDir
+      runDir: stateHelper.runDir,
+      regctl: new Regctl(),
+      undock: new Undock()
     });
     await install.tearDown();
   }

package.json

@@ -12,9 +12,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@actions/artifact@npm:^2.3.0":
-  version: 2.3.0
-  resolution: "@actions/artifact@npm:2.3.0"
+"@actions/artifact@npm:^2.3.2":
+  version: 2.3.2
+  resolution: "@actions/artifact@npm:2.3.2"
   dependencies:
     "@actions/core": ^1.10.0
     "@actions/github": ^5.1.1
@@ -28,13 +28,13 @@ __metadata:
     archiver: ^7.0.1
     jwt-decode: ^3.1.2
     unzip-stream: ^0.3.1
-  checksum: f8197c410c2bf6985933e71bad4b441b269e5aab512c1232428d771b82aa3647e1ef0f81008130c8ab4222d3f9275ad9bd0f49e0263dfbf27c9228306e1dc779
+  checksum: 78ee41b43800accb2f3527e1733217c43d53693e7f96ce2470b16890fb84f5c2ebaaa6048ccdb6cfe188b54c02779ec99623c6932558e757f6829cfde203cf2c
   languageName: node
   linkType: hard
 
-"@actions/cache@npm:^4.0.2":
-  version: 4.0.2
-  resolution: "@actions/cache@npm:4.0.2"
+"@actions/cache@npm:^4.0.3":
+  version: 4.0.3
+  resolution: "@actions/cache@npm:4.0.3"
   dependencies:
     "@actions/core": ^1.11.1
     "@actions/exec": ^1.0.1
@@ -46,7 +46,7 @@ __metadata:
     "@azure/storage-blob": ^12.13.0
     "@protobuf-ts/plugin": ^2.9.4
     semver: ^6.3.1
-  checksum: 208f11238a26194f331b329bb99d50a87c1a3ccef1dbae181e5c142b3faf41715203e0c5cbc491519d3d97540a68fbd418c25fb6e16caabf76248c40867c02b4
+  checksum: ee9c2a21a70bd3f35c63f302af478e23f135c26deb77ea2e4eed29c62766a4b201fc7435651c0d56fa504c02d203107e3bdfda1dba18a3ee09338e1dfc3f2fe8
   languageName: node
   linkType: hard
 
@@ -1101,12 +1101,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@docker/actions-toolkit@npm:^0.57.0":
-  version: 0.57.0
-  resolution: "@docker/actions-toolkit@npm:0.57.0"
+"@docker/actions-toolkit@npm:^0.61.0":
+  version: 0.61.0
+  resolution: "@docker/actions-toolkit@npm:0.61.0"
   dependencies:
-    "@actions/artifact": ^2.3.0
-    "@actions/cache": ^4.0.2
+    "@actions/artifact": ^2.3.2
+    "@actions/cache": ^4.0.3
     "@actions/core": ^1.11.1
     "@actions/exec": ^1.1.1
     "@actions/github": ^6.0.0
@@ -1126,7 +1126,7 @@ __metadata:
     semver: ^7.7.1
     tar-stream: ^3.1.7
     tmp: ^0.2.3
-  checksum: d25b85d85d79a2ddb01ed7cd858d2c0dedae7545a1fd991517ae71aa53ccd91e3b295ed8a5b48f4c9a7b6486cdf25a47a9e123135f8bffac47af1c60551d268d
+  checksum: 60cc6c8f5bde8221a3d6a40c15258d44a468950353098f1814d8af3a14131df9c41df5b87298cd82f5c77aa4e36e262c15a5bb0cc03ea2857bea18c9e0952d80
   languageName: node
   linkType: hard
 
@@ -3341,7 +3341,7 @@ __metadata:
   resolution: "docker-setup-docker@workspace:."
   dependencies:
     "@actions/core": ^1.11.1
-    "@docker/actions-toolkit": ^0.57.0
+    "@docker/actions-toolkit": ^0.61.0
     "@types/node": ^20.6.0
     "@typescript-eslint/eslint-plugin": ^6.6.0
     "@typescript-eslint/parser": ^6.6.0