a
/
code-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Another fix for the Dockerfile and build (#188) 

* Dockerfile: fix

ENTRYPOINT must be provided in exec form for args
from docker run to be passed correctly.

See https://docs.docker.com/engine/reference/builder/#cmd

* build: fix reuse of vscode repository regression

See #167
This commit is contained in:
Anmol Sethi 2019-03-11 10:47:41 -04:00 committed by Kyle Carberry
parent a36476df21
commit 03c0bde3a9
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile
View File

@ -28,5 +28,4 @@ RUN apt-get install -y locales && \
# We unfortunately cannot use update-locale because docker will not use the env variables # We unfortunately cannot use update-locale because docker will not use the env variables
# configured in /etc/default/locale so we need to set it manually. # configured in /etc/default/locale so we need to set it manually.
ENV LANG=en_US.UTF-8 ENV LANG=en_US.UTF-8
ENTRYPOINT code-server ENTRYPOINT ["code-server"]
CMD ["."]

10
build/tasks.ts
View File

@ -10,7 +10,7 @@ const libPath = path.join(__dirname, "../lib");
const vscodePath = path.join(libPath, "vscode"); const vscodePath = path.join(libPath, "vscode");
const pkgsPath = path.join(__dirname, "../packages"); const pkgsPath = path.join(__dirname, "../packages");
const defaultExtensionsPath = path.join(libPath, "VSCode-linux-x64/resources/app/extensions"); const defaultExtensionsPath = path.join(libPath, "VSCode-linux-x64/resources/app/extensions");
const vscodeVersion = "1.32"; const vscodeVersion = "1.32.0";
const buildServerBinary = register("build:server:binary", async (runner) => { const buildServerBinary = register("build:server:binary", async (runner) => {
await ensureInstalled(); await ensureInstalled();
@ -220,11 +220,17 @@ const ensureCloned = register("vscode:clone", async (runner) => {
} else { } else {
fse.mkdirpSync(libPath); fse.mkdirpSync(libPath);
runner.cwd = libPath; runner.cwd = libPath;
const clone = await runner.execute("git", ["clone", "https://github.com/microsoft/vscode", "--branch", `release/${vscodeVersion}`, "--single-branch", "--depth=1"]); const clone = await runner.execute("git", ["clone", "https://github.com/microsoft/vscode", "--branch", vscodeVersion, "--single-branch", "--depth=1"]);
if (clone.exitCode !== 0) { if (clone.exitCode !== 0) {
throw new Error(`Failed to clone: ${clone.exitCode}`); throw new Error(`Failed to clone: ${clone.exitCode}`);
} }
} }
runner.cwd = vscodePath;
const checkout = await runner.execute("git", ["checkout", vscodeVersion]);
if (checkout.exitCode !== 0) {
throw new Error(`Failed to checkout: ${checkout.stderr}`);
}
}); });
const ensureClean = register("vscode:clean", async (runner) => { const ensureClean = register("vscode:clean", async (runner) => {