hack: remove -installsuffix build flag #44853
Conversation
thaJeztah
added
status/2-code-review
process/cherry-pick
area/packaging
kind/refactor
There was a problem hiding this comment.
Code changes look good to me (left one minor comment).
Also looked at the commit messages, and I know referring to PR numbers can be "noisy"; I generally use commits instead (which also allows finding back the related change without GitHub). Perhaps you could change those?
hack: remove -installsuffix build flag
Has been introduced in #10155
to work around a bug with "go build" but not required anymore
Can you change the PR number to 232d59baeb13778abc242a602ca434d83e1eb6e8 (commit?)
hack: remove ORIG_BUILDFLAGS var
This var was used for the cross target but it has been removed
in #44546 so not necessary anymore
Can you change the PR number to a commit? (Is there a specific commit we can point to? Otherwise, we could use the merge commit; b9fe30dad49db41fc8fb41da8fef46f0fb0d42b9
| -X \"github.com/docker/docker/dockerversion.BuildTime=${BUILDTIME}\" \ | ||
| -X \"github.com/docker/docker/dockerversion.PlatformName=${PLATFORM}\" \ | ||
| -X \"github.com/docker/docker/dockerversion.ProductName=${PRODUCT}\" \ | ||
| -X \"github.com/docker/docker/dockerversion.DefaultProductLicense=${DEFAULT_PRODUCT_LICENSE}\" " |
There was a problem hiding this comment.
Could be worth keeping the last quote on a separate line (it's easy to miss that it's there); probably that was one of the reasons to use the indentation here.
Has been introduced in 232d59b to work around a bug with "go build" but not required anymore since go 1.5: golang/go@4dab6d0 Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
This var was used for the cross target but it has been removed in 8086f40 so not necessary anymore Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
crazy-max
force-pushed
the
rm-install-suffix
branch
from
68451ca
to
170a1c4
Compare
|
Let me bring this one in. I added a cherry-pick label to keep the 23 branch a bit cleaned up as well, but it's definitely not an urgent one. |
follow-up #44546 (comment)
- What I did
-installsuffix netgohas been added in #10155 to work around a bug with "go build" but not required anymore since go 1.5: golang/go@4dab6d0Also took the opportunity to:
ORIG_BUILDFLAGSvar that was used for the cross target but has been removedin Dockerfile: use TARGETPLATFORM to build Docker #44546 so not necessary anymore
make.shscriptDOCKER_DEBUGis set (had to remove extra tabs and new lines to avoid a clunky output)- How I did it
- How to verify it
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)