diff --git a/Dockerfile b/Dockerfile index b672570..16b2af1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,29 +4,20 @@ COPY netrc.conf /root/.netrc COPY tsg_framework.sh /etc/profile.d/tsg_framework.sh RUN cp /tmp/repo.internal.geedge.net.repo /etc/yum.repos.d/ && \ - yum install -y gcc gcc-c++ make epel-release patch wget socat automake autoconf libtool rpm-build git yum-utils && \ - wget -O /etc/yum.repos.d/epel.repo http://mirrors.aliyun.com/repo/epel-archive-8.repo && \ - sed -i 's/epel-archive/epel/g' /etc/yum.repos.d/epel.repo && \ - yum-config-manager --enable powertools && \ + yum install -y gdb gcc gcc-c++ epel-release git yum-utils && \ dnf --enablerepo=powertools install -y libpcap-devel && \ yum install -y cmake3 && \ - yum install -y python2 && \ - yum install -y python3-pip && \ - pip3 install -i https://pypi.tuna.tsinghua.edu.cn/simple httpie && \ - rpm -U https://download-ib01.fedoraproject.org/pub/epel/7/x86_64/Packages/c/cppcheck-2.7-1.el7.x86_64.rpm && \ - yum install -y sudo && \ - yum install -y elfutils-libelf-devel libmnl-devel libnfnetlink-devel gtest-devel && \ - yum install -y net-tools psmisc iproute initscripts gperftools-libs gdb snappy && \ - yum install -y libunwind gperftools && \ - dnf --enablerepo=powertools install -y libnsl + yum install -y sudo RUN yum makecache -RUN yumdownloader --destdir=/tmp/ libMESA_prof_load-devel libMESA_prof_load \ - libMESA_htable-devel libMESA_htable \ - libMESA_handle_logger-devel libMESA_handle_logger \ - libMESA_field_stat2-devel libMESA_field_stat2 \ - libfieldstat3-devel libfieldstat3 libfieldstat4-devel libfieldstat4 \ +RUN yumdownloader --destdir=/tmp/ \ + libMESA_prof_load \ + libMESA_htable \ + libMESA_handle_logger \ + libMESA_field_stat2 \ + libfieldstat3 \ + libfieldstat4 \ libbreakpad_mini libMESA_jump_layer libcjson && \ find /tmp/ -name "*.rpm" |xargs rpm --prefix=/opt/tsg/framework --force --nodeps -ivh diff --git a/README.md b/README.md index 200c742..4418dde 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,6 @@ Step 1: Login to private docker registry, use the following command: ``` docker login https://git.mesalab.cn:7443 -u $your_username -p $your_passwd - ``` Replace `your_username` and `your_passwd` with your private account.