diff --git a/.circleci/config.yml b/.circleci/config.yml index a4ab3d83..8a63d1a5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -611,7 +611,7 @@ workflows: parameters: osnick: - bionic - - centos8 + - rocky8 lite: - "REDISAI_LITE=0 PUBLISH=1" - "REDISAI_LITE=1" @@ -623,7 +623,7 @@ workflows: parameters: osnick: - bionic - - centos8 + - rocky8 lite: - "REDISAI_LITE=0 PUBLISH=1" - "REDISAI_LITE=1" diff --git a/opt/build/docker/Makefile b/opt/build/docker/Makefile index f56620ec..d1ce22b2 100755 --- a/opt/build/docker/Makefile +++ b/opt/build/docker/Makefile @@ -35,8 +35,8 @@ endif ifeq ($(OSNICK),bionic) REDIS_CUDA_MAPVERSION=ubuntu18.04 endif -ifeq ($(OSNICK),centos8) -REDIS_CUDA_MAPVERSION=centos8 +ifeq ($(OSNICK),rocky8) +REDIS_CUDA_MAPVERSION=rocky8 endif DOCKERWRAPPER_EXTRA_VARS=\ diff --git a/opt/build/docker/dockerfile.tmpl b/opt/build/docker/dockerfile.tmpl index 0e8abc37..b41d106a 100755 --- a/opt/build/docker/dockerfile.tmpl +++ b/opt/build/docker/dockerfile.tmpl @@ -24,8 +24,8 @@ RUN echo "Building for {{REDIS_OSNICK}} ({{REDIS_OS}}) for {{REDIS_ARCH}} [with {% include "templates/gpu.yml" %} {% endif %} -# centos8 specific integration until a move to rocky or similar -{% if REDIS_OSNICK == "centos8" %} +# rocky8 specific integration until a move to rocky or similar +{% if REDIS_OSNICK == "rocky8" %} RUN cd /etc/yum.repos.d/ RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* RUN sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* @@ -75,8 +75,8 @@ FROM redisfab/redis:{{REDIS_VERSION}}-{{REDIS_ARCH}}-{{REDIS_OSNICK}} {% endif %} ARG PACK -# centos8 specific integration until a move to rocky or similar -{% if REDIS_OSNICK == "centos8" %} +# rocky8 specific integration until a move to rocky or similar +{% if REDIS_OSNICK == "rocky8" %} RUN cd /etc/yum.repos.d/ RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* RUN sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* diff --git a/opt/readies b/opt/readies index 34b3d18f..92b831b5 160000 --- a/opt/readies +++ b/opt/readies @@ -1 +1 @@ -Subproject commit 34b3d18f8b45e92814c5fcefc51af143d5ce69ef +Subproject commit 92b831b5fba35df5f9a4282d9467aacfa0340b91 diff --git a/opt/system-setup.py b/opt/system-setup.py index 96dedc23..560dbdbe 100755 --- a/opt/system-setup.py +++ b/opt/system-setup.py @@ -21,7 +21,7 @@ def common_first(self): self.pip_install("wheel") self.install("git unzip") - if self.osnick != 'centos8': + if self.osnick != 'rocky8': self.install("coreutils") # for realpath def debian_compat(self): @@ -35,7 +35,7 @@ def debian_compat(self): def redhat_compat(self): self.run("%s/bin/enable-utf8" % READIES) self.install("epel-release") - if self.osnick == "centos8": + if self.osnick == "rocky8": self.run("dnf install -qy dnf-plugins-core") self.run("dnf config-manager -qy --set-enabled powertools") self.install("redhat-lsb-core")