From 1bbf79528b4428d6ba1f11b5719d686d79ace327 Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Thu, 27 Feb 2020 17:37:39 +0800 Subject: [PATCH] build: host: adjust build method - new host-base for native alpine utilities - build host with native alpine toolchain --- build/docker/Dockerfile.host | 8 +++----- scripts/docker_push.sh | 7 ++----- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/build/docker/Dockerfile.host b/build/docker/Dockerfile.host index 631ba9c52a..668ed6b333 100644 --- a/build/docker/Dockerfile.host +++ b/build/docker/Dockerfile.host @@ -1,11 +1,9 @@ -FROM registry.cn-beijing.aliyuncs.com/yunionio/host-base:v0.0.1 +FROM registry.cn-beijing.aliyuncs.com/yunionio/host-base:v0.1.0 MAINTAINER "Yaoqi Wan wanyaoqi@yunionyun.com" ENV TZ Asia/Shanghai +RUN apk add librados librbd RUN mkdir -p /opt/yunion/bin - -ADD ./_output/bin/host /opt/yunion/bin/host -ADD ./_output/bin/.host.bin /opt/yunion/bin/.host.bin -ADD ./_output/bin/bundles/host /opt/yunion/bin/bundles/host +ADD ./_output/alpine-build/bin/host /opt/yunion/bin/host diff --git a/scripts/docker_push.sh b/scripts/docker_push.sh index 34474e3046..f17c500f7a 100755 --- a/scripts/docker_push.sh +++ b/scripts/docker_push.sh @@ -38,7 +38,7 @@ build_bin() { climc) GOOS=linux make cmd/$1 cmd/*cli ;; - vpcagent) + vpcagent|host) docker run --rm \ -v $SRC_DIR:/root/go/src/yunion.io/x/onecloud \ -v $SRC_DIR/_output/alpine-build:/root/go/src/yunion.io/x/onecloud/_output \ @@ -53,12 +53,9 @@ build_bin() { build_bundle_libraries() { - for bundle_component in 'host' 'host-deployer' 'baremetal-agent'; do + for bundle_component in 'host-deployer' 'baremetal-agent'; do if [ $1 == $bundle_component ]; then $CUR_DIR/bundle_libraries.sh _output/bin/bundles/$1 _output/bin/$1 - if [ $bundle_component == 'host' ]; then - $CUR_DIR/host_find_libraries.sh _output/bin/bundles/$1 - fi break fi done