upgrade 3.2.10

Author: vla

.travis.yml

@@ -1,11 +1,13 @@
+sudo: required
 language: bash
 services: docker
+dist: trusty
 
 branches: 
   only: 
     - master
 
-install:
+before_install:
   - docker build -t eswork/redis .
 
 script: 

Dockerfile

@@ -1,7 +1,7 @@
-FROM alpine:3.5
+FROM alpine:3.6
 LABEL maintainer "[email protected]"
 
-ENV REDIS_VERSION=3.2.8 \
+ENV REDIS_VERSION=3.2.10 \
     REDIS_USER=redis \
     REDIS_DATA_DIR=/var/lib/redis \
     REDIS_LOG_DIR=/var/log/redis \

README.md

@@ -3,12 +3,12 @@
 
 ## Supported tags and respective `Dockerfile` links
 
-- [`latest` , `3.2.8`  (3.2.8/Dockerfile)](https://github.com/EsWork/docker-redis/blob/master/Dockerfile)
+- [`latest` , `3.2.10`  (3.2.10/Dockerfile)](https://github.com/EsWork/docker-redis/blob/master/Dockerfile)
 
 Introduction
 ---
 
-基于`Alpine linux`镜像构建`Redis-3.2.8`
+基于`Alpine linux`镜像构建`Redis-3.2.10`
 
 Getting started
 

VERSION

@@ -1 +1 @@
-3.2.8
+3.2.10

setup/install.sh

@@ -16,7 +16,11 @@ wget -cq ${REDIS_DOWNLOAD_URL} -O ${REDIS_SETUP_DIR}/src/redis-${REDIS_VERSION}.
 tar -zxf ${REDIS_SETUP_DIR}/src/redis-${REDIS_VERSION}.tar.gz
 cd ${REDIS_SETUP_DIR}/src/redis-${REDIS_VERSION}
 
-make && make install
+grep -q '^#define CONFIG_DEFAULT_PROTECTED_MODE 1$' ${REDIS_SETUP_DIR}/src/redis-${REDIS_VERSION}/src/server.h
+sed -ri 's!^(#define CONFIG_DEFAULT_PROTECTED_MODE) 1$!\1 0!' ${REDIS_SETUP_DIR}/src/redis-${REDIS_VERSION}/src/server.h
+grep -q '^#define CONFIG_DEFAULT_PROTECTED_MODE 0$' ${REDIS_SETUP_DIR}/src/redis-${REDIS_VERSION}/src/server.h
+
+make -j $(getconf _NPROCESSORS_ONLN) && make install
 
 mkdir -p /etc/redis/
 cp redis.conf /etc/redis/redis.conf
@@ -27,6 +31,7 @@ sed 's/^# unixsocket \/tmp\/redis.sock/unixsocket \/run\/redis\/redis.sock/' -i
 sed 's/^# unixsocketperm 700/unixsocketperm 777/' -i /etc/redis/redis.conf
 sed '/^logfile/d' -i /etc/redis/redis.conf
 
+
 chown -R ${REDIS_USER}:${REDIS_USER} /etc/redis/
 
 mkdir -p /run/redis