Update redis #7914
Merged
Update redis #7914
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Changes: - redis/docker-library-redis@9a598d4: Update 6.0 to GA - redis/docker-library-redis@082c62d: Update to 6.0.0 - redis/docker-library-redis@58c15d2: Merge pull request redis/docker-library-redis#237 from docker-library/github-actions - redis/docker-library-redis@b5890a6: Add initial GitHub Actions CI
Member
Diff:diff --git a/_bashbrew-arches b/_bashbrew-arches
index 93dc91b..a3cc2b7 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,20 +1,19 @@
-redis:4-32bit-buster @ amd64
-redis:4-alpine3.11 @ amd64
-redis:4-alpine3.11 @ arm32v6
-redis:4-alpine3.11 @ arm32v7
-redis:4-alpine3.11 @ arm64v8
-redis:4-alpine3.11 @ i386
-redis:4-alpine3.11 @ ppc64le
-redis:4-alpine3.11 @ s390x
-redis:4-buster @ amd64
-redis:4-buster @ arm32v5
-redis:4-buster @ arm32v7
-redis:4-buster @ arm64v8
-redis:4-buster @ i386
-redis:4-buster @ mips64le
-redis:4-buster @ ppc64le
-redis:4-buster @ s390x
-redis:32bit-buster @ amd64
+redis:5-32bit-buster @ amd64
+redis:5-alpine3.11 @ amd64
+redis:5-alpine3.11 @ arm32v6
+redis:5-alpine3.11 @ arm32v7
+redis:5-alpine3.11 @ arm64v8
+redis:5-alpine3.11 @ i386
+redis:5-alpine3.11 @ ppc64le
+redis:5-alpine3.11 @ s390x
+redis:5-buster @ amd64
+redis:5-buster @ arm32v5
+redis:5-buster @ arm32v7
+redis:5-buster @ arm64v8
+redis:5-buster @ i386
+redis:5-buster @ mips64le
+redis:5-buster @ ppc64le
+redis:5-buster @ s390x
redis:alpine3.11 @ amd64
redis:alpine3.11 @ arm32v6
redis:alpine3.11 @ arm32v7
@@ -30,18 +29,3 @@ redis:buster @ i386
redis:buster @ mips64le
redis:buster @ ppc64le
redis:buster @ s390x
-redis:rc-alpine3.11 @ amd64
-redis:rc-alpine3.11 @ arm32v6
-redis:rc-alpine3.11 @ arm32v7
-redis:rc-alpine3.11 @ arm64v8
-redis:rc-alpine3.11 @ i386
-redis:rc-alpine3.11 @ ppc64le
-redis:rc-alpine3.11 @ s390x
-redis:rc-buster @ amd64
-redis:rc-buster @ arm32v5
-redis:rc-buster @ arm32v7
-redis:rc-buster @ arm64v8
-redis:rc-buster @ i386
-redis:rc-buster @ mips64le
-redis:rc-buster @ ppc64le
-redis:rc-buster @ s390x
diff --git a/_bashbrew-list b/_bashbrew-list
index af16aa5..6746697 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,21 +1,3 @@
-redis:4
-redis:4-32bit
-redis:4-32bit-buster
-redis:4-alpine
-redis:4-alpine3.11
-redis:4-buster
-redis:4.0
-redis:4.0-32bit
-redis:4.0-32bit-buster
-redis:4.0-alpine
-redis:4.0-alpine3.11
-redis:4.0-buster
-redis:4.0.14
-redis:4.0.14-32bit
-redis:4.0.14-32bit-buster
-redis:4.0.14-alpine
-redis:4.0.14-alpine3.11
-redis:4.0.14-buster
redis:5
redis:5-32bit
redis:5-32bit-buster
@@ -34,21 +16,19 @@ redis:5.0.9-32bit-buster
redis:5.0.9-alpine
redis:5.0.9-alpine3.11
redis:5.0.9-buster
-redis:6.0-rc
-redis:6.0-rc4
-redis:6.0-rc4-alpine
-redis:6.0-rc4-alpine3.11
-redis:6.0-rc4-buster
-redis:6.0-rc-alpine
-redis:6.0-rc-alpine3.11
-redis:6.0-rc-buster
-redis:32bit
-redis:32bit-buster
+redis:6
+redis:6-alpine
+redis:6-alpine3.11
+redis:6-buster
+redis:6.0
+redis:6.0-alpine
+redis:6.0-alpine3.11
+redis:6.0-buster
+redis:6.0.0
+redis:6.0.0-alpine
+redis:6.0.0-alpine3.11
+redis:6.0.0-buster
redis:alpine
redis:alpine3.11
redis:buster
redis:latest
-redis:rc
-redis:rc-alpine
-redis:rc-alpine3.11
-redis:rc-buster
diff --git a/redis_4-32bit-buster/Dockerfile b/redis_4-32bit-buster/Dockerfile
deleted file mode 100644
index 3b40b14..0000000
diff --git a/redis_4-alpine3.11/Dockerfile b/redis_4-alpine3.11/Dockerfile
deleted file mode 100644
index 3caf810..0000000
diff --git a/redis_4-buster/Dockerfile b/redis_4-buster/Dockerfile
deleted file mode 100644
index c754cca..0000000
diff --git a/redis_4-buster/docker-entrypoint.sh b/redis_4-buster/docker-entrypoint.sh
deleted file mode 100755
index 783b65d..0000000
diff --git a/redis_32bit-buster/Dockerfile b/redis_5-32bit-buster/Dockerfile
similarity index 100%
rename from redis_32bit-buster/Dockerfile
rename to redis_5-32bit-buster/Dockerfile
diff --git a/redis_32bit-buster/docker-entrypoint.sh b/redis_5-32bit-buster/docker-entrypoint.sh
similarity index 100%
rename from redis_32bit-buster/docker-entrypoint.sh
rename to redis_5-32bit-buster/docker-entrypoint.sh
diff --git a/redis_alpine3.11/Dockerfile b/redis_5-alpine3.11/Dockerfile
similarity index 100%
copy from redis_alpine3.11/Dockerfile
copy to redis_5-alpine3.11/Dockerfile
diff --git a/redis_4-alpine3.11/docker-entrypoint.sh b/redis_5-alpine3.11/docker-entrypoint.sh
similarity index 100%
rename from redis_4-alpine3.11/docker-entrypoint.sh
rename to redis_5-alpine3.11/docker-entrypoint.sh
diff --git a/redis_buster/Dockerfile b/redis_5-buster/Dockerfile
similarity index 100%
copy from redis_buster/Dockerfile
copy to redis_5-buster/Dockerfile
diff --git a/redis_4-32bit-buster/docker-entrypoint.sh b/redis_5-buster/docker-entrypoint.sh
similarity index 100%
rename from redis_4-32bit-buster/docker-entrypoint.sh
rename to redis_5-buster/docker-entrypoint.sh
diff --git a/redis_alpine3.11/Dockerfile b/redis_alpine3.11/Dockerfile
index d67479d..82e662a 100644
--- a/redis_alpine3.11/Dockerfile
+++ b/redis_alpine3.11/Dockerfile
@@ -10,9 +10,9 @@ RUN apk add --no-cache \
# add tzdata for https://github.com/docker-library/redis/issues/138
tzdata
-ENV REDIS_VERSION 5.0.9
-ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-5.0.9.tar.gz
-ENV REDIS_DOWNLOAD_SHA 53d0ae164cd33536c3d4b720ae9a128ea6166ebf04ff1add3b85f1242090cb85
+ENV REDIS_VERSION 6.0.0
+ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-6.0.0.tar.gz
+ENV REDIS_DOWNLOAD_SHA 16d13ec1c3255206deb4818ed444dca6dda1482b551736f0033253c211b788fc
RUN set -eux; \
\
@@ -34,13 +34,14 @@ RUN set -eux; \
# disable Redis protected mode [1] as it is unnecessary in context of Docker
# (ports are not automatically exposed when running inside Docker, but rather explicitly by specifying -p / -P)
# [1]: https://github.com/antirez/redis/commit/edd4d555df57dc84265fdfb4ef59a4678832f6da
- grep -q '^#define CONFIG_DEFAULT_PROTECTED_MODE 1$' /usr/src/redis/src/server.h; \
- sed -ri 's!^(#define CONFIG_DEFAULT_PROTECTED_MODE) 1$!\1 0!' /usr/src/redis/src/server.h; \
- grep -q '^#define CONFIG_DEFAULT_PROTECTED_MODE 0$' /usr/src/redis/src/server.h; \
+ grep -E '^ *createBoolConfig[(]"protected-mode",.*, *1 *,.*[)],$' /usr/src/redis/src/config.c; \
+ sed -ri 's!^( *createBoolConfig[(]"protected-mode",.*, *)1( *,.*[)],)$!\10\2!' /usr/src/redis/src/config.c; \
+ grep -E '^ *createBoolConfig[(]"protected-mode",.*, *0 *,.*[)],$' /usr/src/redis/src/config.c; \
# for future reference, we modify this directly in the source instead of just supplying a default configuration flag because apparently "if you specify any argument to redis-server, [it assumes] you are going to specify everything"
# see also https://github.com/docker-library/redis/issues/4#issuecomment-50780840
# (more exactly, this makes sure the default behavior of "save on SIGTERM" stays functional by default)
\
+ export BUILD_TLS=yes; \
make -C /usr/src/redis -j "$(nproc)" all; \
make -C /usr/src/redis install; \
\
diff --git a/redis_buster/Dockerfile b/redis_buster/Dockerfile
index f8e11e3..6133e4e 100644
--- a/redis_buster/Dockerfile
+++ b/redis_buster/Dockerfile
@@ -26,9 +26,9 @@ RUN set -eux; \
gosu --version; \
gosu nobody true
-ENV REDIS_VERSION 5.0.9
-ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-5.0.9.tar.gz
-ENV REDIS_DOWNLOAD_SHA 53d0ae164cd33536c3d4b720ae9a128ea6166ebf04ff1add3b85f1242090cb85
+ENV REDIS_VERSION 6.0.0
+ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-6.0.0.tar.gz
+ENV REDIS_DOWNLOAD_SHA 16d13ec1c3255206deb4818ed444dca6dda1482b551736f0033253c211b788fc
RUN set -eux; \
\
@@ -40,6 +40,7 @@ RUN set -eux; \
\
gcc \
libc6-dev \
+ libssl-dev \
make \
; \
rm -rf /var/lib/apt/lists/*; \
@@ -53,13 +54,14 @@ RUN set -eux; \
# disable Redis protected mode [1] as it is unnecessary in context of Docker
# (ports are not automatically exposed when running inside Docker, but rather explicitly by specifying -p / -P)
# [1]: https://github.com/antirez/redis/commit/edd4d555df57dc84265fdfb4ef59a4678832f6da
- grep -q '^#define CONFIG_DEFAULT_PROTECTED_MODE 1$' /usr/src/redis/src/server.h; \
- sed -ri 's!^(#define CONFIG_DEFAULT_PROTECTED_MODE) 1$!\1 0!' /usr/src/redis/src/server.h; \
- grep -q '^#define CONFIG_DEFAULT_PROTECTED_MODE 0$' /usr/src/redis/src/server.h; \
+ grep -E '^ *createBoolConfig[(]"protected-mode",.*, *1 *,.*[)],$' /usr/src/redis/src/config.c; \
+ sed -ri 's!^( *createBoolConfig[(]"protected-mode",.*, *)1( *,.*[)],)$!\10\2!' /usr/src/redis/src/config.c; \
+ grep -E '^ *createBoolConfig[(]"protected-mode",.*, *0 *,.*[)],$' /usr/src/redis/src/config.c; \
# for future reference, we modify this directly in the source instead of just supplying a default configuration flag because apparently "if you specify any argument to redis-server, [it assumes] you are going to specify everything"
# see also https://github.com/docker-library/redis/issues/4#issuecomment-50780840
# (more exactly, this makes sure the default behavior of "save on SIGTERM" stays functional by default)
\
+ export BUILD_TLS=yes; \
make -C /usr/src/redis -j "$(nproc)" all; \
make -C /usr/src/redis install; \
\
diff --git a/redis_rc-alpine3.11/Dockerfile b/redis_rc-alpine3.11/Dockerfile
deleted file mode 100644
index 05ce425..0000000
diff --git a/redis_rc-alpine3.11/docker-entrypoint.sh b/redis_rc-alpine3.11/docker-entrypoint.sh
deleted file mode 100755
index db00075..0000000
diff --git a/redis_rc-buster/Dockerfile b/redis_rc-buster/Dockerfile
deleted file mode 100644
index 979a99c..0000000
diff --git a/redis_rc-buster/docker-entrypoint.sh b/redis_rc-buster/docker-entrypoint.sh
deleted file mode 100755
index 783b65d..0000000 |
Member
|
Build test of #7914; 3b721c6; $ bashbrew build redis:6.0.0
Building bashbrew/cache:70b8557fcea0c42a2736bf7636efa77a22c2a0bc7a34b17fabd74ff0560b8a00 (redis:6.0.0)
Tagging redis:6.0.0
Tagging redis:6.0
Tagging redis:6
Tagging redis:latest
Tagging redis:6.0.0-buster
Tagging redis:6.0-buster
Tagging redis:6-buster
Tagging redis:buster
$ test/run.sh redis:6.0.0
testing redis:6.0.0
'utc' [1/8]...passed
'cve-2014--shellshock' [2/8]...passed
'no-hard-coded-passwords' [3/8]...passed
'override-cmd' [4/8]...passed
'redis-basics' [5/8]...passed
'redis-basics-tls' [6/8]...passed
'redis-basics-config' [7/8]...passed
'redis-basics-persistent' [8/8]...passed
$ bashbrew build redis:6.0.0-alpine
Building bashbrew/cache:9725f7fd1d717f302c9dfa0077cceb41280a0b0f61c0f0889579bc3fb0514bbb (redis:6.0.0-alpine)
Tagging redis:6.0.0-alpine
Tagging redis:6.0-alpine
Tagging redis:6-alpine
Tagging redis:alpine
Tagging redis:6.0.0-alpine3.11
Tagging redis:6.0-alpine3.11
Tagging redis:6-alpine3.11
Tagging redis:alpine3.11
$ test/run.sh redis:6.0.0-alpine
testing redis:6.0.0-alpine
'utc' [1/8]...passed
'cve-2014--shellshock' [2/8]...passed
'no-hard-coded-passwords' [3/8]...passed
'override-cmd' [4/8]...passed
'redis-basics' [5/8]...passed
'redis-basics-tls' [6/8]...passed
'redis-basics-config' [7/8]...passed
'redis-basics-persistent' [8/8]...passed
$ bashbrew build redis:5.0.9
Building bashbrew/cache:51356a19491c0246cc9f33eed7ba53a2ebadc07399dee5d291865c83a49c5408 (redis:5.0.9)
Tagging redis:5.0.9
Tagging redis:5.0
Tagging redis:5
Tagging redis:5.0.9-buster
Tagging redis:5.0-buster
Tagging redis:5-buster
$ test/run.sh redis:5.0.9
testing redis:5.0.9
'utc' [1/8]...passed
'cve-2014--shellshock' [2/8]...passed
'no-hard-coded-passwords' [3/8]...passed
'override-cmd' [4/8]...passed
'redis-basics' [5/8]...passed
'redis-basics-tls' [6/8]...skipping; not built with TLS support (possibly version < 6.0 or 32bit variant)
passed
'redis-basics-config' [7/8]...passed
'redis-basics-persistent' [8/8]...passed
$ bashbrew build redis:5.0.9-32bit
Building bashbrew/cache:bd85f26ccd30ec3a21070634577b1f4631cc9bf2f7cf4fd736f7b292e5c464ef (redis:5.0.9-32bit)
Tagging redis:5.0.9-32bit
Tagging redis:5.0-32bit
Tagging redis:5-32bit
Tagging redis:5.0.9-32bit-buster
Tagging redis:5.0-32bit-buster
Tagging redis:5-32bit-buster
$ test/run.sh redis:5.0.9-32bit
testing redis:5.0.9-32bit
'utc' [1/8]...passed
'cve-2014--shellshock' [2/8]...passed
'no-hard-coded-passwords' [3/8]...passed
'override-cmd' [4/8]...passed
'redis-basics' [5/8]...passed
'redis-basics-tls' [6/8]...skipping; not built with TLS support (possibly version < 6.0 or 32bit variant)
passed
'redis-basics-config' [7/8]...passed
'redis-basics-persistent' [8/8]...passed
$ bashbrew build redis:5.0.9-alpine
Building bashbrew/cache:1a00ace4d9083714e922d4b32a0341b23ad4fe4d3226315751c2d412539b2d54 (redis:5.0.9-alpine)
Tagging redis:5.0.9-alpine
Tagging redis:5.0-alpine
Tagging redis:5-alpine
Tagging redis:5.0.9-alpine3.11
Tagging redis:5.0-alpine3.11
Tagging redis:5-alpine3.11
$ test/run.sh redis:5.0.9-alpine
testing redis:5.0.9-alpine
'utc' [1/8]...passed
'cve-2014--shellshock' [2/8]...passed
'no-hard-coded-passwords' [3/8]...passed
'override-cmd' [4/8]...passed
'redis-basics' [5/8]...passed
'redis-basics-tls' [6/8]...skipping; not built with TLS support (possibly version < 6.0 or 32bit variant)
passed
'redis-basics-config' [7/8]...passed
'redis-basics-persistent' [8/8]...passed
|
This was referenced Apr 30, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes: