Skip to content

Fix (CLI): Generated build files permissions #1304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dOrgJelli merged 4 commits into from
Oct 7, 2022
Merged

Fix (CLI): Generated build files permissions #1304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4f7dc55
fix: use flag 777 in chmod
cbrzn Oct 6, 2022
9fe2303
fix: just use one run command to get files & give permission
cbrzn Oct 6, 2022
f2740cb
fix: permissions work as expected in as & rust
cbrzn Oct 7, 2022
e4075b3
chore: prettier is happy now
cbrzn Oct 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 17 additions & 25 deletions packages/cli/src/lib/build-strategies/strategies/DockerVMStrategy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,28 +162,15 @@ export class DockerVMBuildStrategy extends BuildStrategy<void> {
);
fse.writeFileSync(buildScriptPath, scriptContent);

let buildError: Error | undefined = undefined;

try {
const { stderr } = await runCommand(
`docker run --rm -v ${path.resolve(
this._volumePaths.project
)}:/project -v ${path.resolve(
this._volumePaths.linkedPackages
)}:/linked-packages ${
CONFIGS[language].baseImage
}:latest /bin/bash -c "${scriptContent}"`
);

if (
stderr &&
!fse.existsSync(path.join(this._volumePaths.project, "build"))
) {
buildError = new Error(stderr);
}
} catch (e) {
buildError = e;
}
const { stderr } = await runCommand(
`docker run --rm -v ${path.resolve(
this._volumePaths.project
)}:/project -v ${path.resolve(
this._volumePaths.linkedPackages
)}:/linked-packages ${
CONFIGS[language].baseImage
}:latest /bin/bash -c "${scriptContent}"`
);

await runCommand(
`docker run --rm -v ${path.resolve(
Expand All @@ -192,11 +179,16 @@ export class DockerVMBuildStrategy extends BuildStrategy<void> {
this._volumePaths.linkedPackages
)}:/linked-packages ${
CONFIGS[language].baseImage
}:latest /bin/bash -c "chmod -R g+wX ."`
}:latest /bin/bash -c "chmod -R 777 /project && chmod -R 777 /linked-packages"`
);

if (buildError) {
throw buildError;
if (
stderr &&
!fse.existsSync(
path.join(this._volumePaths.project, "build", "wrap.wasm")
)
) {
throw new Error(stderr);
}
}
};
Expand Down
3 changes: 0 additions & 3 deletions packages/cli/src/lib/defaults/build-strategies/wasm/assemblyscript/vm/vm-script.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,11 @@ json -I -f package.json -e 'this.dependencies[\"{{name}}\"]=\"../linked-packages
{{/polywrap_linked_packages}}
{{#polywrap_module}}
yarn
chmod -R g+wX .
asc {{dir}}/wrap/entry.ts \
--path ./node_modules \
--outFile ./build/wrap.wasm \
--use abort={{dir}}/wrap/entry/wrapAbort \
--optimize --importMemory \
--runtime stub \
--runPasses asyncify

chmod -R g+wX .
{{/polywrap_module}}
2 changes: 0 additions & 2 deletions packages/cli/src/lib/defaults/build-strategies/wasm/rust/vm/vm-script.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,4 @@ rm -rf ./build/bg_module.wasm

wasm-opt --asyncify -Os ./build/snipped_module.wasm -o ./build/wrap.wasm
rm -rf ./build/snipped_module.wasm

chmod -R g+wX .
{{/polywrap_module}}