From eda8be1be8665cacb714695c4afd81bdd49fdbf1 Mon Sep 17 00:00:00 2001 From: Zhang Dongliang Date: Sat, 10 Oct 2020 14:56:14 +0800 Subject: [PATCH] =?UTF-8?q?esxi-agent=20=E7=BC=96=E8=AF=91=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=E5=85=BC=E5=AE=B9=20arm64?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/docker/multi-arch/Dockerfile.esxi-agent | 16 ---------------- scripts/docker_push.sh | 5 ++++- 2 files changed, 4 insertions(+), 17 deletions(-) delete mode 100644 build/docker/multi-arch/Dockerfile.esxi-agent diff --git a/build/docker/multi-arch/Dockerfile.esxi-agent b/build/docker/multi-arch/Dockerfile.esxi-agent deleted file mode 100644 index d4b4bb422b..0000000000 --- a/build/docker/multi-arch/Dockerfile.esxi-agent +++ /dev/null @@ -1,16 +0,0 @@ -FROM registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:1.0-5 as build -ARG TARGETPLATFORM -ARG BUILDPLATFORM -RUN mkdir -p /root/go/src/yunion.io/x/onecloud -COPY . /root/go/src/yunion.io/x/onecloud - -WORKDIR /root/go/src/yunion.io/x/onecloud -RUN make cmd/esxi-agent - -FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2 - -MAINTAINER "Yaoqi Wan wanyaoqi@yunionyun.com" - -RUN mkdir -p /opt/yunion/bin -COPY --from=build /root/go/src/yunion.io/x/onecloud/build/esxi-agent/root/opt/ /opt/ -COPY --from=build /root/go/src/yunion.io/x/onecloud/_output/bin/esxi-agent /opt/yunion/bin/esxi-agent diff --git a/scripts/docker_push.sh b/scripts/docker_push.sh index c718c92635..8e779236c8 100755 --- a/scripts/docker_push.sh +++ b/scripts/docker_push.sh @@ -119,7 +119,7 @@ build_process_with_buildx() { fi case "$component" in - host | esxi-agent | torrent) + host | torrent) buildx_and_push $img_name $DOCKER_DIR/multi-arch/Dockerfile.$component $SRC_DIR $arch ;; *) @@ -151,6 +151,9 @@ for component in $COMPONENTS; do fi echo "Start to build component: $component" if [[ $component == baremetal-agent ]]; then + if [[ "$ARCH" == "arm64" ]]; then + continue + fi build_process $component continue fi