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 #16784

Merged
merged 1 commit into from
May 17, 2024
Merged

Update redis #16784

merged 1 commit into from
May 17, 2024

Conversation

tianon
Copy link
Member

@tianon tianon commented May 17, 2024

Changes:

Changes:

- redis/docker-library-redis@eb923da: Merge pull request redis/docker-library-redis#398 from infosiftr/eol-6.0
- redis/docker-library-redis@b628649: Remove 6.0 since it is end of life
@tianon tianon requested a review from a team as a code owner May 17, 2024 22:06
Copy link

Diff for b23ce79:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index e1a6d39..b11b3ae 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,16 +1,6 @@
 Maintainers: Tianon Gravi <[email protected]> (@tianon), Joseph Ferguson <[email protected]> (@yosifkit)
 GitRepo: https://github.com/docker-library/redis.git
 
-Tags: 6.0.20, 6.0, 6.0.20-bookworm, 6.0-bookworm
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: f623bf8a6fef29b1459a29ff9f852c0f88d76b5a
-Directory: 6.0/debian
-
-Tags: 6.0.20-alpine, 6.0-alpine, 6.0.20-alpine3.19, 6.0-alpine3.19
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: ac5605ebe2e7b4b371edcf94ad06e873986a6b63
-Directory: 6.0/alpine
-
 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
 GitCommit: f623bf8a6fef29b1459a29ff9f852c0f88d76b5a
@@ -18,7 +8,7 @@ Directory: 6.2/debian
 
 Tags: 6.2.14-alpine, 6.2-alpine, 6-alpine, 6.2.14-alpine3.19, 6.2-alpine3.19, 6-alpine3.19
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 531cfa59d944bbbfb22b8228646d12c926dfc010
+GitCommit: b628649ceee29da4c28c889417f264c219ca2afb
 Directory: 6.2/alpine
 
 Tags: 7.0.15, 7.0, 7.0.15-bookworm, 7.0-bookworm
@@ -28,7 +18,7 @@ Directory: 7.0/debian
 
 Tags: 7.0.15-alpine, 7.0-alpine, 7.0.15-alpine3.19, 7.0-alpine3.19
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 313fd068a6751fd9f611e94addfa9ea56a23a3a7
+GitCommit: b628649ceee29da4c28c889417f264c219ca2afb
 Directory: 7.0/alpine
 
 Tags: 7.2.4, 7.2, 7, latest, 7.2.4-bookworm, 7.2-bookworm, 7-bookworm, bookworm
@@ -38,5 +28,5 @@ Directory: 7.2/debian
 
 Tags: 7.2.4-alpine, 7.2-alpine, 7-alpine, alpine, 7.2.4-alpine3.19, 7.2-alpine3.19, 7-alpine3.19, alpine3.19
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: b77450d34ae54354f41970fc44bf840353f59ef4
+GitCommit: b628649ceee29da4c28c889417f264c219ca2afb
 Directory: 7.2/alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index 31cf2d2..ea5eb46 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -2,14 +2,6 @@ redis:6
 redis:6-alpine
 redis:6-alpine3.19
 redis:6-bookworm
-redis:6.0
-redis:6.0-alpine
-redis:6.0-alpine3.19
-redis:6.0-bookworm
-redis:6.0.20
-redis:6.0.20-alpine
-redis:6.0.20-alpine3.19
-redis:6.0.20-bookworm
 redis:6.2
 redis:6.2-alpine
 redis:6.2-alpine3.19
diff --git a/redis_6-alpine3.19/Dockerfile b/redis_6-alpine3.19/Dockerfile
index 5714f25..c1f95f5 100644
--- a/redis_6-alpine3.19/Dockerfile
+++ b/redis_6-alpine3.19/Dockerfile
@@ -64,7 +64,7 @@ RUN set -eux; \
 		musl-dev \
 		openssl-dev \
 # install real "wget" to avoid:
-#   + wget -O redis.tar.gz https://download.redis.io/releases/redis-6.0.6.tar.gz
+#   + wget -O redis.tar.gz https://download.redis.io/releases/redis-x.y.z.tar.gz
 #   Connecting to download.redis.io (45.60.121.1:80)
 #   wget: bad header line:     XxhODalH: btu; path=/; Max-Age=900
 		wget \
diff --git a/redis_6.0-alpine3.19/Dockerfile b/redis_6.0-alpine3.19/Dockerfile
deleted file mode 100644
index a90943c..0000000
diff --git a/redis_6.0-alpine3.19/docker-entrypoint.sh b/redis_6.0-alpine3.19/docker-entrypoint.sh
deleted file mode 100755
index 30406a5..0000000
diff --git a/redis_6.0-bookworm/Dockerfile b/redis_6.0-bookworm/Dockerfile
deleted file mode 100644
index d9aaf3c..0000000
diff --git a/redis_6.0-bookworm/docker-entrypoint.sh b/redis_6.0-bookworm/docker-entrypoint.sh
deleted file mode 100755
index 30406a5..0000000
diff --git a/redis_7.0-alpine3.19/Dockerfile b/redis_7.0-alpine3.19/Dockerfile
index 5792c13..fba62ac 100644
--- a/redis_7.0-alpine3.19/Dockerfile
+++ b/redis_7.0-alpine3.19/Dockerfile
@@ -64,7 +64,7 @@ RUN set -eux; \
 		musl-dev \
 		openssl-dev \
 # install real "wget" to avoid:
-#   + wget -O redis.tar.gz https://download.redis.io/releases/redis-6.0.6.tar.gz
+#   + wget -O redis.tar.gz https://download.redis.io/releases/redis-x.y.z.tar.gz
 #   Connecting to download.redis.io (45.60.121.1:80)
 #   wget: bad header line:     XxhODalH: btu; path=/; Max-Age=900
 		wget \
diff --git a/redis_alpine3.19/Dockerfile b/redis_alpine3.19/Dockerfile
index 3f22c34..e9a164f 100644
--- a/redis_alpine3.19/Dockerfile
+++ b/redis_alpine3.19/Dockerfile
@@ -64,7 +64,7 @@ RUN set -eux; \
 		musl-dev \
 		openssl-dev \
 # install real "wget" to avoid:
-#   + wget -O redis.tar.gz https://download.redis.io/releases/redis-6.0.6.tar.gz
+#   + wget -O redis.tar.gz https://download.redis.io/releases/redis-x.y.z.tar.gz
 #   Connecting to download.redis.io (45.60.121.1:80)
 #   wget: bad header line:     XxhODalH: btu; path=/; Max-Age=900
 		wget \

Relevant Maintainers:

@yosifkit yosifkit merged commit 1943efb into docker-library:master May 17, 2024
11 checks passed
@yosifkit yosifkit deleted the redis branch May 17, 2024 22: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