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 Redis 7.4 RC2 #17074

Merged
merged 2 commits into from
Jun 28, 2024
Merged

Added Redis 7.4 RC2 #17074

merged 2 commits into from
Jun 28, 2024

Conversation

dmaier-redislabs
Copy link
Contributor

No description provided.

@dmaier-redislabs dmaier-redislabs requested a review from a team as a code owner June 27, 2024 22:11
library/redis Outdated
@@ -2,14 +2,25 @@

Maintainers: Tianon Gravi <[email protected]> (@tianon),
Joseph Ferguson <[email protected]> (@yosifkit)
GitRepo: https://github.com/docker-library/redis.git
David Maier <[email protected]> (@dmaier-redislabs)
Copy link
Member

Choose a reason for hiding this comment

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

These are comma-separated, but realistically I think @yosifkit and I should probably be removed now -- we can't really be considered "maintainers" of a repository we don't have commit bits on, so even for the older content we're not really the maintainers anymore. 😅

Copy link
Member

Choose a reason for hiding this comment

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

If you adjust the content on line 59-63 of generate-stackbrew-library.sh, then the output of that script should be contents of this library/redis file.

In other words:

$ # from redis checkout
$ ./generate-stackbrew-library.sh > ../path-to-official-images-checkout/library/redis

library/redis Outdated
Comment on lines 18 to 23
Tags: 7.4-rc1, 7.4-rc1-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
GitCommit: 0d682fed252b85f39d2033294eab217be02f95a1
Directory: 7.4-rc/debian

Tags: 7.4-rc1-alpine, 7.4-rc-alpine, 7.4-rc1-alpine3.20, 7.4-rc-alpine3.20
Tags: 7.4-rc1-alpine, 7.4-rc1-alpine3.20
Copy link
Member

Choose a reason for hiding this comment

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

These rc1 versions should be removed with rc2; removing tags here will remove them from the "Supported" section on the Hub readme (and will prevent us from spending cycles rebuilding them on the official build servers), but the tags will still be available to users who want them. (See https://github.com/docker-library/official-images#library-definition-files for more detail on this.)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

OK, this should be fixed now. Part of the issue on my side yesterday night was that the generate-stackbrew-library script didn't execute without errors in my development environment. So I just went ahead and generated the entries manually. I fixed the issue now and the new output should be what you expect from the script.

Copy link

Diff for a8c18f1:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 503679c..19ac57d 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,5 +1,5 @@
-Maintainers: Tianon Gravi <[email protected]> (@tianon), Joseph Ferguson <[email protected]> (@yosifkit)
-GitRepo: https://github.com/docker-library/redis.git
+Maintainers: David Maier <[email protected]> (@dmaier-redislabs), Yossi Gottlieb <[email protected]> (@yossigo)
+GitRepo: https://github.com/redis/docker-library-redis.git
 
 Tags: 6.2.14, 6.2, 6, 6.2.14-bookworm, 6.2-bookworm, 6-bookworm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
@@ -31,12 +31,12 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 GitCommit: 5f08363e6d64b97a0c2e651f4bdcec6e71a32ab4
 Directory: 7.2/alpine
 
-Tags: 7.4-rc1, 7.4-rc, 7.4-rc1-bookworm, 7.4-rc-bookworm
+Tags: 7.4-rc2, 7.4-rc, 7.4-rc2-bookworm, 7.4-rc-bookworm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 0d682fed252b85f39d2033294eab217be02f95a1
+GitCommit: c828d8c6d982f0d45e1e8f564aae50b42f6d1ec0
 Directory: 7.4-rc/debian
 
-Tags: 7.4-rc1-alpine, 7.4-rc-alpine, 7.4-rc1-alpine3.20, 7.4-rc-alpine3.20
+Tags: 7.4-rc2-alpine, 7.4-rc-alpine, 7.4-rc2-alpine3.20, 7.4-rc-alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 0d682fed252b85f39d2033294eab217be02f95a1
+GitCommit: c828d8c6d982f0d45e1e8f564aae50b42f6d1ec0
 Directory: 7.4-rc/alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index e68d0a8..1dc1d92 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -31,10 +31,10 @@ redis:7.2.5-alpine
 redis:7.2.5-alpine3.20
 redis:7.2.5-bookworm
 redis:7.4-rc
-redis:7.4-rc1
-redis:7.4-rc1-alpine
-redis:7.4-rc1-alpine3.20
-redis:7.4-rc1-bookworm
+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
diff --git a/redis_7.4-rc-alpine3.20/Dockerfile b/redis_7.4-rc-alpine3.20/Dockerfile
index a646134..402c7bb 100644
--- a/redis_7.4-rc-alpine3.20/Dockerfile
+++ b/redis_7.4-rc-alpine3.20/Dockerfile
@@ -49,9 +49,9 @@ RUN set -eux; \
 	gosu --version; \
 	gosu nobody true
 
-ENV REDIS_VERSION 7.4-rc1
-ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-7.4-rc1.tar.gz
-ENV REDIS_DOWNLOAD_SHA 68d788fc2b50ba523d006be4b2f247daf8027a334925f730d3135094db49f454
+ENV REDIS_VERSION 7.4-rc2
+ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-7.4-rc2.tar.gz
+ENV REDIS_DOWNLOAD_SHA 6f3ca6e196b5757bf51752ea9944cbc927731c771aeab661be8c2c05bd1edbce
 
 RUN set -eux; \
 	\
diff --git a/redis_7.4-rc-bookworm/Dockerfile b/redis_7.4-rc-bookworm/Dockerfile
index 0e23fb5..3f202ef 100644
--- a/redis_7.4-rc-bookworm/Dockerfile
+++ b/redis_7.4-rc-bookworm/Dockerfile
@@ -56,9 +56,9 @@ RUN set -eux; \
 	gosu --version; \
 	gosu nobody true
 
-ENV REDIS_VERSION 7.4-rc1
-ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-7.4-rc1.tar.gz
-ENV REDIS_DOWNLOAD_SHA 68d788fc2b50ba523d006be4b2f247daf8027a334925f730d3135094db49f454
+ENV REDIS_VERSION 7.4-rc2
+ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-7.4-rc2.tar.gz
+ENV REDIS_DOWNLOAD_SHA 6f3ca6e196b5757bf51752ea9944cbc927731c771aeab661be8c2c05bd1edbce
 
 RUN set -eux; \
 	\

Relevant Maintainers:

Copy link
Member

@tianon tianon left a comment

Choose a reason for hiding this comment

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

Nicely done ❤️

@tianon tianon merged commit 40e62cd into docker-library:master Jun 28, 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.

3 participants