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

Add Redis 3.2 #57

Merged
merged 1 commit into from
May 9, 2016
Merged

Add Redis 3.2 #57

merged 1 commit into from
May 9, 2016

Conversation

TimWolla
Copy link
Contributor

@TimWolla TimWolla commented May 6, 2016

No description provided.

@TimWolla
Copy link
Contributor Author

TimWolla commented May 6, 2016

I just force pushed to fix a mistake I made in generate-stackbrew-library.sh.

@TimWolla
Copy link
Contributor Author

TimWolla commented May 6, 2016

Regarding 719878e:

I opted to disable the protected mode, because Docker already protects against accidentally exposing Redis to the world as it requires the -P / -p flag when docker running Redis.

@tianon
Copy link
Contributor

tianon commented May 6, 2016

Here's an easier diff to digest:

diff --git a/.travis.yml b/.travis.yml
index 4169ee8..2c5541d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,9 @@ language: bash
 services: docker

 env:
+  - VERSION=3.2 VARIANT=
+  - VERSION=3.2 VARIANT=32bit
+  - VERSION=3.2 VARIANT=alpine
   - VERSION=3.0 VARIANT=
   - VERSION=3.0 VARIANT=32bit
   - VERSION=3.0 VARIANT=alpine
diff --git a/3.0/32bit/Dockerfile b/3.2/32bit/Dockerfile
similarity index 93%
copy from 3.0/32bit/Dockerfile
copy to 3.2/32bit/Dockerfile
index e56ad0b..c935847 100644
--- a/3.0/32bit/Dockerfile
+++ b/3.2/32bit/Dockerfile
@@ -20,9 +20,9 @@ RUN set -x \
    && chmod +x /usr/local/bin/gosu \
    && gosu nobody true

-ENV REDIS_VERSION 3.0.7
-ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-3.0.7.tar.gz
-ENV REDIS_DOWNLOAD_SHA1 e56b4b7e033ae8dbf311f9191cf6fdf3ae974d1c
+ENV REDIS_VERSION 3.2.0
+ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-3.2.0.tar.gz
+ENV REDIS_DOWNLOAD_SHA1 0c1820931094369c8cc19fc1be62f598bc5961ca

 RUN apt-get update && apt-get install -y libc6-i386 --no-install-recommends && rm -rf /var/lib/apt/lists/*

@@ -50,4 +50,4 @@ RUN ln -s usr/local/bin/docker-entrypoint.sh /entrypoint.sh # backwards compat
 ENTRYPOINT ["docker-entrypoint.sh"]

 EXPOSE 6379
-CMD [ "redis-server" ]
+CMD [ "redis-server", "--protected-mode", "no" ]
diff --git a/3.0/docker-entrypoint.sh b/3.2/32bit/docker-entrypoint.sh
similarity index 100%
copy from 3.0/docker-entrypoint.sh
copy to 3.2/32bit/docker-entrypoint.sh
diff --git a/3.0/Dockerfile b/3.2/Dockerfile
similarity index 92%
copy from 3.0/Dockerfile
copy to 3.2/Dockerfile
index 0a30e26..5ce3fd9 100644
--- a/3.0/Dockerfile
+++ b/3.2/Dockerfile
@@ -20,9 +20,9 @@ RUN set -x \
    && chmod +x /usr/local/bin/gosu \
    && gosu nobody true

-ENV REDIS_VERSION 3.0.7
-ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-3.0.7.tar.gz
-ENV REDIS_DOWNLOAD_SHA1 e56b4b7e033ae8dbf311f9191cf6fdf3ae974d1c
+ENV REDIS_VERSION 3.2.0
+ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-3.2.0.tar.gz
+ENV REDIS_DOWNLOAD_SHA1 0c1820931094369c8cc19fc1be62f598bc5961ca

 # for redis-sentinel see: http://redis.io/topics/sentinel
 RUN buildDeps='gcc libc6-dev make' \
@@ -48,4 +48,4 @@ RUN ln -s usr/local/bin/docker-entrypoint.sh /entrypoint.sh # backwards compat
 ENTRYPOINT ["docker-entrypoint.sh"]

 EXPOSE 6379
-CMD [ "redis-server" ]
+CMD [ "redis-server", "--protected-mode", "no" ]
diff --git a/3.0/alpine/Dockerfile b/3.2/alpine/Dockerfile
similarity index 88%
copy from 3.0/alpine/Dockerfile
copy to 3.2/alpine/Dockerfile
index 1551869..6439866 100644
--- a/3.0/alpine/Dockerfile
+++ b/3.2/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.0.7
-ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-3.0.7.tar.gz
-ENV REDIS_DOWNLOAD_SHA1 e56b4b7e033ae8dbf311f9191cf6fdf3ae974d1c
+ENV REDIS_VERSION 3.2.0
+ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-3.2.0.tar.gz
+ENV REDIS_DOWNLOAD_SHA1 0c1820931094369c8cc19fc1be62f598bc5961ca

 # for redis-sentinel see: http://redis.io/topics/sentinel
 RUN set -x \
@@ -37,4 +37,4 @@ RUN ln -s usr/local/bin/docker-entrypoint.sh /entrypoint.sh # backwards compat
 ENTRYPOINT ["docker-entrypoint.sh"]

 EXPOSE 6379
-CMD [ "redis-server" ]
+CMD [ "redis-server", "--protected-mode", "no" ]
diff --git a/3.0/alpine/docker-entrypoint.sh b/3.2/alpine/docker-entrypoint.sh
similarity index 100%
copy from 3.0/alpine/docker-entrypoint.sh
copy to 3.2/alpine/docker-entrypoint.sh
diff --git a/3.0/docker-entrypoint.sh b/3.2/docker-entrypoint.sh
similarity index 100%
copy from 3.0/docker-entrypoint.sh
copy to 3.2/docker-entrypoint.sh
diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
index 03f3c23..cfed815 100755
--- a/generate-stackbrew-library.sh
+++ b/generate-stackbrew-library.sh
@@ -4,7 +4,8 @@ set -e
 declare -A aliases
 aliases=(
    [2.8]='2'
-   [3.0]='3 latest'
+   [3.0]=''
+   [3.2]='3 latest'
 )

 cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"

@@ -4,7 +4,8 @@ set -e
declare -A aliases
aliases=(
[2.8]='2'
[3.0]='3 latest'
[3.0]=''
Copy link
Contributor

Choose a reason for hiding this comment

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

I think we should just remove this line altogether (since we don't need any aliases for 3.0 anymore now that 3.2 is GA).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I was not sure about the exact format of that file, so I simply emptied the
aliases. I will remove that line if that's the canonical way.
Am 06.05.2016 17:25 schrieb "Tianon Gravi" notifications@github.com:

In generate-stackbrew-library.sh
#57 (comment):

@@ -4,7 +4,8 @@ set -e
declare -A aliases
aliases=(
[2.8]='2'

  • [3.0]='3 latest'
  • [3.0]=''

I think we should just remove this line altogether (since we don't need
any aliases for 3.0 anymore now that 3.2 is GA).


You are receiving this because you authored the thread.
Reply to this email directly or view it on GitHub
https://github.com/docker-library/redis/pull/57/files/719878e99c7aed841052fe1948aefb8314d57858#r62345190

@tianon
Copy link
Contributor

tianon commented May 6, 2016

This is great, thanks for taking this on! Let me know if you'd like me to take over for the changes I've proposed (I don't mind either way). 👍

@TimWolla
Copy link
Contributor Author

TimWolla commented May 6, 2016

I'll happily apply your suggested changes once I am back at my work station
(in a few hours) 👍
Am 06.05.2016 17:28 schrieb "Tianon Gravi" notifications@github.com:

This is great, thanks for taking this on! Let me know if you'd like me to
take over for the changes I've proposed (I don't mind either way). [image:
👍]


You are receiving this because you authored the thread.
Reply to this email directly or view it on GitHub
#57 (comment)

@TimWolla
Copy link
Contributor Author

TimWolla commented May 6, 2016

@tianon I updated the pull request.

@tianon
Copy link
Contributor

tianon commented May 6, 2016

LGTM

@yosifkit
Copy link
Contributor

yosifkit commented May 7, 2016

LGTM, we should probably merge on Monday so that we can make the PR to official-images and get it building for the Docker hub.

@tianon tianon merged commit 1d216ed into redis:master May 9, 2016
tianon added a commit to infosiftr/stackbrew that referenced this pull request May 9, 2016
- `mongo`: 3.0.12
- `owncloud`: 9.0.2, 8.2.4, 8.1.7, 8.0.12, 7.0.14
- `redis`: 3.2 (redis/docker-library-redis#57)
- `ruby`: bundler 1.12.3
- `wordpress`: 4.5.2
@TimWolla TimWolla deleted the redis-3.2 branch May 9, 2016 22:38
RichardScothern pushed a commit to RichardScothern/official-images that referenced this pull request Jun 14, 2016
- `mongo`: 3.0.12
- `owncloud`: 9.0.2, 8.2.4, 8.1.7, 8.0.12, 7.0.14
- `redis`: 3.2 (redis/docker-library-redis#57)
- `ruby`: bundler 1.12.3
- `wordpress`: 4.5.2
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants