Skip to content

Commit 4f0dbd4

Browse files
author
Zoltan
committed
make docker build working with after a fresh checkout
1 parent 17267bd commit 4f0dbd4

File tree

9 files changed

+530
-581
lines changed

9 files changed

+530
-581
lines changed

.dockerignore

+4
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
11
Dockerfile
2+
node_modules
3+
*/node_modules
4+
*/*/node_modules
5+
*/*/*/node_modules

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ dist
44
out
55
.DS_Store
66
release
7+
yarn-error.log

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ RUN npm install -g yarn
1111
# directly which should be faster.
1212
WORKDIR /src
1313
COPY . .
14-
RUN yarn
14+
RUN yarn --forzen-lockfile
1515
RUN yarn task build:server:binary
1616

1717
# We deploy with ubuntu so that devs have a familiar environemnt.

build/tasks.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ const ensureCloned = register("vscode:clone", async (runner) => {
224224
}
225225

226226
runner.cwd = vscodePath;
227-
const checkout = await runner.execute("git", ["checkout", "tags/1.31.1"]);
227+
const checkout = await runner.execute("git", ["checkout", "tags/1.31.1"]); //TODO: this tag should come from a parameter
228228
if (checkout.exitCode !== 0) {
229229
throw new Error(`Failed to checkout: ${checkout.stderr}`);
230230
}

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"description": "Run VS Code remotely.",
77
"scripts": {
88
"build:rules": "cd ./rules && tsc -p .",
9-
"packages:install": "cd ./packages && yarn",
10-
"postinstall": "npm-run-all --parallel packages:install build:rules",
9+
"packages:install": "cd ./packages && yarn --frozen-lockfile",
10+
"postinstall": "npm-run-all packages:install build:rules",
1111
"start": "cd ./packages/server && yarn start",
1212
"task": "ts-node -r tsconfig-paths/register build/tasks.ts",
1313
"test": "cd ./packages && yarn test"

packages/app/browser/yarn.lock

+216-292
Large diffs are not rendered by default.

packages/app/common/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
"name": "@coder/app-common",
33
"main": "src/app.ts",
44
"dependencies": {
5-
"material-components-web": "^0.44.0",
6-
"react": "^16.8.1",
7-
"react-dom": "^16.8.1"
5+
"material-components-web": "^0.44.1",
6+
"react": "^16.8.4",
7+
"react-dom": "^16.8.4"
88
},
99
"devDependencies": {
10-
"@types/react": "^16.8.2",
11-
"@types/react-dom": "^16.8.0"
10+
"@types/react": "^16.8.7",
11+
"@types/react-dom": "^16.8.2"
1212
}
1313
}

packages/app/common/yarn.lock

+298-278
Large diffs are not rendered by default.

scripts/install-packages.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const doInstall = (pkg: string, path: string): Promise<void> => {
1111
logger.info(`Installing "${pkg}" dependencies...`);
1212

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

0 commit comments

Comments
 (0)