summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryangwei <[email protected]>2020-09-18 19:07:55 +0800
committeryangwei <[email protected]>2020-09-18 19:07:55 +0800
commitad03d77ddd969a05b8edbd256a1d9962c932e5cd (patch)
tree45aacc4254d97e79c6aa9c165c7fda09c4cad885
parent756ba960340bad7f900b9b9eafa672619da8676e (diff)
更新,使用内置cmake3.12.4,避免cmake3使用yum源安装高版本后导致不向前兼容的问题
-rw-r--r--Dockerfile5
-rw-r--r--cmake/cmake-3.12.4-Linux-x86_64.tar.gzbin0 -> 34951069 bytes
2 files changed, 4 insertions, 1 deletions
diff --git a/Dockerfile b/Dockerfile
index abbd9d0..da44119 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,10 +2,13 @@ FROM centos:7
COPY rpm_upload_tools.py /root/rpm_upload_tools.py
COPY repo.internal.geedge.net.repo /etc/yum.repos.d/repo.internal.geedge.net.repo
COPY netrc.conf /root/.netrc
+COPY cmake /tmp/build_cmake
RUN yum install -y gcc gcc-c++ make libpcap-devel epel-release patch wget socat automake autoconf libtool rpm-build git && \
wget -O /etc/yum.repos.d/epel.repo http://mirrors.aliyun.com/repo/epel-7.repo && \
- yum install -y cmake3 && \
+ cd /tmp/build_cmake && \
+ tar xf cmake-3.12.4-Linux-x86_64.tar.gz && \
+ cp -r cmake-3.12.4-Linux-x86_64/* /usr/local/ && \
yum install -y python3-pip && \
pip3 install -i https://pypi.tuna.tsinghua.edu.cn/simple httpie && \
curl -sL https://sentry.io/get-cli/ | bash && \
diff --git a/cmake/cmake-3.12.4-Linux-x86_64.tar.gz b/cmake/cmake-3.12.4-Linux-x86_64.tar.gz
new file mode 100644
index 0000000..893a9a7
--- /dev/null
+++ b/cmake/cmake-3.12.4-Linux-x86_64.tar.gz
Binary files differ