chore(reids): update to redis 6

Author: duanhongyi

Makefile

@@ -12,7 +12,7 @@ SHELL_SCRIPTS = $(wildcard _scripts/*.sh) rootfs/bin/boot
 
 # The following variables describe the containerized development environment
 # and other build options
-DEV_ENV_IMAGE := quay.io/drycc/go-dev:v0.22.0
+DEV_ENV_IMAGE := drycc/go-dev
 DEV_ENV_WORK_DIR := /go/src/${REPO_PATH}
 DEV_ENV_CMD := docker run --rm -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR} ${DEV_ENV_IMAGE}
 DEV_ENV_CMD_INT := docker run -it --rm -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR} ${DEV_ENV_IMAGE}

rootfs/Dockerfile

@@ -1,4 +1,4 @@
-FROM redis:5-alpine
+FROM redis:6-alpine
 
 COPY . /
 

rootfs/bin/boot

@@ -8,7 +8,7 @@ REDIS_CONFIG_FILE=/etc/redis/redis.conf
 REDIS_PASSWORD_FILE=/var/run/secrets/drycc/redis/creds/password
 if [ -e $REDIS_PASSWORD_FILE ]; then
     REDIS_PASSWORD="$(cat /var/run/secrets/drycc/redis/creds/password)"
-    if [ ! -z "$REDIS_PASSWORD" ]; then
+    if [ -n "$REDIS_PASSWORD" ]; then
         echo "requirepass $REDIS_PASSWORD" >> $REDIS_CONFIG_FILE
     fi
 fi