未验证 提交 2be452d8 编写于 作者: A Asher

Fix rg extraction in Docker build

上级 b0e6c1cc
Dockerfile
doc/
build
deployment
doc
.git
.github
.gitignore
.node-version
.travis.yml
LICENSE
README.md
......
......@@ -99,7 +99,7 @@ function build-code-server() {
log "Installing remote dependencies"
cd "${vscodeSourcePath}/remote"
yarn --production --force --build-from-source
cp -r "${vscodeSourcePath}/remote/node_modules" "${codeServerBuildPath}"
mv "${vscodeSourcePath}/remote/node_modules" "${codeServerBuildPath}"
# Only keep the production dependencies.
cd "${codeServerBuildPath}/out/vs/server"
......
......@@ -122,10 +122,12 @@ export const open = async (url: string): Promise<void> => {
*/
export const unpackExecutables = async (): Promise<void> => {
const rgPath = (rg as any).binaryRgPath;
if (rgPath) {
const destination = path.join(tmpdir, path.basename(rgPath || ""));
if (rgPath && !(await util.promisify(fs.exists)(destination))) {
await mkdirp(tmpdir);
const destination = path.join(tmpdir, path.basename(rgPath));
await util.promisify(fs.copyFile)(rgPath, destination);
// TODO: I'm not sure why but copyFile doesn't work in the Docker build.
// await util.promisify(fs.copyFile)(rgPath, destination);
await util.promisify(fs.writeFile)(destination, await util.promisify(fs.readFile)(rgPath));
await util.promisify(fs.chmod)(destination, "755");
}
};
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册