-
-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Add ARM support #1538
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
Add ARM support #1538
Changes from all commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
1a390dd
Start messing with arm
chadwhitacre 4072867
Keep messing with ARM
chadwhitacre 357160b
Start messing with arm
chadwhitacre c5315b5
Keep messing with ARM
chadwhitacre d8791f2
Configure docker platform when building
emmatyping 92c4e96
Fix including memory limit on ARM Clickhouse image
emmatyping 01745d2
Merge armmac into cwlw/arm
emmatyping 8ef61db
ref: Automatically detect and configure docker platform/clickhouse
emmatyping 10c5755
Use export, oops
emmatyping 409485c
Make platform check more robust
emmatyping e34503d
Fix docker-compose.yml to allow running without platform environment …
emmatyping 7453b24
Restore SSE4.2 check on x86_64
emmatyping 9f781af
Add newline to end of Dockerfile
emmatyping ce6e194
Remove spurrious newline
emmatyping 7e9a529
Use same ARM image for clickhouse as the dev environment
emmatyping File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| ARG BASE_IMAGE | ||
| FROM ${BASE_IMAGE} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| echo "${_group}Detecting Docker platform" | ||
|
|
||
|
|
||
| # Sentry SaaS uses stock Yandex ClickHouse, but they don't provide images that | ||
| # support ARM, which is relevant especially for Apple M1 laptops, Sentry's | ||
| # standard developer environment. As a workaround, we use an altinity image | ||
| # targeting ARM. | ||
| # | ||
| # See https://github.com/getsentry/self-hosted/issues/1385#issuecomment-1101824274 | ||
| # | ||
| # Images built on ARM also need to be tagged to use linux/arm64 on Apple | ||
| # silicon Macs to work around an issue where they are built for | ||
| # linux/amd64 by default due to virtualization. | ||
| # See https://github.com/docker/cli/issues/3286 for the Docker bug. | ||
emmatyping marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| export DOCKER_ARCH=$(docker info --format '{{.Architecture}}') | ||
|
|
||
| if [[ "$DOCKER_ARCH" = "x86_64" ]]; then | ||
| export DOCKER_PLATFORM="linux/amd64" | ||
| export CLICKHOUSE_IMAGE="yandex/clickhouse-server:20.3.9.70" | ||
| elif [[ "$DOCKER_ARCH" = "aarch64" ]]; then | ||
| export DOCKER_PLATFORM="linux/arm64" | ||
| export CLICKHOUSE_IMAGE="altinity/clickhouse-server:21.6.1.6734-testing-arm" | ||
| else | ||
| echo "FAIL: Unsupported docker architecture $DOCKER_ARCH." | ||
| exit 1 | ||
| fi | ||
| echo "Detected Docker platform is $DOCKER_PLATFORM" | ||
|
|
||
| echo "${_endgroup}" | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.