fix: ci: Fix dirty git state when building docker images #10125
Merged
Conversation
This file contains 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
ianconsolata
force-pushed
the
fix-docker-git-dirty-state
branch
from
55a3854
to
26f557d
Compare
The .dockerignore file is symlinked to the .gitignore file, and checked in files should not be removed from our docker context otherwise they result in dirty git state when we build our images.
ianconsolata
force-pushed
the
fix-docker-git-dirty-state
branch
from
26f557d
to
0f6003f
Compare
geoff-vball
approved these changes
Jan 26, 2023
GlacierWalrus
approved these changes
Jan 26, 2023
magik6k
approved these changes
Jan 26, 2023
geoff-vball
changed the title
7 tasks
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.
Related Issues
@geoff-vball This fixes some tricky issues with our docker build process that have been around for a long time, and result in the git state being dirty every time we build docker containers. That means our published containers contain lotus binaries that return
.dirtyas part oflotus --versionThis was happening because the
.dockerignore, which is a symlinked copy of the.gitignore, was ignore files that were checked into git state, and removing them from the docker build context.Proposed Changes
The original build had dirty state becuase of the AppDir folder (which can safely be removed now that AppImage is deprecated), and because of a file in extern/filecoin-ffi which matched a regexp. This PR removes the AppDir, and adds the extern/filecoin-ffi file to the include list in the
.dockerignore/.gitignore. It also adds a test in the Dockerfile that will break the docker build if this ever happens again, so we can make sure we are always releasing images built from clean git state.Checklist
Before you mark the PR ready for review, please make sure that:
<PR type>: <area>: <change being made>fix: mempool: Introduce a cache for valid signaturesPR type: fix, feat, build, chore, ci, docs, perf, refactor, revert, style, testarea, e.g. api, chain, state, market, mempool, multisig, networking, paych, proving, sealing, wallet, deps