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 docker for apple silicon macs #68

Merged
merged 5 commits into from
Sep 15, 2023
Merged

Fix docker for apple silicon macs #68

merged 5 commits into from
Sep 15, 2023

Conversation

fl0rek
Copy link
Member

@fl0rek fl0rek commented Sep 15, 2023

Explicitly set platform in docker compose, otherwise docker tries to start it as linux/arm64 and musl is unhappy. https://stackoverflow.com/questions/71040681/qemu-x86-64-could-not-open-lib64-ld-linux-x86-64-so-2-no-such-file-or-direc

upper=${lower^^} syntax exists from bash 4.0, macos has 3.2. Replace it with tr. https://unix.stackexchange.com/questions/51983/how-to-uppercase-the-command-line-argument

Mac's sed is more BSD-like and -i suffix cannot be ommited when empty. there's no command that works for both GNU and Mac's BSD-like and doesn't create a backup file.
https://stackoverflow.com/questions/4247068/sed-command-with-i-option-failing-on-mac-but-works-on-linux

This all should be portable enough to work on linux and recent macs .

tools/gen_auth_tokens.sh Outdated Show resolved Hide resolved
@fl0rek fl0rek changed the title Fix docker for M1 macs Fix docker for apple silicon macs Sep 15, 2023
tools/gen_auth_tokens.sh Outdated Show resolved Hide resolved
tools/gen_auth_tokens.sh Outdated Show resolved Hide resolved
tools/gen_auth_tokens.sh Outdated Show resolved Hide resolved
Co-authored-by: Yiannis Marangos <psyberbits@gmail.com>
tools/gen_auth_tokens.sh Outdated Show resolved Hide resolved
@fl0rek fl0rek marked this pull request as ready for review September 15, 2023 14:03
Copy link
Member

@oblique oblique left a comment

Choose a reason for hiding this comment

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

lgtm

@oblique oblique requested a review from zvolin September 15, 2023 15:24
@zvolin zvolin merged commit 9f0bdc8 into eigerco:main Sep 15, 2023
4 checks passed
@fl0rek fl0rek deleted the mac-compat branch July 22, 2024 15:10
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.

3 participants