Improve Dockerfile #455
Merged
Improve Dockerfile #455
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
If someone also builds docs.rs outside of Docker they need to have a place to store the prefix and the rustwide workspace. This commit adds a directory named ignored to both the gitignore and the dockerignore.
The user is not actually used to run the application (is run as root), but only during parts of the build process. It's not really needed, so this removes it.
- The CRATESFYI_CONTAINER_NAME variable was removed as it's not needed anymore. - The CRATESFYI_DATABASE_URL variable was moved to docker-compose.yml as it's only correct when starting the website with it. - The CRATESFYI_GITHUB_USERNAME and CRATESFYI_GITHUB_ACCESSTOKEN variables were moved to a new, gitignored .env file in the root of the repository, to allow people changing them without accidentally committing them. - The DOCS_RS_DOCKER variable was moved to the entrypoint just to remove yet another useless layer from the image.
This prevents a stale index from being backed into the image.
Using multi-stage builds got us from 2.8GB to 500MB, which is a great space saving.
pietroalbini
force-pushed
the
improve-dockerfile
branch
from
95c77b5 to
d9c4c66
Compare
|
This PR is best reviewed commit by commit. |
|
Also added Docker builds on CI, and the code to upload the image to the infra team's registry on master. |
jyn514
suggested changes
Oct 29, 2019
|
Addressed most of the review comments, left the only point I'm not sure how to solve unresolved (doh). |
jyn514
reviewed
Oct 30, 2019
Co-Authored-By: Joshua Nelson <jyn514@gmail.com>
jyn514
approved these changes
Oct 31, 2019
|
Thanks for the review! Merging this then. |
jyn514
added a commit
that referenced
this pull request
Nov 5, 2019
@miller-time ran into this when trying out docker. When the Dockerfile got split up in #455 `gcc` never got installed in the second container, so there's no linker.
jyn514
added a commit
to jyn514/docs.rs
that referenced
this pull request
Nov 6, 2019
miller-time ran into this when trying out docker. When the Dockerfile got split up in rust-lang#455 `gcc` never got installed in the second container, so there's no linker.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR changes the Dockerfile, improving multiple aspects of it. The changes will allow the image to be deployed on our infrastructure.
docker-compose.ymlor a new gitignored.env.Resulting Dockerfile