Skip to content
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

Simplify Dockerfile #2271

Merged
merged 2 commits into from
Apr 7, 2022
Merged

Simplify Dockerfile #2271

merged 2 commits into from
Apr 7, 2022

Conversation

Thearas
Copy link
Contributor

@Thearas Thearas commented Mar 26, 2022

Pull Request

What does this PR do?

  1. Fixes Dockerfile: remove the complexity of the double build #2234
  2. Replace $TARGETPLATFORM with apk --print-arch to make Dockerfile available for docker build as well, not just docker buildx (inspired by rust-lang/docker-rust)

PTAL @curquiza

PR checklist

Please check if your PR fulfills the following requirements:

  • Does this PR fix an existing issue?
  • Have you read the contributing guidelines?
  • Have you made sure that the title is accurate and descriptive of the changes?

Thank you so much for contributing to Meilisearch!

Copy link
Member

@curquiza curquiza left a comment

Choose a reason for hiding this comment

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

Thanks @Thearas for this PR!!

The build and the image both work on my MacOs (non-m1).

I let @ManyTheFish and @irevoire test and review :)

@brunoocasali
Copy link
Member

Thanks @Thearas for this PR!!

The build and the image both work on my MacOs (non-m1).

I let @ManyTheFish and @irevoire test and review :)

I tested it on my M1 mac, and it works!

@curquiza curquiza added this to the v0.27.0 milestone Apr 6, 2022
Copy link
Member

@ManyTheFish ManyTheFish left a comment

Choose a reason for hiding this comment

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

Hello @Thearas,
thanks for your contribution!

bors merge

@bors
Copy link
Contributor

bors bot commented Apr 7, 2022

@bors bors bot merged commit bb5f0e1 into meilisearch:main Apr 7, 2022
@Thearas Thearas deleted the docker branch April 7, 2022 12:50
@curquiza curquiza added the v0.27.0 PRs/issues solved in v0.27.0 label Aug 24, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
v0.27.0 PRs/issues solved in v0.27.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Dockerfile: remove the complexity of the double build
4 participants