chore: add build-args for git-commit etc #14114
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
Add the ability to specify `GIT_TAG`, `GIT_COMMIT`, `BUILD_DATE` and `GIT_TREE_STATE` as optional build-args. As well as resolving argoproj#13683 (which was caused by argoproj#12620), this has the bonus of making the `docker build` slightly more deterministic (since we now have the ability to specify the same inputs into the docker build which was hitherto computed on every `docker build`). Signed-off-by: Blake Pettersson <[email protected]>
blakepettersson
changed the title
Codecov ReportPatch coverage has no change and project coverage change:
Additional details and impacted files@@ Coverage Diff @@
## master #14114 +/- ##
==========================================
+ Coverage 49.56% 49.62% +0.05%
==========================================
Files 256 256
Lines 43920 43925 +5
==========================================
+ Hits 21770 21796 +26
+ Misses 19987 19973 -14
+ Partials 2163 2156 -7 ☔ View full report in Codecov by Sentry. |
34fathombelow
requested changes
Jun 19, 2023
There was a problem hiding this comment.
After discussing the changes over with Blake via Zoom. I'm in favor of reverting #12620 & #12640.
Although this PR would fix the issue with our images, end users building their own custom images would still be affected. https://argo-cd.readthedocs.io/en/stable/operator-manual/custom_tools/#byoi-build-your-own-image
Co-authored-by: Josh Soref <[email protected]> Signed-off-by: Blake Pettersson <[email protected]>
|
@34fathombelow lgty? |
34fathombelow
approved these changes
Jun 20, 2023
|
/cherry-pick release-2.7 |
crenshaw-dev
approved these changes
Jun 20, 2023
|
Cherry-pick failed with |
|
Thanks guys! |
3 tasks
6 tasks
yyzxw
pushed a commit
to yyzxw/argo-cd
that referenced
this pull request
Aug 9, 2023
* build: add build-args for git-commit etc Add the ability to specify `GIT_TAG`, `GIT_COMMIT`, `BUILD_DATE` and `GIT_TREE_STATE` as optional build-args. As well as resolving argoproj#13683 (which was caused by argoproj#12620), this has the bonus of making the `docker build` slightly more deterministic (since we now have the ability to specify the same inputs into the docker build which was hitherto computed on every `docker build`). Signed-off-by: Blake Pettersson <[email protected]> * Update .github/workflows/image-reuse.yaml Co-authored-by: Josh Soref <[email protected]> Signed-off-by: Blake Pettersson <[email protected]> --------- Signed-off-by: Blake Pettersson <[email protected]> Co-authored-by: Josh Soref <[email protected]>
tesla59
pushed a commit
to tesla59/argo-cd
that referenced
this pull request
Dec 16, 2023
* build: add build-args for git-commit etc Add the ability to specify `GIT_TAG`, `GIT_COMMIT`, `BUILD_DATE` and `GIT_TREE_STATE` as optional build-args. As well as resolving argoproj#13683 (which was caused by argoproj#12620), this has the bonus of making the `docker build` slightly more deterministic (since we now have the ability to specify the same inputs into the docker build which was hitherto computed on every `docker build`). Signed-off-by: Blake Pettersson <[email protected]> * Update .github/workflows/image-reuse.yaml Co-authored-by: Josh Soref <[email protected]> Signed-off-by: Blake Pettersson <[email protected]> --------- Signed-off-by: Blake Pettersson <[email protected]> Co-authored-by: Josh Soref <[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.
Add the ability to specify
GIT_TAG,GIT_COMMIT,BUILD_DATEandGIT_TREE_STATEas optional build-args. As well as resolving #13683 (which was caused by #12620), this has the bonus of making thedocker buildslightly more deterministic (since we now have the ability to specify the same inputs into the docker build which was hitherto computed on everydocker build).Note on DCO:
If the DCO action in the integration test fails, one or more of your commits are not signed off. Please click on the Details link next to the DCO action for instructions on how to resolve this.
Checklist:
Please see Contribution FAQs if you have questions about your pull-request.