Skip to content

fix build script to adapt to macos m1. #1169

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.

Sign up for GitHub

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
Slach merged 1 commit into from
Jun 6, 2023
Merged

fix build script to adapt to macos m1. #1169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dev/generate_helm_chart.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ function usage() {
cat << EOT
Script splits clickhouse-operator-install-bundle.yaml to separate files and adjusts them to conform the helm standards
NOTE script requires some pre-installed tools:
- yq ( https://mikefarah.gitbook.io/yq/ ) > v4.14.x
- yq ( https://mikefarah.gitbook.io/yq/ ) > v4.14.x. Do not use brew install yq in MacOS，Version is lower than it.
- jq ( https://github.com/stedolan/jq )
- helm-docs ( https://github.com/norwoodj/helm-docs )
- perl ( https://learn.perl.org/installing/ )
Expand Down
11 changes: 8 additions & 3 deletions dev/image_build_universal.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,14 @@ if [[ "${MINIKUBE}" == "yes" ]]; then
eval "$(minikube docker-env)"
fi

if ! docker run --rm --privileged multiarch/qemu-user-static --reset -p yes; then
sudo apt-get install -y qemu binfmt-support qemu-user-static
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
ARCHITECTURE=$(uname -m)
# Do nothing if architecture is arm，such as MacOS M1/M2

if [[ ! "${ARCHITECTURE}" =~ "arm" ]]; then
if ! docker run --rm --privileged multiarch/qemu-user-static --reset -p yes; then
sudo apt-get install -y qemu binfmt-support qemu-user-static
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
fi
fi

if [[ "0" == $(docker buildx ls | grep -E 'linux/arm.+\*' | grep -E 'running|inactive') ]]; then
Expand Down