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

Set NODE_ENV and VERSION when building (#700) 

* Set NODE_ENV and VERSION when building

Should fix the version flag not reporting correctly as well as enable
the service worker and prevent the 404 hmr requests again.

* Log env vars

To help make sure it's built correctly when looking at the Travis logs.
This commit is contained in:
Asher 2019-05-20 11:02:36 -05:00 committed by GitHub
parent c020cd2f2c
commit db39eacfa1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/tasks.ts
View File

@ -1,4 +1,5 @@
import { register, run } from "@coder/runner"; import { register, run } from "@coder/runner";
import { logger, field } from "@coder/logger";
import * as fs from "fs"; import * as fs from "fs";
import * as fse from "fs-extra"; import * as fse from "fs-extra";
import * as os from "os"; import * as os from "os";
@ -17,6 +18,11 @@ const vscodeVersion = process.env.VSCODE_VERSION || "1.33.1";
const vsSourceUrl = `https://codesrv-ci.cdr.sh/vstar-${vscodeVersion}.tar.gz`; const vsSourceUrl = `https://codesrv-ci.cdr.sh/vstar-${vscodeVersion}.tar.gz`;
const buildServerBinary = register("build:server:binary", async (runner) => { const buildServerBinary = register("build:server:binary", async (runner) => {
logger.info("Building with environment", field("env", {
NODE_ENV: process.env.NODE_ENV,
VERSION: process.env.VERSION,
}));
await ensureInstalled(); await ensureInstalled();
await Promise.all([ await Promise.all([
buildBootstrapFork(), buildBootstrapFork(),

4
scripts/build.sh
View File

@ -15,13 +15,13 @@ function docker_build() {
docker cp ./. $containerID:/src docker cp ./. $containerID:/src
exec "cd /src && yarn" exec "cd /src && yarn"
exec "cd /src && npm rebuild" exec "cd /src && npm rebuild"
exec "cd /src && yarn task build:server:binary" exec "cd /src && NODE_ENV=production VERSION=$VERSION yarn task build:server:binary"
exec "cd /src && yarn task package $VERSION" exec "cd /src && yarn task package $VERSION"
docker cp $containerID:/src/release/. ./release/ docker cp $containerID:/src/release/. ./release/
} }
if [[ "$OSTYPE" == "darwin"* ]]; then if [[ "$OSTYPE" == "darwin"* ]]; then
yarn task build:server:binary NODE_ENV=production yarn task build:server:binary
else else
if [[ "$TARGET" == "alpine" ]]; then if [[ "$TARGET" == "alpine" ]]; then
IMAGE="codercom/nbin-alpine" IMAGE="codercom/nbin-alpine"