Redis 7.2-rc1 as default

rafie · rafie · commit a8e1a6dcf9d5 · 2023-05-07T15:08:36.000+03:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -81,7 +81,7 @@ commands:
     parameters:
       redis_version:
         type: string
-        default: "7.0"
+        default: "7"
       getredis_params:
         type: string
         default: ""
@@ -143,7 +143,7 @@ commands:
         default: ""
       redis_version:
         type: string
-        default: "7.0"
+        default: "7"
       getredis_params:
         type: string
         default: ""
@@ -341,7 +341,7 @@ jobs:
     parameters:
       redis_version:
         type: string
-        default: "7.0"
+        default: "7"
       persist:
         type: string
         default: "yes"
@@ -599,7 +599,7 @@ workflows:
           context: common
           matrix:
             parameters:
-              platform: [jammy, focal, bionic, xenial, amzn2, rocky8, centos7, bullseye]
+              platform: [jammy, focal, bionic, amzn2, rocky8, centos7, bullseye]
       - build-arm-platforms:
           <<: *on-integ-and-version-tags
           context: common
@@ -672,7 +672,7 @@ workflows:
           name: build-with-redis-<<matrix.redis_version>>
           matrix:
             parameters:
-              redis_version: ["6.0", "6.2", "7", "7.2-rc1", "unstable"]
+              redis_version: ["6.0", "6.2", "7.0", "7.2-rc1", "unstable"]
   
   nightly-perf-once-a-week:
     triggers:
diff --git a/build/docker/dockerfile.tmpl b/build/docker/dockerfile.tmpl
@@ -1,6 +1,5 @@
 
 #----------------------------------------------------------------------------------------------
-FROM redisfab/redis:{{REDIS_VERSION}}-{{ARCH}}-{{OSNICK}} AS redis
 FROM {{OS}} AS builder
 
 RUN if [ -f /root/.profile ]; then sed -ie 's/mesg n/tty -s \&\& mesg -n/g' /root/.profile; fi
@@ -9,12 +8,12 @@ SHELL ["/bin/bash", "-l", "-c"]
 RUN echo "Building for {{OSNICK}} ({{OS}}) for {{ARCH}} [with Redis {{REDIS_VERSION}}]"
 
 WORKDIR /build
-COPY --from=redis /usr/local/ /usr/local/
 
 ADD . /build
 
 RUN ./deps/readies/bin/getupdates
 RUN VERBOSE=1 ./sbin/setup
+RUN ./deps/readies/bin/getredis -v {{REDIS_VERSION}}
 RUN make info
 
 RUN make build SHOW=1
