Redis 6 in builds (#353)

Author: rafie

.circleci/config.yml

@@ -16,7 +16,7 @@ commands:
           command: |
             ./opt/readies/bin/getpy3
             BREW_NO_UPDATE=1 ./opt/system-setup.py
-            # git clone git://github.com/antirez/redis.git --branch 5.0.7; (cd redis; make malloc=libc -j $(nproc); make install); redis-server --version
+            # git clone git://github.com/antirez/redis.git --branch 6.0.1; (cd redis; make malloc=libc -j $(nproc); make install); redis-server --version
             ./get_deps.sh cpu
       - save_cache:
           paths:
@@ -69,7 +69,7 @@ commands:
 jobs:
   build:
     docker:
-      - image: redisfab/rmbuilder:5.0.7-x64-buster
+      - image: redisfab/rmbuilder:6.0.1-x64-buster
     steps:
       - setup_steps:
           platform: debian
@@ -78,7 +78,7 @@ jobs:
 
   coverage:
     docker:
-      - image: redisfab/rmbuilder:5.0.7-x64-buster
+      - image: redisfab/rmbuilder:6.0.1-x64-buster
     steps:
       - checkout
       - restore_cache:
@@ -90,7 +90,7 @@ jobs:
           command: |
             ./opt/readies/bin/getpy3
             ./opt/system-setup.py
-            # git clone git://github.com/antirez/redis.git --branch 5.0.7; cd redis; make malloc=libc -j $(nproc); make install; redis-server --version
+            # git clone git://github.com/antirez/redis.git --branch 6.0.1; cd redis; make malloc=libc -j $(nproc); make install; redis-server --version
             ./get_deps.sh cpu
       - run:
           name: Set up workspace
@@ -172,7 +172,7 @@ jobs:
       package:
         type: string
     docker:
-      - image: redisfab/rmbuilder:5.0.7-x64-buster
+      - image: redisfab/rmbuilder:6.0.1-x64-buster
     steps:
       - attach_workspace:
           at: ~/workspace

Dockerfile

@@ -1,6 +1,6 @@
 # BUILD redisfab/redisai:${VERSION}-cpu-${ARCH}-${OSNICK}
 
-ARG REDIS_VER=5.0.8
+ARG REDIS_VER=6.0.1
 
 # OSNICK=bionic|stretch|buster
 ARG OSNICK=buster

Dockerfile.arm

@@ -1,4 +1,6 @@
-# BUILD redisfab/redisai-cpu-${OSNICK}:M.m.b-${ARCH}
+# BUILD redisfab/redisai:${VERSION}-cpu-${ARCH}-${OSNICK}
+
+ARG REDIS_VER=6.0.1
 
 # OSNICK=bionic|stretch|buster
 ARG OSNICK=buster
@@ -10,7 +12,7 @@ ARG OS=debian:buster-slim
 ARG ARCH=arm64v8
 
 #----------------------------------------------------------------------------------------------
-FROM redisfab/redis-${ARCH}-${OSNICK}-xbuild:5.0.5 AS builder
+FROM redisfab/redis-xbuild:${REDIS_VER}-${ARCH}-${OSNICK} AS builder
 
 RUN [ "cross-build-start" ]
 
@@ -39,7 +41,7 @@ RUN if [ "$TEST" = "1" ]; then make -C opt test $BUILD_ARGS NO_LFS=1; fi
 RUN [ "cross-build-end" ]
 
 #----------------------------------------------------------------------------------------------
-FROM redisfab/redis-${ARCH}-${OSNICK}-xbuild:5.0.5
+FROM redisfab/redis-xbuild:${REDIS_VER}-${ARCH}-${OSNICK}
 
 RUN [ "cross-build-start" ]
 

Dockerfile.gpu

@@ -1,6 +1,6 @@
 # BUILD redisfab/redisai:${VERSION}-gpu-${ARCH}-${OSNICK}
 
-ARG REDIS_VER=5.0.8
+ARG REDIS_VER=6.0.1
 
 # OSNICK=bionic|centos7|centos6
 ARG OSNICK=bionic

Dockerfile.gpu-test

@@ -1,6 +1,6 @@
 # BUILD redisfab/redisai:${VERSION}-gpu-${ARCH}-${OSNICK}-test
 
-ARG REDIS_VER=5.0.8
+ARG REDIS_VER=6.0.1
 
 # OSNICK=bionic|centos7|centos6
 ARG OSNICK=bionic

opt/Makefile

@@ -173,6 +173,7 @@ fetch deps:
 #----------------------------------------------------------------------------------------------
 
 pack: $(INSTALLED_TARGET)
+	$(SHOW)find $(INSTALL_DIR) -name "*.so" -exec chmod +x {} \;
 ifneq ($(PACK_DEPS),0)
 	$(SHOW)DEVICE=$(DEVICE) BINDIR=$(BINROOT) INSTALL_DIR=$(INSTALL_DIR) BRANCH=$(BRANCH) INTO=$(INTO) DEPS=1 ./pack.sh
 else