From 4dfdad100d55205fac7eeebe8d97684a2e0ac51f Mon Sep 17 00:00:00 2001 From: liuheng Date: Thu, 14 Sep 2023 10:48:34 +0800 Subject: [PATCH] =?UTF-8?q?fix=20master=E5=88=86=E6=94=AFcm=5Fctl=20query?= =?UTF-8?q?=20=E6=89=BE=E4=B8=8D=E5=88=B0=E9=9D=99=E6=80=81=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dockerfiles/dockerfile_amd | 2 +- dockerfiles/dockerfile_arm | 2 +- dockerfiles/entrypoint.sh | 7 +++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dockerfiles/dockerfile_amd b/dockerfiles/dockerfile_amd index c547ee4..76b75ee 100644 --- a/dockerfiles/dockerfile_amd +++ b/dockerfiles/dockerfile_amd @@ -1,6 +1,6 @@ FROM centos:7.6.1810 -ENV OPENGAUSS_VERSION 5.0.0 +ENV OPENGAUSS_VERSION 5.1.0 COPY openGauss-${OPENGAUSS_VERSION}-CentOS-64bit-all.tar.gz . COPY gosu-amd64 /usr/local/bin/gosu diff --git a/dockerfiles/dockerfile_arm b/dockerfiles/dockerfile_arm index 6bc3e49..0c16d5e 100644 --- a/dockerfiles/dockerfile_arm +++ b/dockerfiles/dockerfile_arm @@ -1,6 +1,6 @@ FROM openeuler-20.03-lts:latest -ENV OPENGAUSS_VERSION 5.0.0 +ENV OPENGAUSS_VERSION 5.1.0 COPY openGauss-${OPENGAUSS_VERSION}-openEuler-64bit-all.tar.gz . COPY gosu-arm64 /usr/local/bin/gosu diff --git a/dockerfiles/entrypoint.sh b/dockerfiles/entrypoint.sh index 21fae4b..47c8a27 100755 --- a/dockerfiles/entrypoint.sh +++ b/dockerfiles/entrypoint.sh @@ -75,6 +75,13 @@ function install_application() { tar -xf openGauss-${plat_info}-64bit.tar.bz2 -C ${app_path} tar -xf openGauss-${plat_info}-64bit-cm.tar.gz -C ${app_path} tar -xf openGauss-${plat_info}-64bit-om.tar.gz -C ${tool_path} + # 拷贝python3依赖的lib + python_version=$(python3 -V | awk '{print $2}' | awk -F'.' '{print $2}') + cd ${tool_path}/lib/ || exit + cp bcrypt/lib3.${python_version}/_bcrypt.abi3.so bcrypt/ + cp _cffi_backend_3.${python_version}/_cffi_backend.so ./ + cp cryptography/hazmat/bindings/lib3.${python_version}/*.so cryptography/hazmat/bindings/ + cp nacl/lib3.${python_version}/_sodium.abi3.so nacl/ mv $ROOT_DIR/gs_createtrust.py ${tool_path}/script } -- Gitee