Centos8 support in dockers (#841)

* centos8

* Adding centos8 support in a docker

* PR comments

Author: chayim

.circleci/config.yml

@@ -572,6 +572,7 @@ workflows:
               osnick:
                 - xenial
                 - bionic
+                - centos8
               lite:
                 - "REDISAI_LITE=0 PUBLISH=1"
                 - "REDISAI_LITE=1"

opt/build/docker/Makefile

@@ -30,16 +30,19 @@ endif
 
 # remap ubuntu versions because of nvidia cuda
 ifeq ($(OSNICK),xenial)
-REDIS_CUDA_UBUNTUVERSION=16.04
+REDIS_CUDA_MAPVERSION=ubuntu16.04
 endif
 ifeq ($(OSNICK),bionic)
-REDIS_CUDA_UBUNTUVERSION=18.04
+REDIS_CUDA_MAPVERSION=ubuntu18.04
+endif
+ifeq ($(OSNICK),centos8)
+REDIS_CUDA_MAPVERSION=centos8
 endif
 
 DOCKERWRAPPER_EXTRA_VARS=\
 	REDISAI_LITE=${REDISAI_LITE} \
 	REDIS_CUDA_VERSION=${REDIS_CUDA_VERSION} \
-	REDIS_CUDA_UBUNTUVERSION=${REDIS_CUDA_UBUNTUVERSION}
+	REDIS_CUDA_MAPVERSION=${REDIS_CUDA_MAPVERSION}
 
 ### Defaults ###
 ROOT=../../..

opt/build/docker/dockerfile.tmpl

@@ -9,7 +9,7 @@ ARG TEST={{REDIS_TEST}}
 #----------------------------------------------------------------------------------------------
 FROM redisfab/redis:{{REDIS_VERSION}}-{{REDIS_ARCH}}-{{REDIS_OSNICK}} AS redis
 {% if gpu_build is defined %}
-FROM nvidia/cuda:{{REDIS_CUDA_VERSION}}-devel-ubuntu{{REDIS_CUDA_UBUNTUVERSION}} AS builder
+FROM nvidia/cuda:{{REDIS_CUDA_VERSION}}-devel-{{REDIS_CUDA_MAPVERSION}} AS builder
 {% else %}
 FROM {{REDIS_OS}} AS builder
 {% endif %}
@@ -31,10 +31,8 @@ COPY ./opt/ opt/
 ADD ./tests/flow/ tests/flow/
 
 RUN FORCE=1 ./opt/readies/bin/getpy3
+RUN ./opt/readies/bin/getupdates
 RUN ./opt/system-setup.py
-RUN apt-get update -qq
-RUN apt-get upgrade -yqq
-RUN rm -rf /var/cache/apt
 
 ARG DEPS_ARGS=""
 COPY ./get_deps.sh .
@@ -63,7 +61,7 @@ RUN set -e ;\
 
 #----------------------------------------------------------------------------------------------
 {% if gpu_build is defined %}
-FROM nvidia/cuda:{{REDIS_CUDA_VERSION}}-runtime-ubuntu{{REDIS_CUDA_UBUNTUVERSION}}
+FROM nvidia/cuda:{{REDIS_CUDA_VERSION}}-runtime-{{REDIS_CUDA_MAPVERSION}}
 {% else %}
 FROM redisfab/redis:{{REDIS_VERSION}}-{{REDIS_ARCH}}-{{REDIS_OSNICK}}
 {% endif %}

opt/build/docker/templates/gpu.yml

@@ -1,6 +1,7 @@
 # given the cuda version, generate the paths so that we don't manually maintain them
 {% set cuda_list = REDIS_CUDA_VERSION.split("-") %}
+{% set cuda_version = cuda_list[0] %}
 ENV NVIDIA_VISIBLE_DEVICES all
 ENV NVIDIA_DRIVER_CAPABILITIES compute,utility
-RUN echo export LD_LIBRARY_PATH=/usr/local/cuda/lib64:/usr/local/cuda-{{cuda_list[0]}}/lib64:$LD_LIBRARY_PATH > /etc/profile.d/cuda.sh
+RUN echo export LD_LIBRARY_PATH=/usr/local/cuda/lib64:/usr/local/cuda-{{cuda_version}}/lib64:/usr/local/cuda-{{cuda_version}}/compat/:$LD_LIBRARY_PATH > /etc/profile.d/cuda.sh
 

opt/readies

@@ -20,7 +20,7 @@ def common_first(self):
         self.install_downloaders()
         self.pip_install("wheel")
 
-        self.install("git unzip patchelf")
+        self.install("git unzip")
         if self.osnick != 'centos8':
             self.install("coreutils") # for realpath
 
@@ -71,9 +71,9 @@ def macos(self):
     def common_last(self):
         self.run("%s/bin/getclang --format" % READIES)
         if self.platform == "arm":
-            self.run("%s/bin/getcmake" % READIES)
+            self.run("%s/bin/getcmake --from-repo" % READIES)
         else:
-            self.run("%s/bin/getcmake --no-repo" % READIES)
+            self.run("%s/bin/getcmake" % READIES)
 
         self.run("{PYTHON} {READIES}/bin/getrmpytools".format(PYTHON=self.python, READIES=READIES))