@pushpalsdev/cli 1.0.71 → 1.0.72
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/pushpals-cli.js +11 -7
- package/package.json +1 -1
package/dist/pushpals-cli.js
CHANGED
|
@@ -2983,17 +2983,20 @@ async function resolveSourceControlManagerGitProbe(cwd, env, platform = process.
|
|
|
2983
2983
|
detail: candidates.join(", ") || "git"
|
|
2984
2984
|
};
|
|
2985
2985
|
}
|
|
2986
|
-
async function resolveWorkerpalDockerProbe(cwd, env, platform = process.platform) {
|
|
2987
|
-
const
|
|
2988
|
-
if (
|
|
2989
|
-
|
|
2990
|
-
|
|
2991
|
-
|
|
2986
|
+
async function resolveWorkerpalDockerProbe(cwd, env, platform = process.platform, runCommandWithEnvFn = runCommandWithEnv) {
|
|
2987
|
+
const preconfiguredDockerBinary = env.PUSHPALS_DOCKER_BIN_ABSOLUTE ?? env.PUSHPALS_DOCKER_BIN;
|
|
2988
|
+
if (preconfiguredDockerBinary) {
|
|
2989
|
+
applyResolvedDockerBinaryToRuntimeEnv(env, preconfiguredDockerBinary, platform);
|
|
2990
|
+
} else {
|
|
2991
|
+
const resolvedDockerBinary = await resolveCommandPath(platform === "win32" ? "docker.exe" : "docker", cwd, env);
|
|
2992
|
+
if (resolvedDockerBinary) {
|
|
2993
|
+
applyResolvedDockerBinaryToRuntimeEnv(env, resolvedDockerBinary, platform);
|
|
2994
|
+
}
|
|
2992
2995
|
}
|
|
2993
2996
|
const candidates = resolveRuntimeDockerExecutableCandidates(env, platform);
|
|
2994
2997
|
const failures = [];
|
|
2995
2998
|
for (const candidate of candidates) {
|
|
2996
|
-
const result = await
|
|
2999
|
+
const result = await runCommandWithEnvFn([candidate, "version", "--format", "{{.Server.Version}}"], cwd, env, DOCKER_VERSION_PROBE_TIMEOUT_MS);
|
|
2997
3000
|
if (result.ok) {
|
|
2998
3001
|
const version = result.stdout.trim();
|
|
2999
3002
|
return {
|
|
@@ -5452,6 +5455,7 @@ export {
|
|
|
5452
5455
|
shutdownEmbeddedServiceManagerGracefully,
|
|
5453
5456
|
shouldRunEmbeddedRuntimeStartupPrechecks,
|
|
5454
5457
|
shouldRestartEmbeddedService,
|
|
5458
|
+
resolveWorkerpalDockerProbe,
|
|
5455
5459
|
resolveWorkerExecutionReadiness,
|
|
5456
5460
|
resolveWindowsWhereExecutableCandidatesForEnv,
|
|
5457
5461
|
resolveWindowsShellExecutableCandidatesForEnv,
|