Makefile: mutualize local and Dockerfile build opts

[crazy-max]

follow-up #9771 (comment)

Made some changes to avoid drifting with build opts between local and Dockerfile.

@thaJeztah We can then change https://github.com/docker/docker-ce-packaging/blob/43635c4329d15c3639d6b8693b653b7ea9818487/deb/common/rules#L27-L34:

	&& mkdir -p /usr/libexec/docker/cli-plugins/ \
	&& GO111MODULE=on \
		CGO_ENABLED=0 \
			go build \
				-trimpath \
				-ldflags="-s -w -X github.com/docker/compose/v2/internal.Version=$(COMPOSE_VERSION)" \
				-o "/usr/libexec/docker/cli-plugins/docker-compose" \
				./cmd

With:

	&& make build DESTDIR=/usr/libexec/docker/cli-plugins

Also fixes the cross goal that was not building the right bake target.

closes #9771
closes #9765

Signed-off-by: CrazyMax crazy-max@users.noreply.github.com

[thaJeztah]

LGTM

(one last question #9776 (comment), but not a blocker)

do we need to try this one in docker-ce-packaging?

[crazy-max]

do we need to try this one in docker-ce-packaging?

Yes good idea

[thaJeztah]

do we need to try this one in docker-ce-packaging?

Yes good idea

I was about to start a branch, but let me know if you're working on that (otherwise we'll end up in a race condition 😂 )

[crazy-max]

do we need to try this one in docker-ce-packaging?

Yes good idea

I was about to start a branch, but let me know if you're working on that (otherwise we'll end up in a race condition 😂 )

Feel free to do it and @ me

[thaJeztah]

There you go; docker/docker-ce-packaging#748 (hope it works with using branch-name as reference 😂)

[thaJeztah]

CI on docker/docker-ce-packaging#748 is happy 🎉

LGTM, thank you!

[thaJeztah]

Did a quick rebase, as this repo looks to have "PR is outdated" checks enabled, in case that's a blocker (rebase was clean).

@nicksieger I think your comment (#9776 (comment)) was addressed; see #9776 (comment), PTAL

[nicksieger]

LGTM, looks cleaner too, thanks.

[thaJeztah]

just realised this was not included in the v20.10.1 patch release 😂 - I was updating the build pipeline with the expectation this was fixed, and things failed, then realised it was not merged yet. 🙃 🙈

[nicksieger]

Sorry about that. Wasn't sure how soon @crazy-max was going to get back to this so I didn't think to hold the release up for it. I have no problem creating a 2.10.2 release sooner than later.

[thaJeztah]

No need to rush; we patched the release scripts for 20.10.0 to make it work. I was just "wait? what did I mess up?" ooooooooh.. 😂