liuyu/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-06-06 05:51:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(docker): copy prepare hook before install

Browse Source
This commit is contained in:
Peter Steinberger
2026-05-24 06:21:19 +01:00
parent d6c9387c0f
commit 0ba6b23534
2 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@@ -60,7 +60,7 @@ COPY package.json pnpm-lock.yaml pnpm-workspace.yaml .npmrc ./
COPY openclaw.mjs ./
COPY ui/package.json ./ui/package.json
COPY patches ./patches
COPY scripts/postinstall-bundled-plugins.mjs scripts/preinstall-package-manager-warning.mjs scripts/npm-runner.mjs scripts/windows-cmd-helpers.mjs ./scripts/
COPY scripts/postinstall-bundled-plugins.mjs scripts/preinstall-package-manager-warning.mjs scripts/npm-runner.mjs scripts/windows-cmd-helpers.mjs scripts/prepare-git-hooks.mjs ./scripts/
COPY scripts/lib/package-dist-imports.mjs ./scripts/lib/package-dist-imports.mjs
COPY --from=workspace-deps /out/packages/ ./packages/

33
src/dockerfile.test.ts
View File

@@ -127,6 +127,7 @@ describe("Dockerfile", () => {
const dockerfile = await readFile(dockerfilePath, "utf8");
const installIndex = dockerfile.indexOf("pnpm install --frozen-lockfile");
const postinstallIndex = dockerfile.indexOf("COPY scripts/postinstall-bundled-plugins.mjs");
const prepareIndex = dockerfile.indexOf("scripts/prepare-git-hooks.mjs");
const distImportHelperIndex = dockerfile.indexOf(
"COPY scripts/lib/package-dist-imports.mjs ./scripts/lib/package-dist-imports.mjs",
);
@@ -138,6 +139,7 @@ describe("Dockerfile", () => {
);
expect(postinstallIndex).toBeGreaterThan(-1);
expect(prepareIndex).toBeGreaterThan(-1);
expect(distImportHelperIndex).toBeGreaterThan(-1);
expect(packageManifestIndex).toBeGreaterThan(-1);
expect(extensionManifestIndex).toBeGreaterThan(-1);
@@ -146,11 +148,42 @@ describe("Dockerfile", () => {
`if [ -f "/tmp/\${OPENCLAW_BUNDLED_PLUGIN_DIR}/$ext/package.json" ]; then`,
);
expect(postinstallIndex).toBeLessThan(installIndex);
expect(prepareIndex).toBeLessThan(installIndex);
expect(distImportHelperIndex).toBeLessThan(installIndex);
expect(packageManifestIndex).toBeLessThan(installIndex);
expect(extensionManifestIndex).toBeLessThan(installIndex);
});
it("copies root package lifecycle scripts before pnpm install", async () => {
const [dockerfile, packageJsonText] = await Promise.all([
readFile(dockerfilePath, "utf8"),
readFile(join(repoRoot, "package.json"), "utf8"),
]);
const installIndex = dockerfile.indexOf("pnpm install --frozen-lockfile");
const packageJson = JSON.parse(packageJsonText) as {
scripts?: Record<string, string>;
};
const installLifecycleScripts = ["preinstall", "install", "postinstall", "prepare"] as const;
for (const lifecycleScript of installLifecycleScripts) {
const command = packageJson.scripts?.[lifecycleScript];
const scriptPath = command?.match(/\bnode\s+(scripts\/[^\s]+)/)?.[1];
if (!scriptPath) {
continue;
}
const copyIndex = dockerfile.indexOf(scriptPath);
expect(
copyIndex,
`${lifecycleScript} must copy ${scriptPath} before pnpm install`,
).toBeGreaterThan(-1);
expect(
copyIndex,
`${lifecycleScript} must copy ${scriptPath} before pnpm install`,
).toBeLessThan(installIndex);
}
});
it("does not let pnpm resync the full source workspace during Docker build scripts", async () => {
const dockerfile = await readFile(dockerfilePath, "utf8");