ci: centralize docker build wrapper · openclaw/openclaw@b...

Recent Commits to openclaw:main

steipete · 2026-04-27 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`set -euo pipefail`
`3`	`3`
`4`	`4`	`ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"`
	`5`	`+source "$ROOT_DIR/scripts/lib/docker-build.sh"`
`5`	`6`	`COMPOSE_FILE="$ROOT_DIR/docker-compose.yml"`
`6`	`7`	`EXTRA_COMPOSE_FILE="$ROOT_DIR/docker-compose.extra.yml"`
`7`	`8`	`IMAGE_NAME="${OPENCLAW_IMAGE:-openclaw:local}"`
`@@ -27,7 +28,7 @@ require_cmd() {`
`27`	`28`	`run_docker_build() {`
`28`	`29`	`# Dockerfile uses BuildKit-only syntax (RUN --mount=type=cache). Force`
`29`	`30`	`# BuildKit so hosts defaulting to the legacy builder do not fail.`
`30`		`-DOCKER_BUILDKIT=1 docker build "$@"`
	`31`	`+docker_build_exec "$@"`
`31`	`32`	`}`
`32`	`33`
`33`	`34`	`is_truthy_value() {`

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ RUN apt-get update \\`
`39`	`39`	`USER appuser`
`40`	`40`	`EOF`
`41`	`41`	`echo "Building Docker image: $IMAGE_NAME"`
`42`		`-run_logged browser-cdp-snapshot-build docker build -t "$IMAGE_NAME" -f "$build_dir/Dockerfile" "$build_dir"`
	`42`	`+docker_build_run browser-cdp-snapshot-build -t "$IMAGE_NAME" -f "$build_dir/Dockerfile" "$build_dir"`
`43`	`43`	`fi`
`44`	`44`
`45`	`45`	`echo "Starting browser CDP snapshot container..."`

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`set -euo pipefail`
`3`	`3`
`4`	`4`	`ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"`
`5`		`-source "$ROOT_DIR/scripts/lib/docker-e2e-logs.sh"`
	`5`	`+source "$ROOT_DIR/scripts/lib/docker-build.sh"`
`6`	`6`	`IMAGE_NAME="${OPENCLAW_QR_SMOKE_IMAGE:-openclaw-qr-smoke}"`
`7`	`7`	`DOCKER_BUILD_ARGS=()`
`8`	`8`
`@@ -15,16 +15,11 @@ if [[ "${OPENCLAW_QR_SMOKE_FORCE_INSTALL:-0}" == "1" ]]; then`
`15`	`15`	`fi`
`16`	`16`
`17`	`17`	`echo "Building Docker image..."`
`18`		`-DOCKER_BUILD_CMD=(docker build)`
`19`		`-if ((${#DOCKER_BUILD_ARGS[@]} > 0)); then`
`20`		`- DOCKER_BUILD_CMD+=("${DOCKER_BUILD_ARGS[@]}")`
`21`		`-fi`
`22`		`-DOCKER_BUILD_CMD+=(`
`23`		`- -t "$IMAGE_NAME"`
`24`		`- -f "$ROOT_DIR/scripts/e2e/Dockerfile.qr-import"`
	`18`	`+docker_build_run qr-import-build \`
	`19`	`+"${DOCKER_BUILD_ARGS[@]}" \`
	`20`	`+ -t "$IMAGE_NAME" \`
	`21`	`+ -f "$ROOT_DIR/scripts/e2e/Dockerfile.qr-import" \`
`25`	`22`	`"$ROOT_DIR"`
`26`		`-)`
`27`		`-run_logged qr-import-build "${DOCKER_BUILD_CMD[@]}"`
`28`	`23`
`29`	`24`	`echo "Running qrcode-tui import smoke..."`
`30`	`25`	`run_logged qr-import-run docker run --rm -t "$IMAGE_NAME" node -e "import('@vincentkoc/qrcode-tui').then(async (m)=>{process.stdout.write(await m.renderTerminal('qr-smoke',{small:true}))})"`

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,40 @@`
	`1`	`+#!/usr/bin/env bash`
	`2`	`+`
	`3`	`+DOCKER_BUILD_LIB_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"`
	`4`	`+`
	`5`	`+if ! declare -F run_logged >/dev/null 2>&1; then`
	`6`	`+source "$DOCKER_BUILD_LIB_DIR/docker-e2e-logs.sh"`
	`7`	`+fi`
	`8`	`+`
	`9`	`+docker_build_exec() {`
	`10`	`+local build_cmd=(docker build)`
	`11`	`+if [ "${OPENCLAW_DOCKER_BUILD_USE_BUILDX:-0}" = "1" ]; then`
	`12`	`+ build_cmd=(docker buildx build --load)`
	`13`	`+if [ -n "${OPENCLAW_DOCKER_BUILD_CACHE_FROM:-}" ]; then`
	`14`	`+ build_cmd+=(--cache-from "${OPENCLAW_DOCKER_BUILD_CACHE_FROM}")`
	`15`	`+fi`
	`16`	`+if [ -n "${OPENCLAW_DOCKER_BUILD_CACHE_TO:-}" ]; then`
	`17`	`+ build_cmd+=(--cache-to "${OPENCLAW_DOCKER_BUILD_CACHE_TO}")`
	`18`	`+fi`
	`19`	`+fi`
	`20`	`+`
	`21`	`+ env DOCKER_BUILDKIT=1 "${build_cmd[@]}" "$@"`
	`22`	`+}`
	`23`	`+`
	`24`	`+docker_build_run() {`
	`25`	`+local label="$1"`
	`26`	`+shift`
	`27`	`+`
	`28`	`+local build_cmd=(docker build)`
	`29`	`+if [ "${OPENCLAW_DOCKER_BUILD_USE_BUILDX:-0}" = "1" ]; then`
	`30`	`+ build_cmd=(docker buildx build --load)`
	`31`	`+if [ -n "${OPENCLAW_DOCKER_BUILD_CACHE_FROM:-}" ]; then`
	`32`	`+ build_cmd+=(--cache-from "${OPENCLAW_DOCKER_BUILD_CACHE_FROM}")`
	`33`	`+fi`
	`34`	`+if [ -n "${OPENCLAW_DOCKER_BUILD_CACHE_TO:-}" ]; then`
	`35`	`+ build_cmd+=(--cache-to "${OPENCLAW_DOCKER_BUILD_CACHE_TO}")`
	`36`	`+fi`
	`37`	`+fi`
	`38`	`+`
	`39`	`+ run_logged "$label" env DOCKER_BUILDKIT=1 "${build_cmd[@]}" "$@"`
	`40`	`+}`

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ DOCKER_E2E_LIB_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"`
`4`	`4`	`ROOT_DIR="${ROOT_DIR:-$(cd "$DOCKER_E2E_LIB_DIR/../.." && pwd)}"`
`5`	`5`
`6`	`6`	`source "$DOCKER_E2E_LIB_DIR/docker-e2e-logs.sh"`
	`7`	`+source "$DOCKER_E2E_LIB_DIR/docker-build.sh"`
`7`	`8`
`8`	`9`	`docker_e2e_resolve_image() {`
`9`	`10`	`local default_image="$1"`
`@@ -48,10 +49,10 @@ docker_e2e_build_or_reuse() {`
`48`	`49`	`fi`
`49`	`50`
`50`	`51`	`echo "Building Docker image: $image_name"`
`51`		`-local build_cmd=(docker build)`
	`52`	`+local build_args=()`
`52`	`53`	`if [ -n "$target" ]; then`
`53`		`-build_cmd+=(--target "$target")`
	`54`	`+build_args+=(--target "$target")`
`54`	`55`	`fi`
`55`		`-build_cmd+=(-t "$image_name" -f "$dockerfile" "$context")`
`56`		`-run_logged "$label-build" "${build_cmd[@]}"`
	`56`	`+build_args+=(-t "$image_name" -f "$dockerfile" "$context")`
	`57`	`+docker_build_run "$label-build" "${build_args[@]}"`
`57`	`58`	`}`

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,10 @@`
`1`	`1`	`#!/usr/bin/env bash`
`2`	`2`	`set -euo pipefail`
`3`	`3`
	`4`	`+ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"`
	`5`	`+source "$ROOT_DIR/scripts/lib/docker-build.sh"`
	`6`	`+`
`4`	`7`	`IMAGE_NAME="openclaw-sandbox-browser:bookworm-slim"`
`5`	`8`
`6`		`-docker build -t "${IMAGE_NAME}" -f Dockerfile.sandbox-browser .`
	`9`	`+docker_build_exec -t "${IMAGE_NAME}" -f "$ROOT_DIR/Dockerfile.sandbox-browser" "$ROOT_DIR"`
`7`	`10`	`echo "Built ${IMAGE_NAME}"`

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,9 @@`
`1`	`1`	`#!/usr/bin/env bash`
`2`	`2`	`set -euo pipefail`
`3`	`3`
	`4`	`+ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"`
	`5`	`+source "$ROOT_DIR/scripts/lib/docker-build.sh"`
	`6`	`+`
`4`	`7`	`BASE_IMAGE="${BASE_IMAGE:-openclaw-sandbox:bookworm-slim}"`
`5`	`8`	`TARGET_IMAGE="${TARGET_IMAGE:-openclaw-sandbox-common:bookworm-slim}"`
`6`	`9`	`PACKAGES="${PACKAGES:-curl wget jq coreutils grep nodejs npm python3 git ca-certificates golang-go rustc cargo unzip pkg-config libasound2-dev build-essential file}"`
`@@ -17,25 +20,14 @@ OPENCLAW_DOCKER_BUILD_CACHE_TO="${OPENCLAW_DOCKER_BUILD_CACHE_TO:-}"`
`17`	`20`	`if ! docker image inspect "${BASE_IMAGE}" >/dev/null 2>&1; then`
`18`	`21`	`echo "Base image missing: ${BASE_IMAGE}"`
`19`	`22`	`echo "Building base image via scripts/sandbox-setup.sh..."`
`20`		`- scripts/sandbox-setup.sh`
	`23`	`+"$ROOT_DIR/scripts/sandbox-setup.sh"`
`21`	`24`	`fi`
`22`	`25`
`23`	`26`	`echo "Building ${TARGET_IMAGE} with: ${PACKAGES}"`
`24`	`27`
`25`		`-build_cmd=(docker build)`
`26`		`-if [ "${OPENCLAW_DOCKER_BUILD_USE_BUILDX}" = "1" ]; then`
`27`		`- build_cmd=(docker buildx build --load)`
`28`		`-if [ -n "${OPENCLAW_DOCKER_BUILD_CACHE_FROM}" ]; then`
`29`		`- build_cmd+=(--cache-from "${OPENCLAW_DOCKER_BUILD_CACHE_FROM}")`
`30`		`-fi`
`31`		`-if [ -n "${OPENCLAW_DOCKER_BUILD_CACHE_TO}" ]; then`
`32`		`- build_cmd+=(--cache-to "${OPENCLAW_DOCKER_BUILD_CACHE_TO}")`
`33`		`-fi`
`34`		`-fi`
`35`		`-`
`36`		`-"${build_cmd[@]}" \`
	`28`	`+docker_build_exec \`
`37`	`29`	`-t "${TARGET_IMAGE}" \`
`38`		`- -f Dockerfile.sandbox-common \`
	`30`	`+ -f "$ROOT_DIR/Dockerfile.sandbox-common" \`
`39`	`31`	`--build-arg BASE_IMAGE="${BASE_IMAGE}" \`
`40`	`32`	`--build-arg PACKAGES="${PACKAGES}" \`
`41`	`33`	`--build-arg INSTALL_PNPM="${INSTALL_PNPM}" \`
`@@ -44,7 +36,7 @@ fi`
`44`	`36`	`--build-arg INSTALL_BREW="${INSTALL_BREW}" \`
`45`	`37`	`--build-arg BREW_INSTALL_DIR="${BREW_INSTALL_DIR}" \`
`46`	`38`	`--build-arg FINAL_USER="${FINAL_USER}" \`
`47`		`-.`
	`39`	`+"$ROOT_DIR"`
`48`	`40`
`49`	`41`	`cat <<NOTE`
`50`	`42`	`Built ${TARGET_IMAGE}.`

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,10 @@`
`1`	`1`	`#!/usr/bin/env bash`
`2`	`2`	`set -euo pipefail`
`3`	`3`
	`4`	`+ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"`
	`5`	`+source "$ROOT_DIR/scripts/lib/docker-build.sh"`
	`6`	`+`
`4`	`7`	`IMAGE_NAME="openclaw-sandbox:bookworm-slim"`
`5`	`8`
`6`		`-docker build -t "${IMAGE_NAME}" -f Dockerfile.sandbox .`
	`9`	`+docker_build_exec -t "${IMAGE_NAME}" -f "$ROOT_DIR/Dockerfile.sandbox" "$ROOT_DIR"`
`7`	`10`	`echo "Built ${IMAGE_NAME}"`

Original file line number	Diff line number	Diff line change
`@@ -2,12 +2,12 @@`
`2`	`2`	`set -euo pipefail`
`3`	`3`
`4`	`4`	`ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"`
`5`		`-source "$ROOT_DIR/scripts/lib/docker-e2e-logs.sh"`
	`5`	`+source "$ROOT_DIR/scripts/lib/docker-build.sh"`
`6`	`6`	`IMAGE_NAME="${OPENCLAW_CLEANUP_SMOKE_IMAGE:-openclaw-cleanup-smoke:local}"`
`7`	`7`	`PLATFORM="${OPENCLAW_CLEANUP_SMOKE_PLATFORM:-linux/amd64}"`
`8`	`8`
`9`	`9`	`echo "==> Build image: $IMAGE_NAME"`
`10`		`-run_logged cleanup-build docker build \`
	`10`	`+docker_build_run cleanup-build \`
`11`	`11`	`-t "$IMAGE_NAME" \`
`12`	`12`	`-f "$ROOT_DIR/scripts/docker/cleanup-smoke/Dockerfile" \`
`13`	`13`	`"$ROOT_DIR"`

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ set -euo pipefail`
`4`	`4`	`ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"`
`5`	`5`	`# shellcheck source=./docker/install-sh-common/version-parse.sh`
`6`	`6`	`source "$ROOT_DIR/scripts/docker/install-sh-common/version-parse.sh"`
	`7`	`+source "$ROOT_DIR/scripts/lib/docker-build.sh"`
`7`	`8`
`8`	`9`	`resolve_default_smoke_platform() {`
`9`	`10`	`local host_os`
`@@ -358,7 +359,7 @@ if [[ "$SKIP_SMOKE_IMAGE_BUILD" == "1" ]]; then`
`358`	`359`	`echo "==> Reuse prebuilt smoke image: $SMOKE_IMAGE"`
`359`	`360`	`else`
`360`	`361`	`echo "==> Build smoke image (upgrade, root, ${SMOKE_PLATFORM}): $SMOKE_IMAGE"`
`361`		`-docker build \`
	`362`	`+docker_build_run install-smoke-build \`
`362`	`363`	`--platform "$SMOKE_PLATFORM" \`
`363`	`364`	`-t "$SMOKE_IMAGE" \`
`364`	`365`	`-f "$ROOT_DIR/scripts/docker/install-sh-smoke/Dockerfile" \`
`@@ -441,7 +442,7 @@ else`
`441`	`442`	`echo "==> Reuse prebuilt non-root image: $NONROOT_IMAGE"`
`442`	`443`	`else`
`443`	`444`	`echo "==> Build non-root image (${NONROOT_PLATFORM}): $NONROOT_IMAGE"`
`444`		`-docker build \`
	`445`	`+docker_build_run install-nonroot-build \`
`445`	`446`	`--platform "$NONROOT_PLATFORM" \`
`446`	`447`	`-t "$NONROOT_IMAGE" \`
`447`	`448`	`-f "$ROOT_DIR/scripts/docker/install-sh-nonroot/Dockerfile" \`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main