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

Added the Redis 7.4 GA release #17272

Merged
merged 2 commits into from
Jul 29, 2024
Merged
Rate limit · GitHub

Access has been restricted

You have triggered a rate limit.

Please wait a few minutes before you try again;
in some cases this may take up to an hour.

Conversation

dmaier-redislabs
Copy link
Contributor

Removed 7.4 RC2 and added 7.4 GA

@dmaier-redislabs dmaier-redislabs requested a review from a team as a code owner July 29, 2024 08:10

This comment has been minimized.

@dmaier-redislabs
Copy link
Contributor Author

Hi @tianon,

we just released the GA version of 7.4. Could someone on your side please merge this PR in?

Thanks in advance,
David

library/redis Outdated

Maintainers: David Maier <david.maier@redis.com> (@dmaier-redislabs),
Yossi Gottlieb <yossi@redis.com> (@yossigo)
GitRepo: https://github.com/redis/docker-library-redis.git

Tags: 7.4-rc2, 7.4-rc, 7.4-rc2-bookworm, 7.4-rc-bookworm
Tags: 7.4.0, 7.4, 7.4.0-bookworm, 7.4-bookworm
Copy link
Member

Choose a reason for hiding this comment

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

You probably also want to update the generic 7 and latest aliases to point here:

https://github.com/redis/docker-library-redis/blob/e92049967d6baa9b4b3d6fd950553e6458e61f13/generate-stackbrew-library-mac.sh#L11

(that'll move alpine, etc too)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You are right. Let me fix that.

Copy link
Contributor Author

@dmaier-redislabs dmaier-redislabs Jul 29, 2024

Choose a reason for hiding this comment

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

@tianon OK, this should be fixed now.

Copy link

Diff for 38e76be:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 19ac57d..ca00a36 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -21,22 +21,22 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 GitCommit: 5f08363e6d64b97a0c2e651f4bdcec6e71a32ab4
 Directory: 7.0/alpine
 
-Tags: 7.2.5, 7.2, 7, latest, 7.2.5-bookworm, 7.2-bookworm, 7-bookworm, bookworm
+Tags: 7.2.5, 7.2, 7.2.5-bookworm, 7.2-bookworm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: 5f08363e6d64b97a0c2e651f4bdcec6e71a32ab4
 Directory: 7.2/debian
 
-Tags: 7.2.5-alpine, 7.2-alpine, 7-alpine, alpine, 7.2.5-alpine3.20, 7.2-alpine3.20, 7-alpine3.20, alpine3.20
+Tags: 7.2.5-alpine, 7.2-alpine, 7.2.5-alpine3.20, 7.2-alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 GitCommit: 5f08363e6d64b97a0c2e651f4bdcec6e71a32ab4
 Directory: 7.2/alpine
 
-Tags: 7.4-rc2, 7.4-rc, 7.4-rc2-bookworm, 7.4-rc-bookworm
+Tags: 7.4.0, 7.4, 7, latest, 7.4.0-bookworm, 7.4-bookworm, 7-bookworm, bookworm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: c828d8c6d982f0d45e1e8f564aae50b42f6d1ec0
-Directory: 7.4-rc/debian
+GitCommit: 0ae559ebb19b1cafc36720e8de97839d5d402883
+Directory: 7.4/debian
 
-Tags: 7.4-rc2-alpine, 7.4-rc-alpine, 7.4-rc2-alpine3.20, 7.4-rc-alpine3.20
+Tags: 7.4.0-alpine, 7.4-alpine, 7-alpine, alpine, 7.4.0-alpine3.20, 7.4-alpine3.20, 7-alpine3.20, alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: c828d8c6d982f0d45e1e8f564aae50b42f6d1ec0
-Directory: 7.4-rc/alpine
+GitCommit: 0ae559ebb19b1cafc36720e8de97839d5d402883
+Directory: 7.4/alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index 1dc1d92..3c986fc 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -30,14 +30,14 @@ redis:7.2.5
 redis:7.2.5-alpine
 redis:7.2.5-alpine3.20
 redis:7.2.5-bookworm
-redis:7.4-rc
-redis:7.4-rc2
-redis:7.4-rc2-alpine
-redis:7.4-rc2-alpine3.20
-redis:7.4-rc2-bookworm
-redis:7.4-rc-alpine
-redis:7.4-rc-alpine3.20
-redis:7.4-rc-bookworm
+redis:7.4
+redis:7.4-alpine
+redis:7.4-alpine3.20
+redis:7.4-bookworm
+redis:7.4.0
+redis:7.4.0-alpine
+redis:7.4.0-alpine3.20
+redis:7.4.0-bookworm
 redis:alpine
 redis:alpine3.20
 redis:bookworm
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 7383270..c06d5a8 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -2,7 +2,7 @@ redis:6-alpine3.20
 redis:6-bookworm
 redis:7.0-alpine3.20
 redis:7.0-bookworm
-redis:7.4-rc-alpine3.20
-redis:7.4-rc-bookworm
+redis:7.2-alpine3.20
+redis:7.2-bookworm
 redis:alpine3.20
 redis:bookworm
diff --git a/redis_alpine3.20/Dockerfile b/redis_7.2-alpine3.20/Dockerfile
similarity index 100%
copy from redis_alpine3.20/Dockerfile
copy to redis_7.2-alpine3.20/Dockerfile
diff --git a/redis_7.4-rc-alpine3.20/docker-entrypoint.sh b/redis_7.2-alpine3.20/docker-entrypoint.sh
similarity index 100%
rename from redis_7.4-rc-alpine3.20/docker-entrypoint.sh
rename to redis_7.2-alpine3.20/docker-entrypoint.sh
diff --git a/redis_bookworm/Dockerfile b/redis_7.2-bookworm/Dockerfile
similarity index 100%
copy from redis_bookworm/Dockerfile
copy to redis_7.2-bookworm/Dockerfile
diff --git a/redis_7.4-rc-bookworm/docker-entrypoint.sh b/redis_7.2-bookworm/docker-entrypoint.sh
similarity index 100%
rename from redis_7.4-rc-bookworm/docker-entrypoint.sh
rename to redis_7.2-bookworm/docker-entrypoint.sh
diff --git a/redis_7.4-rc-alpine3.20/Dockerfile b/redis_7.4-rc-alpine3.20/Dockerfile
deleted file mode 100644
index 402c7bb..0000000
diff --git a/redis_7.4-rc-bookworm/Dockerfile b/redis_7.4-rc-bookworm/Dockerfile
deleted file mode 100644
index 3f202ef..0000000
diff --git a/redis_alpine3.20/Dockerfile b/redis_alpine3.20/Dockerfile
index 19304a8..93cbf23 100644
--- a/redis_alpine3.20/Dockerfile
+++ b/redis_alpine3.20/Dockerfile
@@ -49,9 +49,9 @@ RUN set -eux; \
 	gosu --version; \
 	gosu nobody true
 
-ENV REDIS_VERSION 7.2.5
-ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-7.2.5.tar.gz
-ENV REDIS_DOWNLOAD_SHA 5981179706f8391f03be91d951acafaeda91af7fac56beffb2701963103e423d
+ENV REDIS_VERSION 7.4.0
+ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-7.4.0.tar.gz
+ENV REDIS_DOWNLOAD_SHA 57b47c2c6682636d697dbf5d66d8d495b4e653afc9cd32b7adf9da3e433b8aaf
 
 RUN set -eux; \
 	\
diff --git a/redis_bookworm/Dockerfile b/redis_bookworm/Dockerfile
index 3e2fbd1..eef6633 100644
--- a/redis_bookworm/Dockerfile
+++ b/redis_bookworm/Dockerfile
@@ -56,9 +56,9 @@ RUN set -eux; \
 	gosu --version; \
 	gosu nobody true
 
-ENV REDIS_VERSION 7.2.5
-ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-7.2.5.tar.gz
-ENV REDIS_DOWNLOAD_SHA 5981179706f8391f03be91d951acafaeda91af7fac56beffb2701963103e423d
+ENV REDIS_VERSION 7.4.0
+ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-7.4.0.tar.gz
+ENV REDIS_DOWNLOAD_SHA 57b47c2c6682636d697dbf5d66d8d495b4e653afc9cd32b7adf9da3e433b8aaf
 
 RUN set -eux; \
 	\

Relevant Maintainers:

@yosifkit yosifkit merged commit ebfd458 into docker-library:master Jul 29, 2024
13 checks passed
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.

Rate limit · GitHub

Access has been restricted

You have triggered a rate limit.

Please wait a few minutes before you try again;
in some cases this may take up to an hour.

3 participants