docker: Bump Centos 7 -> 8

tools/docker/Makefile

@@ -37,7 +37,7 @@ help:
 	@echo -e "\t${BOLD}distclean${RESET}: Clean all docker images and remove all archives."
 	@echo
 	@echo -e "\t${BOLD}<distro>${RESET}:"
-	@echo -e "\t\t${BOLD}centos-7${RESET} (latest)"
+	@echo -e "\t\t${BOLD}centos-8${RESET} (latest)"
 	@echo -e "\t\t${BOLD}debian-10${RESET} (latest)"
 	@echo -e "\t\t${BOLD}ubuntu-19.04${RESET} (Ubuntu latest)"
 	@echo -e "\t\t${BOLD}ubuntu-18.04${RESET} (Ubuntu 18.04 LTS)"
@@ -128,7 +128,7 @@ export/python: | export
 #################
 
 # Currently supported distro
-DISTROS = centos-7 debian-10 ubuntu-19.10 ubuntu-18.04 ubuntu-16.04
+DISTROS = centos-8 debian-10 ubuntu-19.10 ubuntu-18.04 ubuntu-16.04
 
 # Create build docker images with OR-Tools built
 targets = $(addprefix docker_, $(DISTROS))

tools/docker/centos-8.Dockerfile

@@ -1,38 +1,21 @@
-FROM centos/devtoolset-7-toolchain-centos7
-USER root
-
-#FROM centos:7
-#RUN yum -y update \
-#&& yum install -y centos-release-scl \
-#&& yum install -y devtoolset-7-gcc* \
-#&& scl enable devtoolset-7 bash
+FROM centos:8
 
 #############
 ##  SETUP  ##
 #############
 RUN yum -y update \
-&& yum -y install yum-utils \
-&& yum -y install \
- wget git pkg-config make autoconf libtool zlib-devel gawk gcc-c++ curl subversion \
- redhat-lsb-core pcre-devel which \
+&& yum -y groupinstall 'Development Tools' \
+&& yum -y install cmake \
 && yum clean all \
 && rm -rf /var/cache/yum
+#pkgconfig
 
-# Install CMake 3
-RUN yum -y install epel-release \
-&& yum install -y cmake3 \
-&& ln -s /usr/bin/cmake3 /usr/local/bin/cmake
 
 # Install Swig
-RUN wget "https://downloads.sourceforge.net/project/swig/swig/swig-4.0.1/swig-4.0.1.tar.gz" \
-&& tar xvf swig-4.0.1.tar.gz \
-&& rm swig-4.0.1.tar.gz \
-&& cd swig-4.0.1 \
-&& ./configure --prefix=/usr \
-&& make -j 4 \
-&& make install \
-&& cd .. \
-&& rm -rf swig-4.0.1
+RUN yum -y update \
+&& yum -y install swig \
+&& yum clean all \
+&& rm -rf /var/cache/yum
 
 # Install Java 8 SDK
 RUN yum -y update \

tools/docker/test/centos-8/cc.Dockerfile

@@ -1,8 +1,6 @@
-FROM centos/devtoolset-7-toolchain-centos7
+FROM centos:8
 LABEL maintainer="corentinl@google.com"
 
-USER root
-
 RUN yum -y update \
 && yum -y groupinstall 'Development Tools' \
 && yum -y install which zlib-devel \
@@ -13,4 +11,4 @@ RUN yum -y update \
 #RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 WORKDIR /root
-ADD or-tools_centos-7_v*.tar.gz .
+ADD or-tools_centos-8_v*.tar.gz .

tools/docker/test/centos-8/dotnet.Dockerfile

@@ -1,8 +1,6 @@
-FROM centos/devtoolset-7-toolchain-centos7
+FROM centos:8
 LABEL maintainer="corentinl@google.com"
 
-USER root
-
 RUN yum -y update \
 && yum -y groupinstall 'Development Tools' \
 && yum -y install which zlib-devel \
@@ -12,7 +10,7 @@ RUN yum -y update \
 # Install dotnet
 RUN rpm -Uvh "https://packages.microsoft.com/config/rhel/7/packages-microsoft-prod.rpm" \
 && yum -y update \
-&& yum -y install dotnet-sdk-2.1 \
+&& yum -y install dotnet-sdk-3.1 \
 && yum clean all \
 && rm -rf /var/cache/yum
 
@@ -20,4 +18,4 @@ RUN rpm -Uvh "https://packages.microsoft.com/config/rhel/7/packages-microsoft-pr
 #RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 WORKDIR /root
-ADD or-tools_centos-7_v*.tar.gz .
+ADD or-tools_centos-8_v*.tar.gz .

tools/docker/test/centos-8/java.Dockerfile

@@ -1,8 +1,6 @@
-FROM centos/devtoolset-7-toolchain-centos7
+FROM centos:8
 LABEL maintainer="corentinl@google.com"
 
-USER root
-
 RUN yum -y update \
 && yum -y groupinstall 'Development Tools' \
 && yum -y install which zlib-devel \
@@ -18,4 +16,4 @@ RUN yum -y update \
 #RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 WORKDIR /root
-ADD or-tools_centos-7_v*.tar.gz .
+ADD or-tools_centos-8_v*.tar.gz .