CI: unify centos7_base.sh and centos7_core.sh

apache · Apr 17, 2020 · c234074 · c234074
1 parent f882de0
commit c234074
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 69 deletions.
diff --git a/ci/docker/Dockerfile.publish.centos7_cpu b/ci/docker/Dockerfile.publish.centos7_cpu
@@ -22,8 +22,8 @@ FROM centos:7
 
 WORKDIR /work/deps
 
-COPY install/centos7_base.sh /work/
-RUN /work/centos7_base.sh
+COPY install/centos7_core.sh /work/
+RUN /work/centos7_core.sh
 COPY install/centos7_ccache.sh /work/
 RUN /work/centos7_ccache.sh
 COPY install/centos7_python.sh /work/

diff --git a/ci/docker/Dockerfile.publish.centos7_gpu_cu100 b/ci/docker/Dockerfile.publish.centos7_gpu_cu100
@@ -20,8 +20,8 @@ FROM nvidia/cuda:10.0-cudnn7-devel-centos7
 
 WORKDIR /work/deps
 
-COPY install/centos7_base.sh /work/
-RUN /work/centos7_base.sh
+COPY install/centos7_core.sh /work/
+RUN /work/centos7_core.sh
 COPY install/centos7_ccache.sh /work/
 RUN /work/centos7_ccache.sh
 COPY install/centos7_python.sh /work/

diff --git a/ci/docker/Dockerfile.publish.centos7_gpu_cu101 b/ci/docker/Dockerfile.publish.centos7_gpu_cu101
@@ -20,8 +20,8 @@ FROM nvidia/cuda:10.1-cudnn7-devel-centos7
 
 WORKDIR /work/deps
 
-COPY install/centos7_base.sh /work/
-RUN /work/centos7_base.sh
+COPY install/centos7_core.sh /work/
+RUN /work/centos7_core.sh
 COPY install/centos7_ccache.sh /work/
 RUN /work/centos7_ccache.sh
 COPY install/centos7_python.sh /work/

diff --git a/ci/docker/Dockerfile.publish.centos7_gpu_cu102 b/ci/docker/Dockerfile.publish.centos7_gpu_cu102
@@ -20,8 +20,8 @@ FROM nvidia/cuda:10.2-cudnn7-devel-centos7
 
 WORKDIR /work/deps
 
-COPY install/centos7_base.sh /work/
-RUN /work/centos7_base.sh
+COPY install/centos7_core.sh /work/
+RUN /work/centos7_core.sh
 COPY install/centos7_ccache.sh /work/
 RUN /work/centos7_ccache.sh
 COPY install/centos7_python.sh /work/

diff --git a/ci/docker/Dockerfile.publish.centos7_gpu_cu92 b/ci/docker/Dockerfile.publish.centos7_gpu_cu92
@@ -20,8 +20,8 @@ FROM nvidia/cuda:9.2-cudnn7-devel-centos7
 
 WORKDIR /work/deps
 
-COPY install/centos7_base.sh /work/
-RUN /work/centos7_base.sh
+COPY install/centos7_core.sh /work/
+RUN /work/centos7_core.sh
 COPY install/centos7_ccache.sh /work/
 RUN /work/centos7_ccache.sh
 COPY install/centos7_python.sh /work/

diff --git a/ci/docker/Dockerfile.publish.test.centos7_cpu b/ci/docker/Dockerfile.publish.test.centos7_cpu
@@ -22,8 +22,8 @@ FROM centos:7
 
 WORKDIR /work/deps
 
-COPY install/centos7_base.sh /work/
-RUN /work/centos7_base.sh
+COPY install/centos7_core.sh /work/
+RUN /work/centos7_core.sh
 
 COPY install/centos7_scala.sh /work/
 RUN /work/centos7_scala.sh

diff --git a/ci/docker/Dockerfile.publish.test.centos7_gpu b/ci/docker/Dockerfile.publish.test.centos7_gpu
@@ -22,8 +22,8 @@ FROM nvidia/cuda:9.2-cudnn7-devel-centos7
 
 WORKDIR /work/deps
 
-COPY install/centos7_base.sh /work/
-RUN /work/centos7_base.sh
+COPY install/centos7_core.sh /work/
+RUN /work/centos7_core.sh
 
 COPY install/centos7_scala.sh /work/
 RUN /work/centos7_scala.sh

diff --git a/ci/docker/install/centos7_base.sh b/ci/docker/install/centos7_base.sh
diff --git a/ci/docker/install/centos7_core.sh b/ci/docker/install/centos7_core.sh
@@ -35,6 +35,7 @@ yum -y install protobuf-devel
 yum -y install zeromq-devel
 yum -y install openssl-devel
 yum -y install gcc-c++-4.8.*
+yum -y install gcc-gfortran
 yum -y install make
 yum -y install wget
 yum -y install unzip
@@ -43,6 +44,7 @@ yum -y install automake
 yum -y install autoconf
 yum -y install libtool
 yum -y install patchelf
+yum -y install pandoc
 
 # gcc7
 yum -y install centos-release-scl