Merge pull request #229 from Yuaninga/master

fix:arm64 compilation
chaosblade-io · Sep 15, 2023 · 466d1d6 · 466d1d6
2 parents a063e99 + adc3f30
commit 466d1d6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -41,7 +41,7 @@ docker-build:
 
 docker-build-arm64:
 	GOOS="linux" GOARCH="arm64" go build $(GO_FLAGS) -o build/_output/bin/chaosblade-operator cmd/manager/main.go
-	docker build -f build/image/arm/Dockerfile -t ghcr.io/chaosbladeio/chaosblade-operator-arm64:${BLADE_VERSION} .
+	docker buildx  build -f build/image/arm/Dockerfile  --platform=linux/arm64  -t ghcr.io/chaosbladeio/chaosblade-operator-arm64:${BLADE_VERSION} .
 
 push_image:
 	docker push ghcr.io/chaosbladeio/chaosblade-operator:${BLADE_VERSION}

diff --git a/build/image/amd/Dockerfile b/build/image/amd/Dockerfile
@@ -11,6 +11,7 @@ ENV OPERATOR=/usr/local/bin/chaosblade-operator \
 COPY --from=builder ${OPERATOR} /usr/local/bin/
 COPY build/bin /usr/local/bin
 
+RUN chmod 777  /usr/local/bin/user_setup
 RUN /usr/local/bin/user_setup
 
 ENTRYPOINT ["/usr/local/bin/entrypoint"]
diff --git a/build/image/arm/Dockerfile b/build/image/arm/Dockerfile
@@ -11,6 +11,7 @@ ENV OPERATOR=/usr/local/bin/chaosblade-operator \
 COPY --from=builder ${OPERATOR} /usr/local/bin/
 COPY build/bin /usr/local/bin
 
+RUN chmod 777  /usr/local/bin/user_setup
 RUN /usr/local/bin/user_setup
 
 ENTRYPOINT ["/usr/local/bin/entrypoint"]