diff --git a/ci/docker/Dockerfile.publish.centos7_cpu b/ci/docker/Dockerfile.publish.centos7_cpu index 2010238cb71d..3a87f8e45fff 100644 --- 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 index 41291f21ac72..ce5aa3c8d468 100644 --- 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 index a1e90b9eafc3..2b207748db95 100644 --- 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 index 851d63029a84..564ea01b887f 100644 --- 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 index 75277f0f1fd2..397954d63597 100644 --- 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 index 7d284452971b..39bb1e302215 100644 --- 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 index e7f584683109..1601cd5d9dfb 100644 --- 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 deleted file mode 100755 index 93e2801481c5..000000000000 --- a/ci/docker/install/centos7_base.sh +++ /dev/null @@ -1,55 +0,0 @@ -#!/usr/bin/env bash - -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -# build and install are separated so changes to build don't invalidate -# the whole docker cache for the image - -set -ex - -# Multipackage installation does not fail in yum -yum -y install epel-release -yum -y install git -yum -y install wget -yum -y install make -yum -y install unzip -yum -y install ninja-build -yum -y install gcc-gfortran -yum -y install automake -yum -y install autoconf -yum -y install libtool -yum -y install protobuf-compiler -yum -y install protobuf-devel -yum -y install zeromq-devel -yum -y install patchelf -yum -y install pandoc - -# gcc7 -yum -y install centos-release-scl -yum -y install devtoolset-7 - -# Centos 7 only provides ninja-build -ln -s /usr/bin/ninja-build /usr/bin/ninja - -# CMake 3.13.2+ is required -mkdir /opt/cmake && cd /opt/cmake -wget -nv https://cmake.org/files/v3.13/cmake-3.13.5-Linux-x86_64.sh -sh cmake-3.13.5-Linux-x86_64.sh --prefix=/opt/cmake --skip-license -ln -s /opt/cmake/bin/cmake /usr/local/bin/cmake -rm cmake-3.13.5-Linux-x86_64.sh -cmake --version diff --git a/ci/docker/install/centos7_core.sh b/ci/docker/install/centos7_core.sh index 7f1c3d70aebc..119d172ff70f 100755 --- 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