-
Notifications
You must be signed in to change notification settings - Fork 5.9k
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.
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
4f0dbd4
f1ddb86
c0c7de8
b62306e
3396cff
ec2518a
7e44a39
0c442f2
67e5fc8
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 |
---|---|---|
@@ -1 +1,12 @@ | ||
.git | ||
.gitignore | ||
Dockerfile | ||
lib | ||
node_modules | ||
**/dist | ||
**/out | ||
.DS_Store | ||
*.DS_Store | ||
release | ||
**/yarn-error.log | ||
**/node_modules |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,3 +4,4 @@ dist | |
out | ||
.DS_Store | ||
release | ||
yarn-error.log |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
FROM node:8.15.0 | ||
FROM node:8.9.3 | ||
|
||
# Install VS Code's deps. These are the only two it seems we need. | ||
RUN apt-get update && apt-get install -y \ | ||
|
@@ -18,7 +18,7 @@ RUN yarn && yarn task build:server:binary | |
# We deploy with ubuntu so that devs have a familiar environemnt. | ||
FROM ubuntu:18.10 | ||
WORKDIR /root/project | ||
COPY --from=0 /src/packages/server/cli-linux /usr/local/bin/code-server | ||
COPY --from=0 /src/packages/server/cli-linux-x64 /usr/local/bin/code-server | ||
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. afaik, there shouldn't be a 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. There should be - that is actually the only output 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. Yup. This was recently changed without me knowing. It's fixed in #109. |
||
EXPOSE 8443 | ||
RUN apt-get update && apt-get install -y \ | ||
openssl \ | ||
|
@@ -29,4 +29,4 @@ RUN apt-get install -y locales && \ | |
# configured in /etc/default/locale so we need to set it manually. | ||
ENV LANG=en_US.UTF-8 | ||
# Unfortunately `.` does not work with code-server. | ||
CMD code-server $PWD | ||
CMD code-server $PWD |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 | ||
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. What do you mean by a parameter? 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 guess he means it shouldn't be hard coded. |
||
if (checkout.exitCode !== 0) { | ||
throw new Error(`Failed to checkout: ${checkout.stderr}`); | ||
} | ||
|
@@ -235,6 +235,10 @@ const ensureClean = register("vscode:clean", async (runner) => { | |
|
||
const status = await runner.execute("git", ["status", "--porcelain"]); | ||
if (status.stdout.trim() !== "") { | ||
|
||
// inside docker this library throws error on git clean | ||
await runner.execute("rm", ["-rf", "node_modules/spdlog"]); | ||
|
||
const clean = await runner.execute("git", ["clean", "-f", "-d", "-X"]); | ||
if (clean.exitCode !== 0) { | ||
throw new Error(`Failed to clean git repository: ${clean.stderr}`); | ||
|
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.
Why the change?