-
Notifications
You must be signed in to change notification settings - Fork 5.9k
Add Dockerfile and some cleanup #57
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.
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
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Dockerfile |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
FROM node:8.15.0 | ||
|
||
# Install VS Code's deps. These are the only two it seems we need. | ||
RUN apt-get update | ||
RUN apt-get install -y libxkbfile-dev libsecret-1-dev | ||
|
||
# Ensure latest yarn. | ||
RUN npm install -g yarn | ||
|
||
# In the future, we can use https://github.com/yarnpkg/rfcs/pull/53 to make it use the node_modules | ||
# directly which should be faster. | ||
WORKDIR /src | ||
COPY . . | ||
RUN yarn | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. compress this as one instruction as well. |
||
RUN yarn task build:server:binary | ||
|
||
# We deploy with ubuntu so that devs have a familiar environemnt. | ||
FROM ubuntu:18.10 | ||
RUN apt-get update | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Compress these two There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Its a small thing but I like em separate to make better use of docker's layer cache. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Optimizing layers no matter how small should be done. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @nhooyr it is fine to separate them while you are getting the image done, but once it is there, it is strongly recommended (see “apt-get” section) to combine update + install + remove caches There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. That is interesting. Does seem reasonable to me to bust the cache every time the package list is modified. |
||
RUN apt-get install -y openssl | ||
RUN apt-get install -y net-tools | ||
WORKDIR /root/project | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I do not recommend using There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I personally don't really see much value in that. Especially for a dev setup, you pretty much need sudo 100% of the time at which point it just becomes annoying and repetitive. cc @kylecarbs There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'm not certain what purpose there'd be in limiting the user when running inside the docker container. What do you think @sr229 ? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @kylecarbs @nhooyr we're excercising a good practice that the user should be aware that some administrative actions might need This is also how Theia and Cloud9 does their images. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Lets get this PR in for now and discuss this in #65. |
||
COPY --from=0 /src/packages/server/cli-linux /usr/local/bin/code-server | ||
EXPOSE 8443 | ||
# Unfortunately `.` does not work with code-server. | ||
CMD code-server $PWD |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
import * as cp from "child_process"; | ||
import { logger, Logger, field, time } from "@coder/logger"; | ||
import {field, Logger, logger, time} from "@coder/logger"; | ||
|
||
export interface CommandResult { | ||
readonly exitCode: number; | ||
|
@@ -9,7 +9,9 @@ export interface CommandResult { | |
|
||
const execute = (command: string, args: string[] = [], options: cp.SpawnOptions, logger: Logger): Promise<CommandResult> => { | ||
let resolve: (result: CommandResult) => void; | ||
const prom = new Promise<CommandResult>(res => resolve = res); | ||
const prom = new Promise<CommandResult>((res): void => { | ||
resolve = res; | ||
}); | ||
|
||
const stdout: string[] = []; | ||
const stderr: string[] = []; | ||
|
@@ -44,6 +46,7 @@ export type TaskFunction = (runner: Runner) => void | Promise<void>; | |
|
||
export interface Runner { | ||
cwd: string; | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Unneeded space, but not a biggie There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Goland formatted automatically, will fix. |
||
execute(command: string, args?: string[], env?: object): Promise<CommandResult>; | ||
} | ||
|
||
|
@@ -90,10 +93,22 @@ export const run = (name: string = process.argv[2]): void | Promise<void> => { | |
cwd = path; | ||
}, | ||
execute(command: string, args: string[] = [], env?: object): Promise<CommandResult> { | ||
return execute(command, args, { | ||
const prom = execute(command, args, { | ||
cwd, | ||
env: env as NodeJS.ProcessEnv, | ||
}, log); | ||
|
||
return prom.then((result: CommandResult) => { | ||
if (result.exitCode != 0) { | ||
log.error("failed", | ||
field("exitCode", result.exitCode), | ||
field("stdout", result.stdout), | ||
field("stderr", result.stderr) | ||
); | ||
} | ||
|
||
return result; | ||
}); | ||
}, | ||
}); | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,4 @@ | ||
#!/bin/bash | ||
set -e | ||
|
||
npm install -g cross-env | ||
kylecarbs marked this conversation as resolved.
Show resolved
Hide resolved
|
||
yarn task build:server:binary |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Compress these two
RUN
s as one instruction as well.