diff --git a/CMakeLists.txt b/CMakeLists.txt index 74757cd..ac83734 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,10 +11,10 @@ set(MBEDTLS_ROOT ${Libraries_ROOT}/mbedtls-3.6.2) set(MBEDTLS_INCLUDE_DIR ${MBEDTLS_ROOT}/include) set(MBEDTLS_LIBRARY_DIRS ${MBEDTLS_ROOT}/lib) -set(WT_ROOT ${Libraries_ROOT}/wt-4.11.0_debug) +set(WT_ROOT ${Libraries_ROOT}/wt-4.11.0) set(WT_INCLUDE_DIR ${WT_ROOT}/include) set(WT_LIBRARY_DIRS ${WT_ROOT}/lib) -set(WT_LIBRARIES wtd wttestd wthttpd wtdbod wtdbosqlite3d) +set(WT_LIBRARIES wt wttest wthttp wtdbo wtdbosqlite3) set(OPENSSL_LIBRARIES ssl crypto) diff --git a/Dockerfiles/yoctools.dockerfile b/Dockerfiles/yoctools.dockerfile index 3d8fe9e..aaf206f 100644 --- a/Dockerfiles/yoctools.dockerfile +++ b/Dockerfiles/yoctools.dockerfile @@ -26,4 +26,5 @@ ENV LANG=C.UTF-8 ENV LC_ALL=C.UTF-8 ENV TERM=xterm-256color -# docker build --progress=tty -f yoctools.dockerfile -t registry.cn-shenzhen.aliyuncs.com/amass_toolset/yoctools:22.04 . \ No newline at end of file +# docker build --progress=tty -f yoctools.dockerfile -t registry.cn-shenzhen.aliyuncs.com/amass_toolset/yoctools:22.04 . +# docker push \ No newline at end of file diff --git a/resources/build.sh b/resources/build.sh index 894ca12..828acc3 100755 --- a/resources/build.sh +++ b/resources/build.sh @@ -83,6 +83,9 @@ function build_docker_images(){ FRP_VERSION=$(grep 'ENV FRP_VERSION' $DOCKERFILE | awk '{print $3}') docker build --progress=plain -f $DOCKERFILE -t registry.cn-shenzhen.aliyuncs.com/amass_toolset/frpc:$FRP_VERSION . docker push registry.cn-shenzhen.aliyuncs.com/amass_toolset/frpc:$FRP_VERSION + elif [[ $DOCKERFILE == *"yoctools.dockerfile" ]]; then + docker build --progress=plain -f $DOCKERFILE -t registry.cn-shenzhen.aliyuncs.com/amass_toolset/yoctools:22.04 . + docker push registry.cn-shenzhen.aliyuncs.com/amass_toolset/yoctools:22.04 else echo "not found steps for build $DOCKERFILE ..." fi