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

Fix m1 Support Issue in #521 #522

Merged
merged 2 commits into from Mar 25, 2023
Merged

Conversation

xichen1
Copy link
Member

@xichen1 xichen1 commented Mar 18, 2023

If current arch is arm64, use docker platform linux/amd64,
still use linux/$(ARCH) platform for all other arches.

If current arch is arm64, use docker platform linux/amd64,
still use linux/$(ARCH) platform for all other arches.

Signed-off-by: xichen1 <xichen.pan@gmail.com>
Makefile Outdated
@@ -211,7 +211,11 @@ stop-docker-compose:
images: api-engine docker-rest-agent fabric dashboard

api-engine:
docker build -t hyperledger/cello-api-engine:latest -f build_image/docker/common/api-engine/Dockerfile.in ./ --platform linux/$(ARCH)
if [ "$(ARCH)" = "arm64" ]; then \
Copy link
Member

Choose a reason for hiding this comment

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

if [ "$string1" == "$string2" ]; then

Signed-off-by: xichen1 <xichen.pan@gmail.com>
@xichen1 xichen1 merged commit 676839f into hyperledger:main Mar 25, 2023
3 checks passed
@xichen1 xichen1 deleted the fix_m1_makefile branch May 7, 2023 06:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants