fix: update Dockerfile version output #4212
Merged
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
Signed-off-by: Milos Gajdos <milosthegajdos@gmail.com>
thaJeztah
reviewed
Dec 22, 2023
| @@ -16,7 +16,7 @@ FROM base AS version | |||
| ARG PKG=github.com/distribution/distribution/v3 | |||
| RUN --mount=target=. \ | |||
| VERSION=$(git describe --match 'v[0-9]*' --dirty='.m' --always --tags) REVISION=$(git rev-parse HEAD)$(if ! git diff --no-ext-diff --quiet --exit-code; then echo .m; fi); \ | |||
| echo "-X ${PKG}/version.Version=${VERSION#v} -X ${PKG}/version.Revision=${REVISION} -X ${PKG}/version.Package=${PKG}" | tee /tmp/.ldflags; \ | |||
| echo "-X ${PKG}/version.version=${VERSION#v} -X ${PKG}/version.revision=${REVISION} -X ${PKG}/version.mainpkg=${PKG}" | tee /tmp/.ldflags; \ | |||
There was a problem hiding this comment.
Wait, does that work with non-exported fields? TIL; thought they had to be exported for the -X functions to work, but perhaps that's just what I'm used to 😂
We should start looking if we can use go's built-in metadata for this (although I think that's producing versions based on the module version, not specifically git state, and we'd probably still want to have options to override these)
There was a problem hiding this comment.
See the comment in @corhere's original PR
crazy-max
approved these changes
Dec 23, 2023
|
PTAL @corhere @wy65701436 @Jamstah |
Jamstah
approved these changes
Jan 15, 2024
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.
We changed what we print in the version info in #4204
But we haven't updated the
Dockerfile. This PR fixes that.The output now:
$ make image docker buildx bake --set "*.tags=distribution/distribution:latest" image-local [+] Building 77.7s (22/22) FINISHED ... ... $ docker run -it distribution/distribution --version registry github.com/distribution/distribution/v3 3.0.0-alpha.1-13-gfb6ccc33.m