vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-28 02:50:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci(crabbox): harden docker hydration

Browse Source
This commit is contained in:
Peter Steinberger
2026-05-22 13:28:14 +01:00
parent 57db041365
commit f4bdfd46a9
4 changed files with 92 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
scripts/crabbox-wrapper.mjs
View File

@@ -241,6 +241,26 @@ function optionValue(commandArgs, name) {
return "";
}
function hasOption(commandArgs, name) {
commandArgs = crabboxOptionArgs(commandArgs);
const shortName = name.replace(/^--/u, "-");
for (const arg of commandArgs) {
if (
arg === name ||
arg === shortName ||
arg.startsWith(`${name}=`) ||
arg.startsWith(`${shortName}=`)
) {
return true;
}
}
return false;
}
function isLocalContainerProvider(providerName) {
return ["local-container", "docker", "container", "local-docker"].includes(providerName);
}
function runCommandArgs(commandArgs) {
const { start } = runCommandBounds(commandArgs);
return start >= 0 ? commandArgs.slice(start) : [];
@@ -410,9 +430,33 @@ if (args[0] === "run" && provider === "aws" && runtimeEntrypoint) {
);
}
const childEnv = { ...process.env };
if (
isLocalContainerProvider(provider) &&
!childEnv.CRABBOX_LOCAL_CONTAINER_DOCKER_SOCKET &&
!hasOption(args, "--local-container-docker-socket")
) {
childEnv.CRABBOX_LOCAL_CONTAINER_DOCKER_SOCKET = "1";
console.error(
"[crabbox] provider=docker enabling host Docker socket pass-through for OpenClaw Docker tests",
);
}
if (
isLocalContainerProvider(provider) &&
process.platform !== "win32" &&
!childEnv.CRABBOX_LOCAL_CONTAINER_WORK_ROOT &&
!hasOption(args, "--local-container-work-root")
) {
childEnv.CRABBOX_LOCAL_CONTAINER_WORK_ROOT = "/tmp/openclaw-crabbox-docker-work";
console.error(
"[crabbox] provider=docker using short host-visible work root for OpenClaw Docker tests",
);
}
const child = spawn(binary, args, {
cwd: repoRoot,
stdio: "inherit",
env: childEnv,
});
child.on("exit", (code, signal) => {

13
scripts/lib/docker-build.sh
View File

@@ -21,7 +21,7 @@ docker_build_on_missing_enabled() {
docker_build_command() {
local build_cmd=(docker build)
if [ "${OPENCLAW_DOCKER_BUILD_USE_BUILDX:-0}" = "1" ]; then
if [ "${OPENCLAW_DOCKER_BUILD_USE_BUILDX:-0}" = "1" ] || docker_build_args_need_buildx "$@"; then
build_cmd=(docker buildx build --load)
if [ -n "${OPENCLAW_DOCKER_BUILD_CACHE_FROM:-}" ]; then
build_cmd+=(--cache-from "${OPENCLAW_DOCKER_BUILD_CACHE_FROM}")
@@ -34,6 +34,17 @@ docker_build_command() {
printf '%s\0' env DOCKER_BUILDKIT=1 "${build_cmd[@]}" "$@"
}
docker_build_args_need_buildx() {
for arg in "$@"; do
case "$arg" in
--build-context | --build-context=*)
return 0
;;
esac
done
return 1
}
docker_build_transient_failure() {
local log_file="$1"
grep -Eqi \