mirror of
https://github.com/openclaw/openclaw.git
synced 2026-05-28 03:33:52 +00:00
fix(podman): bound setup image builds
This commit is contained in:
@@ -29,6 +29,7 @@ PLATFORM_NAME="$(uname -s 2>/dev/null || echo unknown)"
|
||||
HOST_GATEWAY_PORT="${OPENCLAW_PODMAN_GATEWAY_HOST_PORT:-${OPENCLAW_GATEWAY_PORT:-18789}}"
|
||||
QUADLET_GATEWAY_PORT="18789"
|
||||
PODMAN_PULL_TIMEOUT="${OPENCLAW_PODMAN_SETUP_PULL_TIMEOUT:-600s}"
|
||||
PODMAN_BUILD_TIMEOUT="${OPENCLAW_PODMAN_SETUP_BUILD_TIMEOUT:-1800s}"
|
||||
|
||||
require_cmd() {
|
||||
if ! command -v "$1" >/dev/null 2>&1; then
|
||||
@@ -57,6 +58,18 @@ run_podman_pull() {
|
||||
podman pull "$image"
|
||||
}
|
||||
|
||||
run_podman_build() {
|
||||
if command -v timeout >/dev/null 2>&1; then
|
||||
if timeout --kill-after=1s 1s true >/dev/null 2>&1; then
|
||||
timeout --kill-after=30s "$PODMAN_BUILD_TIMEOUT" podman build "$@"
|
||||
else
|
||||
timeout "$PODMAN_BUILD_TIMEOUT" podman build "$@"
|
||||
fi
|
||||
return
|
||||
fi
|
||||
podman build "$@"
|
||||
}
|
||||
|
||||
validate_single_line_value() {
|
||||
local label="$1"
|
||||
local value="$2"
|
||||
@@ -390,7 +403,7 @@ fi
|
||||
|
||||
if [[ "$OPENCLAW_IMAGE" == "openclaw:local" ]]; then
|
||||
echo "Building image $OPENCLAW_IMAGE ..."
|
||||
podman build -t "$OPENCLAW_IMAGE" -f "$REPO_PATH/Dockerfile" "${BUILD_ARGS[@]+"${BUILD_ARGS[@]}"}" "$REPO_PATH"
|
||||
run_podman_build -t "$OPENCLAW_IMAGE" -f "$REPO_PATH/Dockerfile" "${BUILD_ARGS[@]+"${BUILD_ARGS[@]}"}" "$REPO_PATH"
|
||||
else
|
||||
if podman image exists "$OPENCLAW_IMAGE" >/dev/null 2>&1; then
|
||||
echo "Using existing image $OPENCLAW_IMAGE"
|
||||
|
||||
Reference in New Issue
Block a user