Skip to content

dev: update docker node version, server address, and docker-compose #3053

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 4 commits into from
Dec 24, 2020

Conversation

nilslice
Copy link

Fixes dockerized environment to run crates.io locally.

@rust-highfive
Copy link

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @carols10cents (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@Turbo87
Copy link
Member

Turbo87 commented Dec 7, 2020

r? @jtgeibel

.env.sample Outdated
@@ -1,3 +1,6 @@
# Toggle for server configuration in development when using Docker.
export DEV_DOCKER=1
Copy link
Member

Choose a reason for hiding this comment

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

I don't think this needs to be added to the sample file, as this shouldn't be enabled for native local development. Shouldn't this be added directly to the docker-compose.yml file instead?

Copy link
Author

Choose a reason for hiding this comment

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

@jtgeibel - my thinking here was that since the .env file is read by the dockerized environment, it is a good place to add the toggle, instead of the docker-compose.yml, which could be used for hosting. If it is used while hosted, then we've exposed the port too widely.

I updated my branch using the flag directly within docker-compose.yml at first, and I don't mind reverting it. Just figured it would be more flexible this way.

Copy link
Member

Choose a reason for hiding this comment

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

@nilslice I'm not sure I follow. If docker-compose.yml is used for deployment, then wouldn't this environment variable also need to be set for that to work?

At the least, we should drop this from .env.sample and mention it to .env only under the docker section of CONTRIBUTING.md. That is the only scenario where we want to recommend using this variable.

Copy link
Member

Choose a reason for hiding this comment

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

I've taken the liberty to rebase the branch and perform the change to the docker-compose.yml file, since I was considering working on #2054, but then found this PR here 😅

should be good to go from my side 👍

to make the file a bit easier on the eyes ;)
@jtgeibel
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Dec 24, 2020

📌 Commit 324bf5e has been approved by jtgeibel

@bors
Copy link
Contributor

bors commented Dec 24, 2020

⌛ Testing commit 324bf5e with merge 1aa5822...

@bors
Copy link
Contributor

bors commented Dec 24, 2020

☀️ Test successful - checks-actions
Approved by: jtgeibel
Pushing 1aa5822 to master...

@bors bors merged commit 1aa5822 into rust-lang:master Dec 24, 2020
@nilslice
Copy link
Author

Great, thanks!!

@nilslice nilslice deleted the sm/docker-run-fix branch February 19, 2021 20:25
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.

6 participants