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.

Sign up for GitHub

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

Jump to bottom

Add Redis 4.0.0 #3196

Merged
merged 2 commits into from
Jul 14, 2017
Merged

Add Redis 4.0.0 #3196

merged 2 commits into from
Jul 14, 2017

Conversation

tianon
Copy link
Member

@tianon tianon commented Jul 14, 2017

tianon
tianon commented Jul 14, 2017
View reviewed changes
library/redis Outdated
Architectures: windows-amd64
GitCommit: f131897d1f6305b8f6ebae695344f19c523e2c65
Directory: 3.2/windows/windowsservercore
Constraints: windowsservercore

Tags: 3.2.100-nanoserver, 3.2-nanoserver, 3-nanoserver, nanoserver
Tags: 3.2.100-nanoserver, 3.2-nanoserver, 3-nanoserver
Architectures: windows-amd64
GitCommit: f131897d1f6305b8f6ebae695344f19c523e2c65
Directory: 3.2/windows/nanoserver
Constraints: nanoserver
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably worth noting that https://github.com/MSOpenTech/redis now redirects to https://github.com/MicrosoftArchive/redis ("Archived Microsoft GitHub repositories - for historical interest, not actively maintained"), so even these older Windows tags might be something we should look to remove in the future. 😞

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why the loss of the plain nanoserver and windowsservercore tags?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because latest moved to redis:4.0, and there's no Windows version of 4.0 (related to this archiving).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But they should still exist. Just because windows is behind doesn't mean its latest tag should be lost; we have let other images get out of sync in their versions between OS's (Debian vs Alpine).

If we need to look at removing or finding a new source for the windows based images, that can be done separately.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not even sure how we'd implement that in the generate script -- I'd be much more inclined to just remove all the Windows images, personally. I never really liked that their versions didn't match up, so them being unmaintained is just another nail in the coffin, IMO.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have we had a case where the major version number of two variants weren't in sync?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(IMO, it'd be weird as a user for redis:latest to give me Redis 4.x but redis:nanoserver to give me 3.x, if both are still claimed to be supported -- I think microsoftarchive/redis#525 makes it pretty clear that the future of Redis on Windows is tenuous at best. Maybe one of our RedisLabs maintainers could comment on whether the Windows variants should simply go away at this point?)

Copy link

@cihanb cihanb Jul 14, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes Microsoft and maintainers has confirmed it is no longer maintaining the redis on windows last year. There won't be a 4.0 port for Windows.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

redis/docker-library-redis#99

@tianon
Copy link
Member Author

tianon commented Jul 14, 2017

Diff: 
diff --git a/_bashbrew-arches b/_bashbrew-arches
index 75c2ba1..493b0b4 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,14 +1,14 @@
-redis:3.0 @ amd64
-redis:3.0 @ arm32v5
-redis:3.0 @ arm32v7
-redis:3.0 @ arm64v8
-redis:3.0 @ i386
-redis:3.0 @ ppc64le
-redis:3.0 @ s390x
-redis:3.0-32bit @ amd64
-redis:3.0-alpine @ amd64
-redis:3.0-nanoserver @ windows-amd64
-redis:3.0-windowsservercore @ windows-amd64
+redis:3 @ amd64
+redis:3 @ arm32v5
+redis:3 @ arm32v7
+redis:3 @ arm64v8
+redis:3 @ i386
+redis:3 @ ppc64le
+redis:3 @ s390x
+redis:3-32bit @ amd64
+redis:3-alpine @ amd64
+redis:3-nanoserver @ windows-amd64
+redis:3-windowsservercore @ windows-amd64
 redis:32bit @ amd64
 redis:alpine @ amd64
 redis:latest @ amd64
@@ -18,5 +18,3 @@ redis:latest @ arm64v8
 redis:latest @ i386
 redis:latest @ ppc64le
 redis:latest @ s390x
-redis:nanoserver @ windows-amd64
-redis:windowsservercore @ windows-amd64
diff --git a/_bashbrew-list b/_bashbrew-list
index b14155f..7fcc5e3 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -3,16 +3,6 @@ redis:3-32bit
 redis:3-alpine
 redis:3-nanoserver
 redis:3-windowsservercore
-redis:3.0
-redis:3.0-32bit
-redis:3.0-alpine
-redis:3.0-nanoserver
-redis:3.0-windowsservercore
-redis:3.0.7
-redis:3.0.7-32bit
-redis:3.0.7-alpine
-redis:3.0.504-nanoserver
-redis:3.0.504-windowsservercore
 redis:3.2
 redis:3.2-32bit
 redis:3.2-alpine
@@ -23,8 +13,15 @@ redis:3.2.9-32bit
 redis:3.2.9-alpine
 redis:3.2.100-nanoserver
 redis:3.2.100-windowsservercore
+redis:4
+redis:4-32bit
+redis:4-alpine
+redis:4.0
+redis:4.0-32bit
+redis:4.0-alpine
+redis:4.0.0
+redis:4.0.0-32bit
+redis:4.0.0-alpine
 redis:32bit
 redis:alpine
 redis:latest
-redis:nanoserver
-redis:windowsservercore
diff --git a/redis_32bit/Dockerfile b/redis_3-32bit/Dockerfile
similarity index 100%
copy from redis_32bit/Dockerfile
copy to redis_3-32bit/Dockerfile
diff --git a/redis_3.0-32bit/docker-entrypoint.sh b/redis_3-32bit/docker-entrypoint.sh
similarity index 100%
rename from redis_3.0-32bit/docker-entrypoint.sh
rename to redis_3-32bit/docker-entrypoint.sh
diff --git a/redis_alpine/Dockerfile b/redis_3-alpine/Dockerfile
similarity index 100%
copy from redis_alpine/Dockerfile
copy to redis_3-alpine/Dockerfile
diff --git a/redis_3.0-alpine/docker-entrypoint.sh b/redis_3-alpine/docker-entrypoint.sh
similarity index 100%
rename from redis_3.0-alpine/docker-entrypoint.sh
rename to redis_3-alpine/docker-entrypoint.sh
diff --git a/redis_nanoserver/Dockerfile b/redis_3-nanoserver/Dockerfile
similarity index 100%
rename from redis_nanoserver/Dockerfile
rename to redis_3-nanoserver/Dockerfile
diff --git a/redis_windowsservercore/Dockerfile b/redis_3-windowsservercore/Dockerfile
similarity index 100%
rename from redis_windowsservercore/Dockerfile
rename to redis_3-windowsservercore/Dockerfile
diff --git a/redis_3.0-32bit/Dockerfile b/redis_3.0-32bit/Dockerfile
deleted file mode 100644
index f1f4f02..0000000
diff --git a/redis_3.0-alpine/Dockerfile b/redis_3.0-alpine/Dockerfile
deleted file mode 100644
index 0f49c5b..0000000
diff --git a/redis_3.0-nanoserver/Dockerfile b/redis_3.0-nanoserver/Dockerfile
deleted file mode 100644
index 5758a96..0000000
diff --git a/redis_3.0-windowsservercore/Dockerfile b/redis_3.0-windowsservercore/Dockerfile
deleted file mode 100644
index d8f7afb..0000000
diff --git a/redis_3.0/Dockerfile b/redis_3.0/Dockerfile
deleted file mode 100644
index 68630c7..0000000
diff --git a/redis_latest/Dockerfile b/redis_3/Dockerfile
similarity index 100%
copy from redis_latest/Dockerfile
copy to redis_3/Dockerfile
diff --git a/redis_3.0/docker-entrypoint.sh b/redis_3/docker-entrypoint.sh
similarity index 100%
rename from redis_3.0/docker-entrypoint.sh
rename to redis_3/docker-entrypoint.sh
diff --git a/redis_32bit/Dockerfile b/redis_32bit/Dockerfile
index 31591bf..875b380 100644
--- a/redis_32bit/Dockerfile
+++ b/redis_32bit/Dockerfile
@@ -25,9 +25,9 @@ RUN set -ex; \
 	\
 	apt-get purge -y --auto-remove $fetchDeps
 
-ENV REDIS_VERSION 3.2.9
-ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-3.2.9.tar.gz
-ENV REDIS_DOWNLOAD_SHA 6eaacfa983b287e440d0839ead20c2231749d5d6b78bbe0e0ffa3a890c59ff26
+ENV REDIS_VERSION 4.0.0
+ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-4.0.0.tar.gz
+ENV REDIS_DOWNLOAD_SHA d539ae309295721d5c3ed7298939645b6f86ab5d25fdf2a0352ab575c159df2d
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
 		libc6-i386 \
diff --git a/redis_alpine/Dockerfile b/redis_alpine/Dockerfile
index 678d5c0..ce6e639 100644
--- a/redis_alpine/Dockerfile
+++ b/redis_alpine/Dockerfile
@@ -6,9 +6,9 @@ RUN addgroup -S redis && adduser -S -G redis redis
 # grab su-exec for easy step-down from root
 RUN apk add --no-cache 'su-exec>=0.2'
 
-ENV REDIS_VERSION 3.2.9
-ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-3.2.9.tar.gz
-ENV REDIS_DOWNLOAD_SHA 6eaacfa983b287e440d0839ead20c2231749d5d6b78bbe0e0ffa3a890c59ff26
+ENV REDIS_VERSION 4.0.0
+ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-4.0.0.tar.gz
+ENV REDIS_DOWNLOAD_SHA d539ae309295721d5c3ed7298939645b6f86ab5d25fdf2a0352ab575c159df2d
 
 # for redis-sentinel see: http://redis.io/topics/sentinel
 RUN set -ex; \
diff --git a/redis_latest/Dockerfile b/redis_latest/Dockerfile
index eb855c9..2278b47 100644
--- a/redis_latest/Dockerfile
+++ b/redis_latest/Dockerfile
@@ -25,9 +25,9 @@ RUN set -ex; \
 	\
 	apt-get purge -y --auto-remove $fetchDeps
 
-ENV REDIS_VERSION 3.2.9
-ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-3.2.9.tar.gz
-ENV REDIS_DOWNLOAD_SHA 6eaacfa983b287e440d0839ead20c2231749d5d6b78bbe0e0ffa3a890c59ff26
+ENV REDIS_VERSION 4.0.0
+ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-4.0.0.tar.gz
+ENV REDIS_DOWNLOAD_SHA d539ae309295721d5c3ed7298939645b6f86ab5d25fdf2a0352ab575c159df2d
 
 # for redis-sentinel see: http://redis.io/topics/sentinel
 RUN set -ex; \

@tianon
Copy link
Member Author

tianon commented Jul 14, 2017

Build test of #3196; 725f4f6 (redis):

$ bashbrew build redis:3.2.9
Using bashbrew/cache:f1cf7ccb308ba1fcee1ed514758622d8c89999fd9da616e491a54ae60b3ccfbd (redis:3.2.9)
Tagging redis:3.2.9
Tagging redis:3.2
Tagging redis:3

$ test/run.sh redis:3.2.9
testing redis:3.2.9
	'utc' [1/7]...passed
	'cve-2014--shellshock' [2/7]...passed
	'no-hard-coded-passwords' [3/7]...passed
	'override-cmd' [4/7]...passed
	'redis-basics' [5/7]...passed
	'redis-basics-config' [6/7]...passed
	'redis-basics-persistent' [7/7]...passed


$ bashbrew build redis:3.2.9-32bit
Using bashbrew/cache:bf2ba2f9f18042fb779909ceadfffe84171b47e20b5bd6d230f7ed617ee48a29 (redis:3.2.9-32bit)
Tagging redis:3.2.9-32bit
Tagging redis:3.2-32bit
Tagging redis:3-32bit

$ test/run.sh redis:3.2.9-32bit
testing redis:3.2.9-32bit
	'utc' [1/7]...passed
	'cve-2014--shellshock' [2/7]...passed
	'no-hard-coded-passwords' [3/7]...passed
	'override-cmd' [4/7]...passed
	'redis-basics' [5/7]...passed
	'redis-basics-config' [6/7]...passed
	'redis-basics-persistent' [7/7]...passed


$ bashbrew build redis:3.2.9-alpine
Building bashbrew/cache:05c12dca7983b11bc69270dcde800bed11bb0955779b6aaae8c43e23f355a9a7 (redis:3.2.9-alpine)
Tagging redis:3.2.9-alpine
Tagging redis:3.2-alpine
Tagging redis:3-alpine

$ test/run.sh redis:3.2.9-alpine
testing redis:3.2.9-alpine
	'utc' [1/7]...passed
	'cve-2014--shellshock' [2/7]...passed
	'no-hard-coded-passwords' [3/7]...passed
	'override-cmd' [4/7]...passed
	'redis-basics' [5/7]...passed
	'redis-basics-config' [6/7]...passed
	'redis-basics-persistent' [7/7]...passed


$ bashbrew build redis:3.2.100-windowsservercore
skipping "redis:3.2.100-windowsservercore" (due to architecture "amd64"; only "windows-amd64" supported)

$ test/run.sh redis:3.2.100-windowsservercore
testing redis:3.2.100-windowsservercore
	image does not exist!


$ bashbrew build redis:3.2.100-nanoserver
skipping "redis:3.2.100-nanoserver" (due to architecture "amd64"; only "windows-amd64" supported)

$ test/run.sh redis:3.2.100-nanoserver
testing redis:3.2.100-nanoserver
	image does not exist!


$ bashbrew build redis:4.0.0
Building bashbrew/cache:9266ea06536059f1edfef7e1b1a40f2d21a71286f26b2c6975f4f13e676a961d (redis:4.0.0)
Tagging redis:4.0.0
Tagging redis:4.0
Tagging redis:4
Tagging redis:latest

$ test/run.sh redis:4.0.0
testing redis:4.0.0
	'utc' [1/7]...passed
	'cve-2014--shellshock' [2/7]...passed
	'no-hard-coded-passwords' [3/7]...passed
	'override-cmd' [4/7]...passed
	'redis-basics' [5/7]...passed
	'redis-basics-config' [6/7]...passed
	'redis-basics-persistent' [7/7]...passed


$ bashbrew build redis:4.0.0-32bit
Building bashbrew/cache:7ac501a9dfb4c53081b4d28c335f8e958e0e0f85f1715fc6be6aadaa9e397551 (redis:4.0.0-32bit)
Tagging redis:4.0.0-32bit
Tagging redis:4.0-32bit
Tagging redis:4-32bit
Tagging redis:32bit

$ test/run.sh redis:4.0.0-32bit
testing redis:4.0.0-32bit
	'utc' [1/7]...passed
	'cve-2014--shellshock' [2/7]...passed
	'no-hard-coded-passwords' [3/7]...passed
	'override-cmd' [4/7]...passed
	'redis-basics' [5/7]...passed
	'redis-basics-config' [6/7]...passed
	'redis-basics-persistent' [7/7]...passed


$ bashbrew build redis:4.0.0-alpine
Building bashbrew/cache:d56b5aa2d6677825e27bb85dcf204e6f07aa7d05bee662d688846ea20d50ab84 (redis:4.0.0-alpine)
Tagging redis:4.0.0-alpine
Tagging redis:4.0-alpine
Tagging redis:4-alpine
Tagging redis:alpine

$ test/run.sh redis:4.0.0-alpine
testing redis:4.0.0-alpine
	'utc' [1/7]...passed
	'cve-2014--shellshock' [2/7]...passed
	'no-hard-coded-passwords' [3/7]...passed
	'override-cmd' [4/7]...passed
	'redis-basics' [5/7]...passed
	'redis-basics-config' [6/7]...passed
	'redis-basics-persistent' [7/7]...passed

The following images failed at least one test:

  • redis:
    • redis:3.2.100-windowsservercore
    • redis:3.2.100-nanoserver

@yosifkit
Copy link
Member

Diff: 
diff --git a/_bashbrew-arches b/_bashbrew-arches
index 75c2ba1..47e3888 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,14 +1,12 @@
-redis:3.0 @ amd64
-redis:3.0 @ arm32v5
-redis:3.0 @ arm32v7
-redis:3.0 @ arm64v8
-redis:3.0 @ i386
-redis:3.0 @ ppc64le
-redis:3.0 @ s390x
-redis:3.0-32bit @ amd64
-redis:3.0-alpine @ amd64
-redis:3.0-nanoserver @ windows-amd64
-redis:3.0-windowsservercore @ windows-amd64
+redis:3 @ amd64
+redis:3 @ arm32v5
+redis:3 @ arm32v7
+redis:3 @ arm64v8
+redis:3 @ i386
+redis:3 @ ppc64le
+redis:3 @ s390x
+redis:3-32bit @ amd64
+redis:3-alpine @ amd64
 redis:32bit @ amd64
 redis:alpine @ amd64
 redis:latest @ amd64
@@ -18,5 +16,3 @@ redis:latest @ arm64v8
 redis:latest @ i386
 redis:latest @ ppc64le
 redis:latest @ s390x
-redis:nanoserver @ windows-amd64
-redis:windowsservercore @ windows-amd64
diff --git a/_bashbrew-list b/_bashbrew-list
index b14155f..ca0fd98 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,30 +1,21 @@
 redis:3
 redis:3-32bit
 redis:3-alpine
-redis:3-nanoserver
-redis:3-windowsservercore
-redis:3.0
-redis:3.0-32bit
-redis:3.0-alpine
-redis:3.0-nanoserver
-redis:3.0-windowsservercore
-redis:3.0.7
-redis:3.0.7-32bit
-redis:3.0.7-alpine
-redis:3.0.504-nanoserver
-redis:3.0.504-windowsservercore
 redis:3.2
 redis:3.2-32bit
 redis:3.2-alpine
-redis:3.2-nanoserver
-redis:3.2-windowsservercore
 redis:3.2.9
 redis:3.2.9-32bit
 redis:3.2.9-alpine
-redis:3.2.100-nanoserver
-redis:3.2.100-windowsservercore
+redis:4
+redis:4-32bit
+redis:4-alpine
+redis:4.0
+redis:4.0-32bit
+redis:4.0-alpine
+redis:4.0.0
+redis:4.0.0-32bit
+redis:4.0.0-alpine
 redis:32bit
 redis:alpine
 redis:latest
-redis:nanoserver
-redis:windowsservercore
diff --git a/redis_32bit/Dockerfile b/redis_3-32bit/Dockerfile
similarity index 100%
copy from redis_32bit/Dockerfile
copy to redis_3-32bit/Dockerfile
diff --git a/redis_3.0-32bit/docker-entrypoint.sh b/redis_3-32bit/docker-entrypoint.sh
similarity index 100%
rename from redis_3.0-32bit/docker-entrypoint.sh
rename to redis_3-32bit/docker-entrypoint.sh
diff --git a/redis_alpine/Dockerfile b/redis_3-alpine/Dockerfile
similarity index 100%
copy from redis_alpine/Dockerfile
copy to redis_3-alpine/Dockerfile
diff --git a/redis_3.0-alpine/docker-entrypoint.sh b/redis_3-alpine/docker-entrypoint.sh
similarity index 100%
rename from redis_3.0-alpine/docker-entrypoint.sh
rename to redis_3-alpine/docker-entrypoint.sh
diff --git a/redis_3.0-32bit/Dockerfile b/redis_3.0-32bit/Dockerfile
deleted file mode 100644
index f1f4f02..0000000
diff --git a/redis_3.0-alpine/Dockerfile b/redis_3.0-alpine/Dockerfile
deleted file mode 100644
index 0f49c5b..0000000
diff --git a/redis_3.0-nanoserver/Dockerfile b/redis_3.0-nanoserver/Dockerfile
deleted file mode 100644
index 5758a96..0000000
diff --git a/redis_3.0-windowsservercore/Dockerfile b/redis_3.0-windowsservercore/Dockerfile
deleted file mode 100644
index d8f7afb..0000000
diff --git a/redis_3.0/Dockerfile b/redis_3.0/Dockerfile
deleted file mode 100644
index 68630c7..0000000
diff --git a/redis_latest/Dockerfile b/redis_3/Dockerfile
similarity index 100%
copy from redis_latest/Dockerfile
copy to redis_3/Dockerfile
diff --git a/redis_3.0/docker-entrypoint.sh b/redis_3/docker-entrypoint.sh
similarity index 100%
rename from redis_3.0/docker-entrypoint.sh
rename to redis_3/docker-entrypoint.sh
diff --git a/redis_32bit/Dockerfile b/redis_32bit/Dockerfile
index 31591bf..875b380 100644
--- a/redis_32bit/Dockerfile
+++ b/redis_32bit/Dockerfile
@@ -25,9 +25,9 @@ RUN set -ex; \
 	\
 	apt-get purge -y --auto-remove $fetchDeps
 
-ENV REDIS_VERSION 3.2.9
-ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-3.2.9.tar.gz
-ENV REDIS_DOWNLOAD_SHA 6eaacfa983b287e440d0839ead20c2231749d5d6b78bbe0e0ffa3a890c59ff26
+ENV REDIS_VERSION 4.0.0
+ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-4.0.0.tar.gz
+ENV REDIS_DOWNLOAD_SHA d539ae309295721d5c3ed7298939645b6f86ab5d25fdf2a0352ab575c159df2d
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
 		libc6-i386 \
diff --git a/redis_alpine/Dockerfile b/redis_alpine/Dockerfile
index 678d5c0..ce6e639 100644
--- a/redis_alpine/Dockerfile
+++ b/redis_alpine/Dockerfile
@@ -6,9 +6,9 @@ RUN addgroup -S redis && adduser -S -G redis redis
 # grab su-exec for easy step-down from root
 RUN apk add --no-cache 'su-exec>=0.2'
 
-ENV REDIS_VERSION 3.2.9
-ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-3.2.9.tar.gz
-ENV REDIS_DOWNLOAD_SHA 6eaacfa983b287e440d0839ead20c2231749d5d6b78bbe0e0ffa3a890c59ff26
+ENV REDIS_VERSION 4.0.0
+ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-4.0.0.tar.gz
+ENV REDIS_DOWNLOAD_SHA d539ae309295721d5c3ed7298939645b6f86ab5d25fdf2a0352ab575c159df2d
 
 # for redis-sentinel see: http://redis.io/topics/sentinel
 RUN set -ex; \
diff --git a/redis_latest/Dockerfile b/redis_latest/Dockerfile
index eb855c9..2278b47 100644
--- a/redis_latest/Dockerfile
+++ b/redis_latest/Dockerfile
@@ -25,9 +25,9 @@ RUN set -ex; \
 	\
 	apt-get purge -y --auto-remove $fetchDeps
 
-ENV REDIS_VERSION 3.2.9
-ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-3.2.9.tar.gz
-ENV REDIS_DOWNLOAD_SHA 6eaacfa983b287e440d0839ead20c2231749d5d6b78bbe0e0ffa3a890c59ff26
+ENV REDIS_VERSION 4.0.0
+ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-4.0.0.tar.gz
+ENV REDIS_DOWNLOAD_SHA d539ae309295721d5c3ed7298939645b6f86ab5d25fdf2a0352ab575c159df2d
 
 # for redis-sentinel see: http://redis.io/topics/sentinel
 RUN set -ex; \
diff --git a/redis_nanoserver/Dockerfile b/redis_nanoserver/Dockerfile
deleted file mode 100644
index 39a7909..0000000
diff --git a/redis_windowsservercore/Dockerfile b/redis_windowsservercore/Dockerfile
deleted file mode 100644
index 273fdb8..0000000

@yosifkit yosifkit merged commit b652a73 into docker-library:master Jul 14, 2017
@yosifkit yosifkit deleted the redis branch July 14, 2017 19:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cihanb cihanb cihanb left review comments

@yosifkit yosifkit yosifkit left review comments

Assignees
No one assigned
Labels
library/redis
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@tianon @yosifkit @cihanb