mirror of https://git.tuxpa.in/a/code-server.git
Fix rg extraction in Docker build
This commit is contained in:
parent
b0e6c1cc4e
commit
2be452d83e
|
@ -1,7 +1,11 @@
|
|||
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");
|
||||
}
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue