Skip to content

make docker build working with after a fresh checkout #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 9 commits into from
Closed

make docker build working with after a fresh checkout #72

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4f0dbd4
make docker build working with after a fresh checkout
Mar 7, 2019
f1ddb86
upgrade lock file
Mar 7, 2019
c0c7de8
update .dockerignore file
Mar 7, 2019
b62306e
fix typo
Mar 7, 2019
3396cff
add more to the .dockerignore
Mar 7, 2019
ec2518a
add cross-env to vscode bootstrap-fork generator
Mar 7, 2019
7e44a39
docker additions
Mar 7, 2019
0c442f2
merge back codercom
Mar 7, 2019
67e5fc8
Merge pull request #1 from zerdos/docker
Mar 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,12 @@
.git
.gitignore
Dockerfile
lib
node_modules
**/dist
**/out
.DS_Store
*.DS_Store
release
**/yarn-error.log
**/node_modules
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ dist
out
.DS_Store
release
yarn-error.log
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ RUN npm install -g yarn
# directly which should be faster.
WORKDIR /src
COPY . .
RUN yarn
RUN yarn --frozen-lockfile
RUN yarn task build:server:binary

# We deploy with ubuntu so that devs have a familiar environemnt.
Expand Down
2 changes: 1 addition & 1 deletion build/tasks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What do you mean by a parameter?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess he means it shouldn't be hard coded.

if (checkout.exitCode !== 0) {
throw new Error(`Failed to checkout: ${checkout.stderr}`);
}
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
508 changes: 216 additions & 292 deletions packages/app/browser/yarn.lock
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions packages/app/common/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
576 changes: 298 additions & 278 deletions packages/app/common/yarn.lock
View file
Open in desktop

Large diffs are not rendered by default.

Loading