Skip to content

Dockerfile: include git #231

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

Merged
merged 3 commits into from
Mar 13, 2019
Merged

Dockerfile: include git #231

merged 3 commits into from
Mar 13, 2019

Conversation

nhooyr
Copy link
Contributor

@nhooyr nhooyr commented Mar 13, 2019

Also improves installation of runtime deps.

Closes #221
Closes #230
Closes #203

@ammario
Copy link
Member

ammario commented Mar 13, 2019

I think we should merge in everyone else's PRs instead so they get attribution.

@pokemonlover1234
Copy link
Contributor

Mine (#230) does the same thing, except I put the git install in the wrong spot.

Install git in the docker container, proposed by #203. While it is possible that issue requires further discussion, this is just a proposal pull request. If that proposal is accepted, here's the pull request.
@nhooyr
Copy link
Contributor Author

nhooyr commented Mar 13, 2019

@ammario the changes in this PR are different from the other PRs. Regardless, I've included all their commits here so they still get attribution and then included my own commit at the end to fix things up.

Dockerfile Outdated
@@ -1,6 +1,6 @@
FROM node:8.15.0

# Install VS Code's deps. These are the only two it seems we need.
# Install VS Code's deps. These are the only two it seems we need. Install git for source control.
Copy link
Member

Choose a reason for hiding this comment

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

Second sentence is in the wrong place (and extraneous imo)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I agree, from old a commit I just added. Will remove.

@nhooyr nhooyr requested a review from ammario March 13, 2019 19:18
Closes #221
Closes #230
Closes #203
@nhooyr nhooyr merged commit e3d9716 into coder:master Mar 13, 2019
@nhooyr nhooyr deleted the docker branch March 13, 2019 19:38
net-tools \
git \
locales
RUN locale-gen en_US.UTF-8
Copy link
Contributor

Choose a reason for hiding this comment

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

We could squash that into the other run.

code-asher pushed a commit that referenced this pull request Jun 19, 2019
Dockerfile: include git
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants