Skip to content

Makefile: use buildx when GOOS/GOARCH are specified #12081

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 21, 2023

Conversation

maxenglander
Copy link
Collaborator

@maxenglander maxenglander commented Jan 12, 2023

Addresses #12108

Right now it's not very easy to build Docker images on Mac M1, unless I'm missing something obvious.

If I try to build lite images for example, it will kick off a docker build, which will try to build arm64/aarch64 Docker images. This usually fails when the Docker build tries to download dependencies for that architecture, and the providers of those dependencies don't support it.

Trying figure out how to resolve arm64 dependencies is probably a good idea for the future, but this PR just provides a work-around by making it easier to create amd64 Docker images from Mac M1. buildx is kind of slow, but it's better than nothing. And I'm able to run amd64 images on Mac M1 thanks to rosetta.

This PR changes the make docker_* target so that it uses docker buildx to create cross-platform builds when either GOOS or GOARCH are different from, respectively,GOHOSTOS or GOHOSTARCH.

So for example, on my M1 Mac, I can build images for linux/amd64 like this:

$ GOOS=linux GOARCH=amd64 make docker_lite_mysql80

@maxenglander maxenglander added Type: CI/Build Type: Enhancement Logical improvement (somewhere between a bug and feature) labels Jan 12, 2023
@maxenglander maxenglander marked this pull request as ready for review January 12, 2023 04:02
@maxenglander maxenglander requested a review from deepthi as a code owner January 12, 2023 04:02
@maxenglander maxenglander marked this pull request as draft January 12, 2023 04:27
@maxenglander maxenglander force-pushed the maxeng-makefile-buildx branch from e6d7d0b to a52baef Compare January 13, 2023 04:57
Signed-off-by: Max Englander <max@planetscale.com>
@maxenglander maxenglander force-pushed the maxeng-makefile-buildx branch from a52baef to 5117023 Compare January 16, 2023 18:13
@maxenglander maxenglander marked this pull request as ready for review January 16, 2023 19:22
@vitess-bot
Copy link
Contributor

vitess-bot bot commented Jan 16, 2023

Review Checklist

Hello reviewers! 👋 Please follow this checklist when reviewing this Pull Request.

General

  • Ensure that the Pull Request has a descriptive title.
  • If this is a change that users need to know about, please apply the release notes (needs details) label so that merging is blocked unless the summary release notes document is included.
  • If a test is added or modified, there should be a documentation on top of the test to explain what the expected behavior is what the test does.

If a new flag is being introduced:

  • Is it really necessary to add this flag?
  • Flag names should be clear and intuitive (as far as possible)
  • Help text should be descriptive.
  • Flag names should use dashes (-) as word separators rather than underscores (_).

If a workflow is added or modified:

  • Each item in Jobs should be named in order to mark it as required.
  • If the workflow should be required, the maintainer team should be notified.

Bug fixes

  • There should be at least one unit or end-to-end test.
  • The Pull Request description should include a link to an issue that describes the bug.

Non-trivial changes

  • There should be some code comments as to why things are implemented the way they are.

New/Existing features

  • Should be documented, either by modifying the existing documentation or creating new documentation.
  • New features should have a link to a feature request issue or an RFC that documents the use cases, corner cases and test cases.

Backward compatibility

  • Protobuf changes should be wire-compatible.
  • Changes to _vt tables and RPCs need to be backward compatible.
  • vtctl command output order should be stable and awk-able.
  • RPC changes should be compatible with vitess-operator
  • If a flag is removed, then it should also be removed from VTop, if used there.

Copy link
Member

@deepthi deepthi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, nice little fix.

@deepthi deepthi requested review from vmg and aquarapid February 14, 2023 22:06
@dbussink dbussink merged commit d473a7b into vitessio:main Feb 21, 2023
@dbussink dbussink deleted the maxeng-makefile-buildx branch February 21, 2023 16:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Component: Build/CI Type: CI/Build Type: Enhancement Logical improvement (somewhere between a bug and feature)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants