Makefile: pass docker build arguments #4212
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
Dockerfile requires some --build-arg options.
Fix "docker" target to pass them.
Fix GIT_TAG to reflect the most recent tag related to HEAD, instead of an unrelated most recent tag.
Use it as the image VERSION.
Image tags need to be passed explicitly if needed:
DOCKER_FLAGS='-t erigon:latest' make docker
| @@ -3,7 +3,7 @@ GOBIN = $(CURDIR)/build/bin | |||
|
|
|||
| GIT_COMMIT ?= $(shell git rev-list -1 HEAD) | |||
| GIT_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD) | |||
| GIT_TAG ?= $(shell git describe --tags `git rev-list --tags="v*" --max-count=1`) | |||
| GIT_TAG ?= $(shell git describe --tags --dirty) | |||
There was a problem hiding this comment.
FYI: mdbx using next snippet: git describe --tags --long --dirty=-dirty "--match=v[0-9]*"
There was a problem hiding this comment.
Can you try to fix this one also? #3779
There was a problem hiding this comment.
ah, now I remember why we using rev-list: because Ubuntu 18.04 has git of version which doesn't support --dirty flag
There was a problem hiding this comment.
Adding a --match argument makes sense.
Updated PR description.
AlexeyAkhunov
added a commit
that referenced
this pull request
May 21, 2022
* allow --syncmode=snap for bor-mainnnet (#4206) * save * save * allow --syncmode=snap for bor-mainnnet #4206 * allow snap sync for mumbai chain (#4208) * save * mumbai * Bor: GetTransactionReceipt (#4209) * fixed miner.sigfile option (#4210) * Snap: reduced memory footprint on building huffman table (#4214) * save * save * save * save * Remove dependency on leveldb (#4213) * save * save * save * save * save * save * methods to read single txn by txnID (#4215) * It's safe now to open snapshots at app start (#4216) * removed obsolete trie variant (#4172) * up gods lib version (#4217) * Fix `rpc.BlockNumberOrHash` unmarshaling (#4218) * add test * fix unmarshaling bug Co-authored-by: Igor Mandrigin <[email protected]> * return err on invalid syncmode (#4219) * save * save * save * fixed kiln bug (#4221) * Clean headers pointers when removing links (#4222) * Clean headers pointers when removing links * Replace the lock Co-authored-by: Alexey Sharp <[email protected]> * Makefile: pass docker build arguments (#4212) Dockerfile requires some --build-arg options. Fix "docker" target to pass them. Fix GIT_TAG to reflect the most recent tag related to HEAD, instead of an unrelated most recent tag. Use it as the image VERSION. Image tags need to be passed explicitly if needed: DOCKER_FLAGS='-t erigon:latest' make docker * Update erigon-lib and version Co-authored-by: Alex Sharov <[email protected]> Co-authored-by: Giulio rebuffo <[email protected]> Co-authored-by: Artem Tsebrovskiy <[email protected]> Co-authored-by: Igor Mandrigin <[email protected]> Co-authored-by: Igor Mandrigin <[email protected]> Co-authored-by: Alexey Sharp <[email protected]> Co-authored-by: battlmonstr <[email protected]>
AlexeyAkhunov
added a commit
that referenced
this pull request
May 21, 2022
* allow --syncmode=snap for bor-mainnnet (#4206) * save * save * allow --syncmode=snap for bor-mainnnet #4206 * allow snap sync for mumbai chain (#4208) * save * mumbai * Bor: GetTransactionReceipt (#4209) * fixed miner.sigfile option (#4210) * Snap: reduced memory footprint on building huffman table (#4214) * save * save * save * save * Remove dependency on leveldb (#4213) * save * save * save * save * save * save * methods to read single txn by txnID (#4215) * It's safe now to open snapshots at app start (#4216) * removed obsolete trie variant (#4172) * up gods lib version (#4217) * Fix `rpc.BlockNumberOrHash` unmarshaling (#4218) * add test * fix unmarshaling bug Co-authored-by: Igor Mandrigin <[email protected]> * return err on invalid syncmode (#4219) * save * save * save * fixed kiln bug (#4221) * Clean headers pointers when removing links (#4222) * Clean headers pointers when removing links * Replace the lock Co-authored-by: Alexey Sharp <[email protected]> * Makefile: pass docker build arguments (#4212) Dockerfile requires some --build-arg options. Fix "docker" target to pass them. Fix GIT_TAG to reflect the most recent tag related to HEAD, instead of an unrelated most recent tag. Use it as the image VERSION. Image tags need to be passed explicitly if needed: DOCKER_FLAGS='-t erigon:latest' make docker * More header download diagnostics (#4224) Co-authored-by: Alexey Sharp <[email protected]> * Clean anchors, forward sort of headers (#4225) Co-authored-by: Alexey Sharp <[email protected]> Co-authored-by: Alex Sharov <[email protected]> Co-authored-by: Giulio rebuffo <[email protected]> Co-authored-by: Artem Tsebrovskiy <[email protected]> Co-authored-by: Igor Mandrigin <[email protected]> Co-authored-by: Igor Mandrigin <[email protected]> Co-authored-by: Alexey Sharp <[email protected]> Co-authored-by: battlmonstr <[email protected]>
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.
Dockerfile requires some --build-arg options.
Fix "docker" target to pass them.
Fix GIT_TAG to reflect the most recent tag related to HEAD, instead of an unrelated most recent tag.
Use it as the image VERSION.
Image tags need to be passed explicitly if needed:
The rev-list usage wasn't correct, because in some cases the resulting GIT_TAG could be totally unrelated to the GIT_COMMIT we are building from. The describe logic is that it takes HEAD (or whatever you pass it), and follows the parent commit chain until it reaches some tag. The output is
<T>-<N>-<S>where T is the found tag, N is the number of commits between T and HEAD, and S is the HEAD SHA. e.g.v2021.10.03-1119-g70c3aedf9. Also the output is simplyTif N = 0.The output will be
<T>-<N>-<S>-dirtyor<T>-dirtyif you have uncomitted changes in the working tree when building, e.g.v2021.10.03-1119-g70c3aedf9-dirty.