furyhawk/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-07-21 10:16:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(sandbox): bound common installer downloads (#108805)

Browse Source
This commit is contained in:
Alix-007
2026-07-16 03:18:02 -07:00
committed by GitHub
parent f89c624ebb
commit 00be90dae7
2 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/docker/sandbox/Dockerfile.common
+13 -3
View File
@@ -33,7 +33,10 @@ RUN --mount=type=cache,id=openclaw-sandbox-common-apt-cache,target=/var/cache/ap
if [ "${INSTALL_NODE}" = "1" ]; then \
apt-get update; \
apt-get install -y --no-install-recommends ca-certificates curl; \
curl -fsSL "https://deb.nodesource.com/setup_${NODE_MAJOR}.x" | bash -; \
installer="$(mktemp)"; \
curl -fsSL --connect-timeout 10 --max-time 120 -o "$installer" "https://deb.nodesource.com/setup_${NODE_MAJOR}.x" || exit 1; \
bash "$installer" || exit 1; \
rm -f "$installer"; \
apt-get install -y --no-install-recommends nodejs; \
node --version; \
npm --version; \
@@ -42,7 +45,10 @@ RUN --mount=type=cache,id=openclaw-sandbox-common-apt-cache,target=/var/cache/ap
RUN if [ "${INSTALL_PNPM}" = "1" ]; then npm install -g pnpm && pnpm --version; fi
RUN if [ "${INSTALL_BUN}" = "1" ]; then \
curl -fsSL https://bun.sh/install | bash; \
installer="$(mktemp)"; \
curl -fsSL --connect-timeout 10 --max-time 120 -o "$installer" https://bun.sh/install || exit 1; \
bash "$installer" || exit 1; \
rm -f "$installer"; \
ln -sf "${BUN_INSTALL_DIR}/bin/bun" /usr/local/bin/bun; \
fi
@@ -50,7 +56,11 @@ RUN if [ "${INSTALL_BREW}" = "1" ]; then \
if ! id -u linuxbrew >/dev/null 2>&1; then useradd -m -s /bin/bash linuxbrew; fi; \
mkdir -p "${BREW_INSTALL_DIR}"; \
chown -R linuxbrew:linuxbrew "$(dirname "${BREW_INSTALL_DIR}")"; \
su - linuxbrew -c "NONINTERACTIVE=1 CI=1 /bin/bash -c '$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)'"; \
installer="$(mktemp)"; \
curl -fsSL --connect-timeout 10 --max-time 120 -o "$installer" https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh || exit 1; \
chmod 0644 "$installer"; \
su - linuxbrew -c "NONINTERACTIVE=1 CI=1 /bin/bash '$installer'" || exit 1; \
rm -f "$installer"; \
if [ ! -e "${BREW_INSTALL_DIR}/Library" ]; then ln -s "${BREW_INSTALL_DIR}/Homebrew/Library" "${BREW_INSTALL_DIR}/Library"; fi; \
if [ ! -x "${BREW_INSTALL_DIR}/bin/brew" ]; then echo \"brew install failed\"; exit 1; fi; \
ln -sf "${BREW_INSTALL_DIR}/bin/brew" /usr/local/bin/brew; \
src/docker-build-cache.test.ts
+12 -1
View File
@@ -94,7 +94,18 @@ describe("docker build cache layout", () => {
expect(dockerfile).not.toContain("apt-get install -y --no-install-recommends ${PACKAGES} \\");
expect(dockerfile).toContain("ARG INSTALL_NODE=1");
expect(dockerfile).toContain("ARG NODE_MAJOR=24");
expect(dockerfile).toContain('curl -fsSL "https://deb.nodesource.com/setup_${NODE_MAJOR}.x"');
expect(
dockerfile.match(/curl -fsSL --connect-timeout 10 --max-time 120 -o "\$installer"/gu),
).toHaveLength(3);
expect(dockerfile.match(/installer="\$\(mktemp\)"/gu)).toHaveLength(3);
expect(dockerfile.match(/bash "\$installer" \|\| exit 1/gu)).toHaveLength(2);
expect(dockerfile.match(/rm -f "\$installer"/gu)).toHaveLength(3);
expect(dockerfile).toContain("apt-get install -y --no-install-recommends nodejs");
expect(dockerfile).toContain('ln -sf "${BUN_INSTALL_DIR}/bin/bun"');
expect(dockerfile).toMatch(
/chmod 0644 "\$installer"; \\\n\s+su - linuxbrew -c "NONINTERACTIVE=1 CI=1 \/bin\/bash '\$installer'" \|\| exit 1/u,
);
expect(dockerfile).not.toMatch(/curl[^\n]+\|\s*(?:bash|sh)/u);
expect(dockerfile).toContain(
'RUN if [ "${INSTALL_PNPM}" = "1" ]; then npm install -g pnpm && pnpm --version; fi',
);