matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[database]: Update redis to 5.0.3 (#3066)

Browse Source 
Signed-off-by: Jipan Yang <jipan.yang@alibaba-inc.com>
This commit is contained in:
Jipan Yang 2019-07-03 22:16:10 -07:00 committed by lguohan
parent 76bf5a0bc4
commit 9a8202a39d
13 changed files with 44 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dockers/docker-database/Dockerfile.j2
View File

@ -28,6 +28,7 @@ RUN apt-get clean -y && \
s/^logfile .*$/logfile ""/; \ s/^logfile .*$/logfile ""/; \
s/^# syslog-enabled no$/syslog-enabled no/; \ s/^# syslog-enabled no$/syslog-enabled no/; \
s/^# unixsocket/unixsocket/; \ s/^# unixsocket/unixsocket/; \
s/redis-server.sock/redis.sock/g; \
s/^client-output-buffer-limit pubsub [0-9]+mb [0-9]+mb [0-9]+/client-output-buffer-limit pubsub 0 0 0/ \ s/^client-output-buffer-limit pubsub [0-9]+mb [0-9]+mb [0-9]+/client-output-buffer-limit pubsub 0 0 0/ \
' /etc/redis/redis.conf ' /etc/redis/redis.conf

4
dockers/docker-orchagent/Dockerfile.j2
View File

@ -20,7 +20,11 @@ RUN apt-get update && \
tcpdump \ tcpdump \
# Install redis-tools dependencies # Install redis-tools dependencies
# TODO: implicitly install dependencies # TODO: implicitly install dependencies
libatomic1 \
libjemalloc1 \ libjemalloc1 \
liblua5.1-0 \
lua-bitop \
lua-cjson \
libelf1 \ libelf1 \
libmnl0 \ libmnl0 \
bridge-utils bridge-utils

6
dockers/docker-sonic-telemetry/Dockerfile.j2
View File

@ -14,7 +14,11 @@ RUN apt-get update && \
libjansson4 \ libjansson4 \
# Install redis-tools dependencies # Install redis-tools dependencies
# TODO: implicitly install dependencies # TODO: implicitly install dependencies
libjemalloc1 libatomic1 \
libjemalloc1 \
liblua5.1-0 \
lua-bitop \
lua-cjson
{% if docker_sonic_telemetry_debs.strip() -%} {% if docker_sonic_telemetry_debs.strip() -%}
# Copy locally-built Debian package dependencies # Copy locally-built Debian package dependencies

6
dockers/docker-teamd/Dockerfile.j2
View File

@ -15,7 +15,11 @@ RUN apt-get update && \
libpython2.7 \ libpython2.7 \
# Install redis-tools dependencies # Install redis-tools dependencies
# TODO: implicitly install dependencies # TODO: implicitly install dependencies
libjemalloc1 libatomic1 \
libjemalloc1 \
liblua5.1-0 \
lua-bitop \
lua-cjson
{% if docker_teamd_debs.strip() -%} {% if docker_teamd_debs.strip() -%}
# Copy locally-built Debian package dependencies # Copy locally-built Debian package dependencies

2
platform/cavium/docker-syncd-cavm/Dockerfile.j2
View File

@ -14,7 +14,7 @@ debs/{{ deb }}{{' '}}
{%- endfor -%} {%- endfor -%}
debs/ debs/
RUN apt-get -y install libpcap-dev libxml2-dev python-dev swig libsensors4-dev libjemalloc1 RUN apt-get -y install libpcap-dev libxml2-dev python-dev swig libsensors4-dev libatomic1 libjemalloc1 liblua5.1-0 lua-bitop lua-cjson
RUN dpkg -i \ RUN dpkg -i \
{% for deb in docker_syncd_cavm_debs.split(' ') -%} {% for deb in docker_syncd_cavm_debs.split(' ') -%}

2
platform/marvell/docker-syncd-mrvl/Dockerfile.j2
View File

@ -14,7 +14,7 @@ debs/{{ deb }}{{' '}}
{%- endfor -%} {%- endfor -%}
debs/ debs/
RUN apt-get -y install libpcap-dev libxml2-dev python-dev swig libsensors4-dev libjemalloc1 nfs-common RUN apt-get -y install libpcap-dev libxml2-dev python-dev swig libsensors4-dev libatomic1 libjemalloc1 liblua5.1-0 lua-bitop lua-cjson nfs-common
RUN dpkg -i \ RUN dpkg -i \
{% for deb in docker_syncd_mrvl_debs.split(' ') -%} {% for deb in docker_syncd_mrvl_debs.split(' ') -%}

4
platform/p4/docker-sonic-p4/Dockerfile.j2
View File

@ -28,7 +28,11 @@ RUN apt-get install -y net-tools \
libnanomsg0 \ libnanomsg0 \
libdaemon0 \ libdaemon0 \
libjansson4 \ libjansson4 \
libatomic1 \
libjemalloc1 \ libjemalloc1 \
liblua5.1-0 \
lua-bitop \
lua-cjson \
openssh-client \ openssh-client \
openssh-server \ openssh-server \
libc-ares2 \ libc-ares2 \

5
platform/vs/docker-sonic-vs/Dockerfile.j2
View File

@ -29,7 +29,11 @@ RUN apt-get install -y net-tools \
libjudydebian1 \ libjudydebian1 \
libdaemon0 \ libdaemon0 \
libjansson4 \ libjansson4 \
libatomic1 \
libjemalloc1 \ libjemalloc1 \
liblua5.1-0 \
lua-bitop \
lua-cjson \
openssh-client \ openssh-client \
openssh-server \ openssh-server \
libc-ares2 \ libc-ares2 \
@ -91,6 +95,7 @@ RUN sed -ri 's/^(save .*$)/# \1/g;
s/^# syslog-enabled no$/syslog-enabled no/; \ s/^# syslog-enabled no$/syslog-enabled no/; \
s/^# unixsocket/unixsocket/; \ s/^# unixsocket/unixsocket/; \
s/notify-keyspace-events ""/notify-keyspace-events AKE/; \ s/notify-keyspace-events ""/notify-keyspace-events AKE/; \
s/redis-server.sock/redis.sock/g; \
s/^client-output-buffer-limit pubsub [0-9]+mb [0-9]+mb [0-9]+/client-output-buffer-limit pubsub 0 0 0/ \ s/^client-output-buffer-limit pubsub [0-9]+mb [0-9]+mb [0-9]+/client-output-buffer-limit pubsub 0 0 0/ \
' /etc/redis/redis.conf ' /etc/redis/redis.conf

10
rules/hiredis.mk
View File

@ -1,18 +1,16 @@
# libhiredis package # libhiredis package
HIREDIS_VERSION = 0.13.3 HIREDIS_VERSION = 0.14.0
HIREDIS_VERSION_FULL = $(HIREDIS_VERSION)-2 HIREDIS_VERSION_FULL = $(HIREDIS_VERSION)-3~bpo9+1
export HIREDIS_VERSION HIREDIS_VERSION_FULL export HIREDIS_VERSION HIREDIS_VERSION_FULL
LIBHIREDIS = libhiredis0.13_$(HIREDIS_VERSION_FULL)_amd64.deb LIBHIREDIS = libhiredis0.14_$(HIREDIS_VERSION_FULL)_amd64.deb
$(LIBHIREDIS)_SRC_PATH = $(SRC_PATH)/hiredis $(LIBHIREDIS)_SRC_PATH = $(SRC_PATH)/hiredis
$(LIBHIREDIS)_DEPENDS += $(REDIS_TOOLS) $(REDIS_SERVER)
$(LIBHIREDIS)_RDEPENDS +=
SONIC_MAKE_DEBS += $(LIBHIREDIS) SONIC_MAKE_DEBS += $(LIBHIREDIS)
LIBHIREDIS_DEV = libhiredis-dev_$(HIREDIS_VERSION_FULL)_amd64.deb LIBHIREDIS_DEV = libhiredis-dev_$(HIREDIS_VERSION_FULL)_amd64.deb
$(eval $(call add_derived_package,$(LIBHIREDIS),$(LIBHIREDIS_DEV))) $(eval $(call add_derived_package,$(LIBHIREDIS),$(LIBHIREDIS_DEV)))
LIBHIREDIS_DBG = libhiredis-dbg_$(HIREDIS_VERSION_FULL)_amd64.deb LIBHIREDIS_DBG = libhiredis0.14-dbgsym_$(HIREDIS_VERSION_FULL)_amd64.deb
$(eval $(call add_derived_package,$(LIBHIREDIS),$(LIBHIREDIS_DBG))) $(eval $(call add_derived_package,$(LIBHIREDIS),$(LIBHIREDIS_DBG)))

4
rules/redis.mk
View File

@ -1,9 +1,11 @@
# redis package # redis package
REDIS_VERSION = 3.2.4-1~bpo8+1 REDIS_VERSION = 5.0.3-3~bpo9+2
REDIS_TOOLS = redis-tools_$(REDIS_VERSION)_amd64.deb REDIS_TOOLS = redis-tools_$(REDIS_VERSION)_amd64.deb
$(REDIS_TOOLS)_SRC_PATH = $(SRC_PATH)/redis $(REDIS_TOOLS)_SRC_PATH = $(SRC_PATH)/redis
$(REDIS_TOOLS)_DEPENDS += $(LIBHIREDIS_DEV)
$(REDIS_TOOLS)_RDEPENDS += $(LIBHIREDIS)
SONIC_MAKE_DEBS += $(REDIS_TOOLS) SONIC_MAKE_DEBS += $(REDIS_TOOLS)
REDIS_SERVER = redis-server_$(REDIS_VERSION)_amd64.deb REDIS_SERVER = redis-server_$(REDIS_VERSION)_amd64.deb

3
sonic-slave-stretch/Dockerfile
View File

@ -151,6 +151,9 @@ RUN apt-get update && apt-get install -y \
python-stdeb \ python-stdeb \
# For redis build # For redis build
libjemalloc-dev \ libjemalloc-dev \
liblua5.1-0-dev \
lua-bitop-dev \
lua-cjson-dev \
# For mft kernel module build # For mft kernel module build
dkms \ dkms \
# For python3.5 build # For python3.5 build

4
src/hiredis/Makefile
View File

@ -2,8 +2,8 @@
SHELL = /bin/bash SHELL = /bin/bash
.SHELLFLAGS += -e .SHELLFLAGS += -e
MAIN_TARGET = libhiredis0.13_$(HIREDIS_VERSION_FULL)_amd64.deb MAIN_TARGET = libhiredis0.14_$(HIREDIS_VERSION_FULL)_amd64.deb
DERIVED_TARGETS = libhiredis-dbg_$(HIREDIS_VERSION_FULL)_amd64.deb libhiredis-dev_$(HIREDIS_VERSION_FULL)_amd64.deb DERIVED_TARGETS = libhiredis0.14-dbgsym_$(HIREDIS_VERSION_FULL)_amd64.deb libhiredis-dev_$(HIREDIS_VERSION_FULL)_amd64.deb
$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
rm -rf hiredis-$(HIREDIS_VERSION) rm -rf hiredis-$(HIREDIS_VERSION)

11
src/redis/Makefile
View File

@ -2,8 +2,8 @@ SHELL = /bin/bash
.ONESHELL: .ONESHELL:
.SHELLFLAGS += -e .SHELLFLAGS += -e
REDIS_VERSION = 3.2.4 REDIS_VERSION = 5.0.3
REDIS_VERSION_FULL = $(REDIS_VERSION)-1~bpo8+1 REDIS_VERSION_FULL = $(REDIS_VERSION)-3~bpo9+2
MAIN_TARGET = redis-server_$(REDIS_VERSION_FULL)_amd64.deb MAIN_TARGET = redis-server_$(REDIS_VERSION_FULL)_amd64.deb
DERIVED_TARGETS = redis-tools_$(REDIS_VERSION_FULL)_amd64.deb \ DERIVED_TARGETS = redis-tools_$(REDIS_VERSION_FULL)_amd64.deb \
@ -14,9 +14,10 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
rm -rf redis_build rm -rf redis_build
mkdir redis_build mkdir redis_build
pushd redis_build pushd redis_build
wget -O redis_$(REDIS_VERSION).orig.tar.gz -N "https://sonicstorage.blob.core.windows.net/packages/redis_$(REDIS_VERSION).orig.tar.gz?sv=2015-04-05&sr=b&sig=B3qGEoSHe%2FBh5rVwvXHpKijgBtKF7dHeuJWp1p17UnU%3D&se=2026-11-26T22%3A31%3A31Z&sp=r"
wget -O redis_$(REDIS_VERSION_FULL).dsc -N "https://sonicstorage.blob.core.windows.net/packages/redis_$(REDIS_VERSION_FULL).dsc?sv=2015-04-05&sr=b&sig=LoUtjLXa%2BCcoM%2BsPewRLkY7YPRvSJTbsvQoW%2BL%2B3QWM%3D&se=2026-11-26T22%3A32%3A11Z&sp=r" wget -O redis_$(REDIS_VERSION).orig.tar.gz -N "http://http.debian.net/debian/pool/main/r/redis/redis_$(REDIS_VERSION).orig.tar.gz"
wget -O redis_$(REDIS_VERSION_FULL).debian.tar.xz -N "https://sonicstorage.blob.core.windows.net/packages/redis_$(REDIS_VERSION_FULL).debian.tar.xz?sv=2015-04-05&sr=b&sig=I33UsbDHiffEkQRndpFwY9y3I%2FrKTu0wmG%2FMXB98kys%3D&se=2026-11-26T22%3A32%3A34Z&sp=r" wget -O redis_$(REDIS_VERSION_FULL).dsc -N "http://http.debian.net/debian/pool/main/r/redis/redis_$(REDIS_VERSION_FULL).dsc"
wget -O redis_$(REDIS_VERSION_FULL).debian.tar.xz -N "http://http.debian.net/debian/pool/main/r/redis/redis_$(REDIS_VERSION_FULL).debian.tar.xz"
dpkg-source -x redis_$(REDIS_VERSION_FULL).dsc dpkg-source -x redis_$(REDIS_VERSION_FULL).dsc
pushd redis-$(REDIS_VERSION) pushd redis-$(REDIS_VERSION)