run-spaceapp 0.1.6 → 0.1.7

package/README.md

@@ -28,8 +28,11 @@ images. Windows prefers Windows Package Manager's hash-pinned Docker Desktop
 manifest and retains a signed direct-download fallback. Docker Desktop license
 acceptance and Linux `docker` group membership require confirmation inside the
 same command. On Windows, approve any UAC prompt required by WSL2 or Docker
-Desktop. If Windows requests one restart, rerun the same command afterward and
-installation continues safely.
+Desktop. On Docker Desktop's first launch, select **Skip** in the top-right of
+the **Welcome to Docker** window (or sign in), accept any remaining Docker
+prompt, and keep the terminal open. SpaceApp waits for up to ten minutes and
+continues automatically when Docker is ready. If Windows requests one restart,
+rerun `spaceapp install` afterward and installation continues safely.
 
 The launcher selects the `light` profile below 12 GiB RAM and the `standard`
 profile otherwise; override this with `--profile light` or

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "run-spaceapp",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "Cross-platform Docker launcher for the SpaceApp self-hosted agent workspace",
   "license": "Apache-2.0",
   "type": "module",
@@ -45,5 +45,5 @@
     "access": "public",
     "provenance": true
   },
-  "gitHead": "81bf4f16666f75cec5b499df28115df3c28e36b8"
+  "gitHead": "3f5612291d2aea84f1a763c8b094ec0f42208fd1"
 }

package/src/prerequisites.mjs

@@ -262,6 +262,15 @@ async function ensureWindowsDocker({
   if (cliDirectory) {
     prependPath(env, cliDirectory);
   }
+  stdout.write(
+    "Opening Docker Desktop for its first-run setup.\n" +
+    "If Docker shows \"Welcome to Docker\", select \"Skip\" in the top-right (or sign in), and accept any remaining Docker prompt.\n" +
+    "Keep this terminal open; SpaceApp will continue automatically when Docker is ready (up to 10 minutes).\n"
+  );
+  await execute(
+    { command: "docker", args: ["desktop", "start", "--detach"] },
+    { stdin, stdout: null, stderr: null }
+  );
   const launchCode = await launch({
     operation: "start-docker-desktop",
     env: {
@@ -272,12 +281,12 @@ async function ensureWindowsDocker({
     stderr.write("Docker Desktop is installed, but SpaceApp could not start it.\n");
     return { code: launchCode, reexecuted: false };
   }
-  if (await waitForDocker({ execute, sleep })) {
+  if (await waitForDocker({ execute, sleep, attempts: 300 })) {
     stdout.write("Docker Desktop is ready.\n");
     return { code: 0, reexecuted: false };
   }
   stderr.write(
-    "Docker Desktop was installed but did not become ready. Complete any Docker Desktop prompt or restart Windows if requested, then run the same SpaceApp command again.\n"
+    "Docker Desktop did not become ready after 10 minutes. Open Docker Desktop and complete its first-run setup (select \"Skip\" on \"Welcome to Docker\" or sign in), restart Windows if requested, then run \"spaceapp install\" again.\n"
   );
   return { code: 1, reexecuted: false };
 }
@@ -695,12 +704,14 @@ function shellQuote(value) {
   return `'${String(value).replaceAll("'", "'\\''")}'`;
 }
 
-async function waitForDocker({ execute, sleep }) {
-  for (let attempt = 0; attempt < 90; attempt += 1) {
+async function waitForDocker({ execute, sleep, attempts = 90 }) {
+  for (let attempt = 0; attempt <= attempts; attempt += 1) {
     if (await dockerIsReady(execute)) {
       return true;
     }
-    await sleep(2_000);
+    if (attempt < attempts) {
+      await sleep(2_000);
+    }
   }
   return false;
 }