ewilliams28/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-08-12 21:53:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(clawdock): open dashboard on published port without starting deps (#93663)

Browse Source 
Co-authored-by: openclaw-clownfish[bot] <280122609+openclaw-clownfish[bot]@users.noreply.github.com>
Co-authored-by: Derek Homan <205598+dhoman@users.noreply.github.com>
This commit is contained in:
Vincent Koc
2026-06-16 22:24:00 +08:00
committed by GitHub
parent 6656c71c7a
commit 5939a2ac9f
2 changed files with 103 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/clawdock/clawdock-helpers.sh
+23 -1
View File
@@ -73,6 +73,27 @@ _clawdock_mask_value() {
printf "%s" "<redacted:${length} chars>"
}
_clawdock_browser_url_for_gateway_url() {
local url="$1"
case "$url" in
http://127.0.0.1:18789*|http://localhost:18789*|https://127.0.0.1:18789*|https://localhost:18789*) ;;
*)
printf "%s" "$url"
return 0
;;
esac
local published published_port
published=$(_clawdock_compose port openclaw-gateway 18789 2>/dev/null | head -n 1 | tr -d '\r')
published_port="${published##*:}"
if [[ ! "$published_port" =~ ^[0-9]+$ ]]; then
printf "%s" "$url"
return 0
fi
printf "%s" "${url/:18789/:${published_port}}"
}
_clawdock_read_config_dir() {
if [[ ! -f "$CLAWDOCK_CONFIG" ]]; then
return 1
@@ -375,7 +396,7 @@ clawdock-dashboard() {
echo "🦞 Getting dashboard URL..."
local output exit_status url
output=$(_clawdock_compose run --rm openclaw-cli dashboard --no-open 2>&1)
output=$(_clawdock_compose run --rm --no-deps openclaw-cli dashboard --no-open 2>&1)
exit_status=$?
url=$(printf "%s\n" "$output" | _clawdock_filter_warnings | grep -o 'http[s]\?://[^[:space:]]*' | head -n 1)
if [[ $exit_status -ne 0 ]]; then
@@ -385,6 +406,7 @@ clawdock-dashboard() {
fi
if [[ -n "$url" ]]; then
url=$(_clawdock_browser_url_for_gateway_url "$url")
echo -e "✅ Opening: ${_CLR_CYAN}${url}${_CLR_RESET}"
open "$url" 2>/dev/null || xdg-open "$url" 2>/dev/null || echo -e " Please open manually: ${_CLR_CYAN}${url}${_CLR_RESET}"
echo ""
test/scripts/clawdock-helpers.test.ts
+80 -2
View File
@@ -10,6 +10,10 @@ import { describe, expect, it } from "vitest";
const execFileAsync = promisify(execFile);
const repoRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "../..");
async function writeExecutable(file: string, content: string) {
await writeFile(file, content, { mode: 0o755 });
}
describe("scripts/clawdock/clawdock-helpers.sh", () => {
it("loads the standard docker-compose.override.yml before ClawDock extra overrides", async () => {
const tempDir = await mkdtemp(path.join(tmpdir(), "openclaw-clawdock-"));
@@ -22,12 +26,11 @@ describe("scripts/clawdock/clawdock-helpers.sh", () => {
await writeFile(path.join(projectDir, "docker-compose.yml"), "services: {}\n");
await writeFile(path.join(projectDir, "docker-compose.override.yml"), "services: {}\n");
await writeFile(path.join(projectDir, "docker-compose.extra.yml"), "services: {}\n");
await writeFile(
await writeExecutable(
path.join(binDir, "docker"),
`#!/usr/bin/env bash
printf '%s\\n' "$@" > "$CLAWDOCK_DOCKER_ARGS_FILE"
`,
{ mode: 0o755 },
);
await execFileAsync(
@@ -62,4 +65,79 @@ printf '%s\\n' "$@" > "$CLAWDOCK_DOCKER_ARGS_FILE"
await rm(tempDir, { force: true, recursive: true });
}
});
it("opens dashboard URLs through the published gateway port without starting dependencies", async () => {
const tempDir = await mkdtemp(path.join(tmpdir(), "openclaw-clawdock-"));
try {
const projectDir = path.join(tempDir, "project");
const binDir = path.join(tempDir, "bin");
const argsFile = path.join(tempDir, "docker-args.txt");
const openedUrlFile = path.join(tempDir, "opened-url.txt");
await mkdir(projectDir);
await mkdir(binDir);
await writeFile(path.join(projectDir, "docker-compose.yml"), "services: {}\n");
await writeExecutable(
path.join(binDir, "docker"),
`#!/usr/bin/env bash
printf '%s\\n' "$@" >> "$CLAWDOCK_DOCKER_ARGS_FILE"
printf '%s\\n' '---' >> "$CLAWDOCK_DOCKER_ARGS_FILE"
if [[ "$*" == *" port openclaw-gateway 18789" ]]; then
printf '%s\\n' '0.0.0.0:19001'
else
printf '%s\\n' 'Dashboard: http://127.0.0.1:18789/?token=test-token'
fi
`,
);
await writeExecutable(
path.join(binDir, "open"),
`#!/usr/bin/env bash
printf '%s\\n' "$1" > "$CLAWDOCK_OPENED_URL_FILE"
`,
);
await execFileAsync(
"bash",
["-c", "source scripts/clawdock/clawdock-helpers.sh; clawdock-dashboard"],
{
cwd: repoRoot,
env: {
...process.env,
CLAWDOCK_DIR: projectDir,
CLAWDOCK_DOCKER_ARGS_FILE: argsFile,
CLAWDOCK_OPENED_URL_FILE: openedUrlFile,
HOME: path.join(tempDir, "home"),
PATH: `${binDir}${path.delimiter}${process.env.PATH ?? ""}`,
},
},
);
await expect(readFile(openedUrlFile, "utf8")).resolves.toBe(
"http://127.0.0.1:19001/?token=test-token\n",
);
await expect(readFile(argsFile, "utf8")).resolves.toBe(
[
"compose",
"-f",
path.join(projectDir, "docker-compose.yml"),
"run",
"--rm",
"--no-deps",
"openclaw-cli",
"dashboard",
"--no-open",
"---",
"compose",
"-f",
path.join(projectDir, "docker-compose.yml"),
"port",
"openclaw-gateway",
"18789",
"---",
"",
].join("\n"),
);
} finally {
await rm(tempDir, { force: true, recursive: true });
}
});
});