@getmonoceros/workbench 1.38.12 → 1.38.14

package/bundled-components/services/keycloak/component.yml

@@ -52,5 +52,13 @@ usageNotes:
 briefing:
   - text: 'Identity & access management, reached in-container as host `keycloak`. Admin console + API at `$KEYCLOAK_URL` (admin `$KEYCLOAK_USER` / `$KEYCLOAK_PASSWORD`).'
   - text: 'Keycloak auto-imports realms at startup (`--import-realm`) from `/opt/keycloak/data/import`, and its database is ephemeral - it re-seeds from those files on every apply. So keep the realm as a file in the repo at `projects/<app>/keycloak/realm.json`; do NOT configure it by hand in the admin UI, that is lost on the next apply.'
-  - text: 'You can create/edit that realm.json, but the bind-mount that feeds it to Keycloak lives in the container yml on the host, which you cannot edit from inside. Tell the user to add this volume to the keycloak service and re-apply: `projects/<app>/keycloak/realm.json:/opt/keycloak/data/import/<app>.json:ro`, then run `monoceros apply <name>` on the host.'
+  - text: |-
+      You can create/edit that realm.json, but the bind-mount that feeds it to Keycloak lives in the container yml on the host, which you cannot edit from inside. Give the user this exact block to add under the `keycloak` service in the container yml, with `<app>` replaced by the real project name in BOTH places (the source path and the import target filename):
+
+      ```yaml
+      volumes:
+        - projects/<app>/keycloak/realm.json:/opt/keycloak/data/import/<app>.json:ro
+      ```
+
+      Mount the single realm.json to a distinctly-named `*.json` target under the import dir. Do NOT mount the whole `keycloak/` directory onto `/opt/keycloak/data/import`, and do NOT prefix the source with `./`. Then have the user run `monoceros apply <name>` on the host.
   - text: "In the realm, define a public client (e.g. `<app>-web`) with your app's redirect URIs, and have the frontend reach Keycloak same-origin under `/realms/<realm>` so the issuer follows the request host (works on `.localhost` and over `monoceros share`)."

package/dist/bin.js

@@ -1537,10 +1537,14 @@ var init_locate_running = __esm({
     };
     realContainerExec = (containerId, argv) => {
       return new Promise((resolve, reject) => {
-        const child = spawn("docker", ["exec", containerId, ...argv], {
-          // Inherit stdio so live git output reaches the user.
-          stdio: ["ignore", "inherit", "inherit"]
-        });
+        const child = spawn(
+          "docker",
+          ["exec", "-u", "node", containerId, ...argv],
+          {
+            // Inherit stdio so live git output reaches the user.
+            stdio: ["ignore", "inherit", "inherit"]
+          }
+        );
         child.on("error", reject);
         child.on("exit", (code) => resolve({ exitCode: code ?? 0 }));
       });
@@ -4076,7 +4080,11 @@ function buildPostCreateScript(opts) {
       lines.push(
         `if [ ! -d "projects/${repo.path}" ]; then`,
         `  echo "\u2192 Cloning ${repo.path} from ${url}\u2026"`,
-        `  git clone "${url}" "projects/${repo.path}"`,
+        `  if ! git clone "${url}" "projects/${repo.path}"; then`,
+        `    echo "\u26A0 Could not clone ${repo.path} from ${url} \u2014 skipping." >&2`,
+        `    echo "  If it is private, set a token and re-apply (see the repo-access notice)." >&2`,
+        `    rm -rf "projects/${repo.path}"`,
+        `  fi`,
         `else`,
         `  echo "\u2192 projects/${repo.path} already exists, skipping clone"`,
         `fi`
@@ -4085,8 +4093,10 @@ function buildPostCreateScript(opts) {
         const safeName = repo.gitUser.name.replace(/"/g, '\\"');
         const safeEmail = repo.gitUser.email.replace(/"/g, '\\"');
         lines.push(
-          `git -C "projects/${repo.path}" config user.name "${safeName}"`,
-          `git -C "projects/${repo.path}" config user.email "${safeEmail}"`
+          `if [ -d "projects/${repo.path}/.git" ]; then`,
+          `  git -C "projects/${repo.path}" config user.name "${safeName}"`,
+          `  git -C "projects/${repo.path}" config user.email "${safeEmail}"`,
+          `fi`
         );
       }
     }
@@ -8069,6 +8079,30 @@ var init_docker_mode = __esm({
   }
 });
 
+// src/devcontainer/daemon-ready.ts
+async function waitForDockerDaemon(options = {}) {
+  const exec = options.exec ?? defaultDockerExec;
+  const attempts = options.attempts ?? 12;
+  const delayMs = options.delayMs ?? 500;
+  const sleep = options.sleep ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
+  for (let attempt = 0; attempt < attempts; attempt++) {
+    try {
+      const result = await exec(["ps", "-q"]);
+      if (result.exitCode === 0) return true;
+    } catch {
+    }
+    if (attempt === 0) options.onWait?.();
+    if (attempt < attempts - 1) await sleep(delayMs);
+  }
+  return false;
+}
+var init_daemon_ready = __esm({
+  "src/devcontainer/daemon-ready.ts"() {
+    "use strict";
+    init_proxy();
+  }
+});
+
 // src/devcontainer/identity.ts
 import { spawn as spawn9 } from "child_process";
 import { promises as fs14 } from "fs";
@@ -8434,6 +8468,17 @@ Fix the value in the env file (or the yml).`
     }
   }
   section("Scaffold");
+  const daemonReady = await waitForDockerDaemon({
+    exec: opts.dockerExec ?? defaultDockerExec,
+    onWait: () => (logger.warn ?? logger.info)(
+      "Waiting for the Docker daemon to become ready\u2026"
+    )
+  });
+  if (!daemonReady) {
+    (logger.warn ?? logger.info)(
+      "Docker daemon still not responding \u2014 continuing; the next docker step will report the error."
+    );
+  }
   const dockerMode = await detectDockerMode({
     ...opts.dockerInfoSpawn ? { spawn: opts.dockerInfoSpawn } : {}
   });
@@ -8807,6 +8852,7 @@ var init_apply = __esm({
     init_credentials();
     init_docker_mode();
     init_cli();
+    init_daemon_ready();
     init_proxy();
     init_dynamic();
     init_port_check();
@@ -9006,7 +9052,7 @@ var CLI_VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    CLI_VERSION = true ? "1.38.12" : "dev";
+    CLI_VERSION = true ? "1.38.14" : "dev";
   }
 });