Skip to content
Permalink
Browse files

make docker build working with after a fresh checkout

  • Loading branch information...
zerdos committed Mar 7, 2019
1 parent 17267bd commit 4f0dbd4aa41c8c6437efe728b56daed3b1c72958
Showing with 530 additions and 581 deletions.
  1. +4 −0 .dockerignore
  2. +1 −0 .gitignore
  3. +1 −1 Dockerfile
  4. +1 −1 build/tasks.ts
  5. +2 −2 package.json
  6. +216 −292 packages/app/browser/yarn.lock
  7. +5 −5 packages/app/common/package.json
  8. +298 −278 packages/app/common/yarn.lock
  9. +2 −2 scripts/install-packages.ts
@@ -1 +1,5 @@
Dockerfile
node_modules

This comment has been minimized.

Copy link
@aslafy-z

aslafy-z Mar 7, 2019

These lines might be replaced by

**/node_modules
*/node_modules
*/*/node_modules
*/*/*/node_modules
@@ -4,3 +4,4 @@ dist
out
.DS_Store
release
yarn-error.log
@@ -11,7 +11,7 @@ RUN npm install -g yarn
# directly which should be faster.
WORKDIR /src
COPY . .
RUN yarn
RUN yarn --forzen-lockfile

This comment has been minimized.

Copy link
@aslafy-z

aslafy-z Mar 7, 2019

Typo here: frozen

RUN yarn task build:server:binary

# We deploy with ubuntu so that devs have a familiar environemnt.
@@ -224,7 +224,7 @@ const ensureCloned = register("vscode:clone", async (runner) => {
}

runner.cwd = vscodePath;
const checkout = await runner.execute("git", ["checkout", "tags/1.31.1"]);
const checkout = await runner.execute("git", ["checkout", "tags/1.31.1"]); //TODO: this tag should come from a parameter
if (checkout.exitCode !== 0) {
throw new Error(`Failed to checkout: ${checkout.stderr}`);
}
@@ -6,8 +6,8 @@
"description": "Run VS Code remotely.",
"scripts": {
"build:rules": "cd ./rules && tsc -p .",
"packages:install": "cd ./packages && yarn",
"postinstall": "npm-run-all --parallel packages:install build:rules",
"packages:install": "cd ./packages && yarn --frozen-lockfile",
"postinstall": "npm-run-all packages:install build:rules",
"start": "cd ./packages/server && yarn start",
"task": "ts-node -r tsconfig-paths/register build/tasks.ts",
"test": "cd ./packages && yarn test"

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -2,12 +2,12 @@
"name": "@coder/app-common",
"main": "src/app.ts",
"dependencies": {
"material-components-web": "^0.44.0",
"react": "^16.8.1",
"react-dom": "^16.8.1"
"material-components-web": "^0.44.1",
"react": "^16.8.4",
"react-dom": "^16.8.4"
},
"devDependencies": {
"@types/react": "^16.8.2",
"@types/react-dom": "^16.8.0"
"@types/react": "^16.8.7",
"@types/react-dom": "^16.8.2"
}
}

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -11,7 +11,7 @@ const doInstall = (pkg: string, path: string): Promise<void> => {
logger.info(`Installing "${pkg}" dependencies...`);

return new Promise((resolve): void => {
exec("yarn --network-concurrency 1", {
exec("yarn --frozen-lockfile --network-concurrency 1", {
cwd: path,
maxBuffer: 1024 * 1024 * 10,
}, (error, stdout, stderr) => {
@@ -41,7 +41,7 @@ const handlePackages = async (dir: string): Promise<void> => {
const pkgDir = join(dir, pkg);
const pkgJsonPath = join(pkgDir, "package.json");
if (existsSync(pkgJsonPath)) {
const ip = doInstall(pkg, pkgDir);
const ip = await doInstall(pkg, pkgDir);
if (os.platform() === "win32") {
await ip;
}

0 comments on commit 4f0dbd4

Please sign in to comment.
You can’t perform that action at this time.