From 4c782303fab90aebaeb4570980bc533d85c4e8e8 Mon Sep 17 00:00:00 2001 From: qizhicheng Date: Thu, 16 Nov 2023 18:05:07 +0800 Subject: [PATCH] fix depends --- src/docker/Dockerfile-base | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/src/docker/Dockerfile-base b/src/docker/Dockerfile-base index dc630d8141..bbc408dd83 100644 --- a/src/docker/Dockerfile-base +++ b/src/docker/Dockerfile-base @@ -21,10 +21,8 @@ RUN yum install -y epel-release \ && wget -q https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \ && tar -C /opt -xzvf dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \ #sqladvisor - && yum -y install https://mirrors.ustc.edu.cn/percona/percona/yum/percona-release-latest.noarch.rpm \ - && sed -e 's|http://repo.percona.com/|https://mirrors.ustc.edu.cn/percona/|g' -i /etc/yum.repos.d/percona-*.repo \ - && yum -y install Percona-Server-devel-57 Percona-Server-shared-57 Percona-Server-client-57 \ - && yum -y install percona-toolkit \ + && yum -yq install https://mirrors.ustc.edu.cn/percona/percona/yum/percona-release-latest.noarch.rpm \ + && yum -yq install Percona-Server-devel-57 Percona-Server-shared-57 Percona-Server-client-57 percona-toolkit \ && ln -fs /usr/lib64/mysql/libmysqlclient.so.18 /usr/lib64/libperconaserverclient_r.so \ && cd /opt \ && curl -o sqladvisor -L https://github.com/LeoQuote/SQLAdvisor/releases/download/v2.1/sqladvisor-linux-amd64 \ @@ -45,8 +43,6 @@ ENV TZ=Asia/Shanghai WORKDIR /opt -COPY --from=compbasedeps /etc/yum.repos.d/percona-*.repo /opt/ -COPY --from=compbasedeps /etc/pki/rpm-gpg/PERCONA-* /opt/ COPY --from=compbasedeps /etc/yum.repos.d/epel*.repo /etc/yum.repos.d/ COPY --from=compbasedeps /opt/sqladvisor /opt/ COPY --from=compbasedeps /opt/soar /opt/ @@ -56,21 +52,20 @@ COPY --from=compbasedeps /opt/mongodb-linux-x86_64-rhel70-3.6.20/bin/mongo /usr/ COPY --from=compbasedeps /usr/local/python3 /usr/local/python3 COPY --from=compbasedeps /opt/sqlparser /usr/local/sqlparser -RUN yum -y install glibc-common cyrus-sasl-gssapi cyrus-sasl-plain cmake bison gcc-c++ libaio-devel glib2 \ +RUN yum -yq install glibc-common cyrus-sasl-gssapi cyrus-sasl-plain cmake bison gcc-c++ libaio-devel glib2 \ glib2-devel xz-libs libffi-devel gcc make zlib-devel openssl-devel ncurses-devel openldap-devel gettext \ bzip2-devel xz-devel wget \ # mysql && curl -o mysql-community.rpm -L https://dev.mysql.com/get/mysql80-community-release-el9-5.noarch.rpm \ - && yum -y install mysql-community.rpm \ - && yum -y install mysql-devel \ + && yum -yq install mysql-community.rpm \ + && yum -yq install mysql-devel \ #msodbc && curl https://packages.microsoft.com/config/rhel/7/prod.repo > /etc/yum.repos.d/mssql-release.repo \ && ACCEPT_EULA=Y yum -y install msodbcsql17 unixODBC-devel \ #oracle client - && yum -y install http://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient19.3-basiclite-19.3.0.0.0-1.x86_64.rpm \ - && mv /opt/percona-*.repo /etc/yum.repos.d/ \ - && mv /opt/PERCONA-* /etc/pki/rpm-gpg/ \ - && yum -y install Percona-Server-devel-57 Percona-Server-shared-57 Percona-Server-client-57 percona-toolkit \ + && yum -yq install http://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient19.3-basiclite-19.3.0.0.0-1.x86_64.rpm \ + && yum -yq install https://repo.percona.com/yum/percona-release-latest.noarch.rpm \ + && yum -yq install Percona-Server-devel-57 Percona-Server-shared-57 Percona-Server-client-57 percona-toolkit \ && yum clean all \ && rm -rf /var/cache/yum/* \ && ln -fs /usr/lib64/mysql/libmysqlclient.so.18 /usr/lib64/libperconaserverclient_r.so \