diff --git a/Makefile b/Makefile index 6bd55d2e40..89c1a4e839 100644 --- a/Makefile +++ b/Makefile @@ -212,6 +212,7 @@ docker-centos-build: --name onecloud-ci-build \ --rm \ --volume $(CURDIR):/root/onecloud \ + --volume $(CURDIR)/_output/_cache:/root/.cache \ registry.cn-beijing.aliyuncs.com/yunionio/centos-build:$(DOCKER_BUILD_IMAGE_VERSION) \ /bin/bash -c "$$dockerCentOSBuildCmd" chown -R $$(id -u):$$(id -g) _output @@ -242,6 +243,7 @@ docker-alpine-build: --name onecloud-docker-alpine-build \ -v $(CURDIR):/root/go/src/yunion.io/x/onecloud \ -v $(CURDIR)/_output/alpine-build:/root/go/src/yunion.io/x/onecloud/_output \ + -v $(CURDIR)/_output/alpine-build/_cache:/root/.cache \ registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:1.0-1 \ /bin/sh -c "$$dockerAlpineBuildCmd" ls -lh _output/alpine-build/bin diff --git a/scripts/host_find_libraries.sh b/scripts/host_find_libraries.sh deleted file mode 100755 index 2733f7a07b..0000000000 --- a/scripts/host_find_libraries.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -add_host_specific_libraries() { - for libraries in 'libsoftokn3.so' 'libsqlite3.so.0' 'libfreeblpriv3.so'; do - lib_path="" - for base_lib_path in '/lib64/' '/lib/' '/usr/lib/x86_64-linux-gnu/' '/lib/x86_64-linux-gnu/'; do - if [ ! -e $base_lib_path ]; then - continue - fi - lib_path="$(find $base_lib_path -name $libraries -print -quit)" - if [ -z "$lib_path" ]; then - continue - fi - real_lib_path="$(readlink -f $lib_path)" - cp $real_lib_path $1/lib/$libraries - break - done - if [ -z "$lib_path" ]; then - echo "failed find $libraries ..." - exit 1 - fi - done -} - -add_host_specific_libraries $@