diff --git a/build/docker/Dockerfile.baremetal-agent b/build/docker/Dockerfile.baremetal-agent index f076ce22d0..613c0d8062 100644 --- a/build/docker/Dockerfile.baremetal-agent +++ b/build/docker/Dockerfile.baremetal-agent @@ -4,6 +4,8 @@ MAINTAINER "Zexi Li " RUN mkdir -p /opt/yunion/bin -ADD ./_output/bin/baremetal-agent /opt/yunion/bin/baremetal-agent -ADD ./_output/bin/.baremetal-agent.bin /opt/yunion/bin/.baremetal-agent.bin -ADD ./_output/bin/bundles/baremetal-agent /opt/yunion/bin/bundles/baremetal-agent +#ADD ./_output/bin/baremetal-agent /opt/yunion/bin/baremetal-agent +#ADD ./_output/bin/.baremetal-agent.bin /opt/yunion/bin/.baremetal-agent.bin +#ADD ./_output/bin/bundles/baremetal-agent /opt/yunion/bin/bundles/baremetal-agent +RUN apk add librados librbd +ADD ./_output/alpine-build/bin/baremetal-agent /opt/yunion/bin/baremetal-agent diff --git a/scripts/docker_push.sh b/scripts/docker_push.sh index 7a3238ed2a..f46161e708 100755 --- a/scripts/docker_push.sh +++ b/scripts/docker_push.sh @@ -63,11 +63,11 @@ build_bin() { local BUILD_ARCH=$2 local BUILD_CGO=$3 case "$1" in - baremetal-agent) - rm -vf _output/bin/$1 - rm -rvf _output/bin/bundles/$1 - GOOS=linux make cmd/$1 - ;; + # baremetal-agent) + # rm -vf _output/bin/$1 + # rm -rvf _output/bin/bundles/$1 + # GOOS=linux make cmd/$1 + # ;; climc) if [[ "$BUILD_ARCH" == *arm64 ]]; then # exclude rbdcli for arm64 @@ -206,13 +206,13 @@ for component in $COMPONENTS; do continue fi echo "Start to build component: $component" - if [[ $component == baremetal-agent ]]; then - if [[ "$ARCH" == "arm64" ]]; then - continue - fi - build_process $component - continue - fi + # if [[ $component == baremetal-agent ]]; then + # if [[ "$ARCH" == "arm64" ]]; then + # continue + # fi + # build_process $component + # continue + # fi case "$ARCH" in all)