diff --git a/Dockerfile b/Dockerfile index e1f20f3..198cd16 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,7 +30,7 @@ ARG APT_SOURCE=aliyun ARG LOCAL_URL="" # 0. 预处理 ====================================================================== -FROM --platform=${TARGETPLATFORM:-linux/amd64} ${REGISTRY_URL}colovu/dbuilder:11 as builder +FROM --platform=${BUILDPLATFORM:-linux/amd64} ${REGISTRY_URL}colovu/dbuilder:11 as builder # 声明需要使用的全局可变参数 ARG APP_NAME @@ -44,8 +44,8 @@ RUN select_source ${APT_SOURCE}; # 安装依赖的软件包及库(Optional) # 官方推荐包:Cyrus SASL 2.1.27+、OpenSSL 1.1.1+、libevent 2.1.8+、libsodium(groff) -RUN install_pkg libtool libltdl7 libltdl-dev libperl-dev libssl1.1 libssl-dev libcrypto++-dev libsasl2-dev libevent-dev groff groff-base libdb5.3-dev -# RUN install_pkg libtool libltdl7 libltdl-dev libperl-dev +RUN install_pkg libperl-dev libcrypto++-dev libsasl2-dev libevent-dev libdb5.3-dev groff groff-base +# dbuilder已安装: libtool libltdl7 libltdl-dev libssl1.1 libssl-dev # 设置工作目录 WORKDIR /tmp @@ -70,6 +70,7 @@ RUN set -eux; \ cd ${APP_SRC}; \ ./configure \ --prefix=/usr/local/${APP_NAME} \ + CPPFLAGS="-I/usr/local/include -D_GNU_SOURCE" LDFLAGS="-L/usr/local/lib" \ --enable-dynamic \ --enable-cleartext --enable-crypt --enable-spasswd --enable-modules \ --enable-bdb --enable-mdb --enable-ndb=no --enable-sql=no \ @@ -77,8 +78,7 @@ RUN set -eux; \ --with-cyrus-sasl --with-tls=openssl \ ; \ make depend; \ - make -j "$(nproc)"; \ - make install; + make -j "$(nproc)" && make install; # 删除编译生成的多余文件 RUN set -eux; \