Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update redis #7581

Merged
merged 1 commit into from
Mar 5, 2020
Merged

Update redis #7581

merged 1 commit into from
Mar 5, 2020

Conversation

tianon
Copy link
Member

@tianon tianon commented Mar 5, 2020

Changes:

Changes:

- redis/docker-library-redis@7678eb7: Update to 6.0-rc2
@yosifkit
Copy link
Member

yosifkit commented Mar 5, 2020

Diff:
diff --git a/_bashbrew-list b/_bashbrew-list
index a18b836..332715b 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -35,10 +35,10 @@ redis:5.0.7-alpine
 redis:5.0.7-alpine3.11
 redis:5.0.7-buster
 redis:6.0-rc
-redis:6.0-rc1
-redis:6.0-rc1-alpine
-redis:6.0-rc1-alpine3.11
-redis:6.0-rc1-buster
+redis:6.0-rc2
+redis:6.0-rc2-alpine
+redis:6.0-rc2-alpine3.11
+redis:6.0-rc2-buster
 redis:6.0-rc-alpine
 redis:6.0-rc-alpine3.11
 redis:6.0-rc-buster
diff --git a/redis_rc-alpine3.11/Dockerfile b/redis_rc-alpine3.11/Dockerfile
index 6f0df60..93c2983 100644
--- a/redis_rc-alpine3.11/Dockerfile
+++ b/redis_rc-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 6.0-rc1
-ENV REDIS_DOWNLOAD_URL https://github.com/antirez/redis/archive/6.0-rc1.tar.gz
-ENV REDIS_DOWNLOAD_SHA 2676012e2fcfe8d41e594b2ae8a05d0a050d2d84c38a0471ae5fe0143e4b0eca
+ENV REDIS_VERSION 6.0-rc2
+ENV REDIS_DOWNLOAD_URL https://github.com/antirez/redis/archive/6.0-rc2.tar.gz
+ENV REDIS_DOWNLOAD_SHA ac8ac8aae2c143ba972c386f9852ae40b418dbcecab3841bf7f6d4b71fccd7cb
 
 RUN set -eux; \
 	\
diff --git a/redis_rc-buster/Dockerfile b/redis_rc-buster/Dockerfile
index 05c7034..699055f 100644
--- a/redis_rc-buster/Dockerfile
+++ b/redis_rc-buster/Dockerfile
@@ -39,9 +39,9 @@ RUN set -eux; \
 	gosu --version; \
 	gosu nobody true
 
-ENV REDIS_VERSION 6.0-rc1
-ENV REDIS_DOWNLOAD_URL https://github.com/antirez/redis/archive/6.0-rc1.tar.gz
-ENV REDIS_DOWNLOAD_SHA 2676012e2fcfe8d41e594b2ae8a05d0a050d2d84c38a0471ae5fe0143e4b0eca
+ENV REDIS_VERSION 6.0-rc2
+ENV REDIS_DOWNLOAD_URL https://github.com/antirez/redis/archive/6.0-rc2.tar.gz
+ENV REDIS_DOWNLOAD_SHA ac8ac8aae2c143ba972c386f9852ae40b418dbcecab3841bf7f6d4b71fccd7cb
 
 RUN set -eux; \
 	\

@yosifkit
Copy link
Member

yosifkit commented Mar 5, 2020

Build test of #7581; 4ebe73b; amd64 (redis):

$ bashbrew build redis:6.0-rc2
Building bashbrew/cache:2822e3761f1bdcb192ce22ed1b4a4c1a8a9695390a627ebfa3fa12b6dbf1c87d (redis:6.0-rc2)
Tagging redis:6.0-rc2
Tagging redis:6.0-rc
Tagging redis:rc
Tagging redis:6.0-rc2-buster
Tagging redis:6.0-rc-buster
Tagging redis:rc-buster

$ test/run.sh redis:6.0-rc2
testing redis:6.0-rc2
	'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-rc2-alpine
Building bashbrew/cache:5afe92852cb204da6cf7867cd664269f90ca225a48f52a6ab1d5aca15b4dcc5d (redis:6.0-rc2-alpine)
Tagging redis:6.0-rc2-alpine
Tagging redis:6.0-rc-alpine
Tagging redis:rc-alpine
Tagging redis:6.0-rc2-alpine3.11
Tagging redis:6.0-rc-alpine3.11
Tagging redis:rc-alpine3.11

$ test/run.sh redis:6.0-rc2-alpine
testing redis:6.0-rc2-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.7
Building bashbrew/cache:8ffed6aa19765c81de0f47167fdd6f13e956564adada97bf95827af509717437 (redis:5.0.7)
Tagging redis:5.0.7
Tagging redis:5.0
Tagging redis:5
Tagging redis:latest
Tagging redis:5.0.7-buster
Tagging redis:5.0-buster
Tagging redis:5-buster
Tagging redis:buster

$ test/run.sh redis:5.0.7
testing redis:5.0.7
	'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.7-32bit
Building bashbrew/cache:279d466b53de25bbfa59247245da30be36fca93f57920f068fa78d8b23cf1445 (redis:5.0.7-32bit)
Tagging redis:5.0.7-32bit
Tagging redis:5.0-32bit
Tagging redis:5-32bit
Tagging redis:32bit
Tagging redis:5.0.7-32bit-buster
Tagging redis:5.0-32bit-buster
Tagging redis:5-32bit-buster
Tagging redis:32bit-buster

$ test/run.sh redis:5.0.7-32bit
testing redis:5.0.7-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.7-alpine
Using bashbrew/cache:e33144ead371d5f30e4d1cf8527c057163f05559e0e72a018c73c9cce02a4633 (redis:5.0.7-alpine)
Tagging redis:5.0.7-alpine
Tagging redis:5.0-alpine
Tagging redis:5-alpine
Tagging redis:alpine
Tagging redis:5.0.7-alpine3.11
Tagging redis:5.0-alpine3.11
Tagging redis:5-alpine3.11
Tagging redis:alpine3.11

$ test/run.sh redis:5.0.7-alpine
testing redis:5.0.7-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


$ bashbrew build redis:4.0.14
Building bashbrew/cache:a269e714f8aa21a71cddea88618480a73dabd6893c5a8272cffa63bbf36c8dfd (redis:4.0.14)
Tagging redis:4.0.14
Tagging redis:4.0
Tagging redis:4
Tagging redis:4.0.14-buster
Tagging redis:4.0-buster
Tagging redis:4-buster

$ test/run.sh redis:4.0.14
testing redis:4.0.14
	'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:4.0.14-32bit
Building bashbrew/cache:84ce11affbace1336e971ccc18990953c2109eaf46dacd7329346e765ea3520f (redis:4.0.14-32bit)
Tagging redis:4.0.14-32bit
Tagging redis:4.0-32bit
Tagging redis:4-32bit
Tagging redis:4.0.14-32bit-buster
Tagging redis:4.0-32bit-buster
Tagging redis:4-32bit-buster

$ test/run.sh redis:4.0.14-32bit
testing redis:4.0.14-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:4.0.14-alpine
Using bashbrew/cache:dc092b622b629d1657667987df0882b40b392922b7f64e6325d2c8b6c9d152c7 (redis:4.0.14-alpine)
Tagging redis:4.0.14-alpine
Tagging redis:4.0-alpine
Tagging redis:4-alpine
Tagging redis:4.0.14-alpine3.11
Tagging redis:4.0-alpine3.11
Tagging redis:4-alpine3.11

$ test/run.sh redis:4.0.14-alpine
testing redis:4.0.14-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

@yosifkit yosifkit merged commit f8f2661 into docker-library:master Mar 5, 2020
@yosifkit yosifkit deleted the redis branch March 5, 2020 23:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants