-
Notifications
You must be signed in to change notification settings - Fork 2.3k
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
Rollback Zookeeper 3.5, 3.6, 3.7 and 3.8 to openjdk base image #12949
Conversation
Diff for 52dbcda:diff --git a/_bashbrew-cat b/_bashbrew-cat
index adbcabd..42ddbe1 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,20 +3,40 @@ GitRepo: https://github.com/31z4/zookeeper-docker.git
Tags: 3.5.9, 3.5
Architectures: amd64, arm64v8
+GitCommit: 060f64d28d1780373f90ac152bd2538abcf1924c
+Directory: 3.5.9
+
+Tags: 3.5.9-temurin, 3.5-temurin
+Architectures: amd64, arm64v8
GitCommit: 5cf119d9c5d61024fdba66f7be707413513a8b0d
Directory: 3.5.9
Tags: 3.6.3, 3.6
Architectures: amd64, arm64v8
+GitCommit: 060f64d28d1780373f90ac152bd2538abcf1924c
+Directory: 3.6.3
+
+Tags: 3.6.3-temurin, 3.6-temurin
+Architectures: amd64, arm64v8
GitCommit: 5cf119d9c5d61024fdba66f7be707413513a8b0d
Directory: 3.6.3
Tags: 3.7.1, 3.7
Architectures: amd64, arm64v8
+GitCommit: 060f64d28d1780373f90ac152bd2538abcf1924c
+Directory: 3.7.1
+
+Tags: 3.7.1-temurin, 3.7-temurin
+Architectures: amd64, arm64v8
GitCommit: 5cf119d9c5d61024fdba66f7be707413513a8b0d
Directory: 3.7.1
-Tags: 3.8.0, 3.8, latest
+Tags: 3.8.0, 3.8
+Architectures: amd64, arm64v8
+GitCommit: 060f64d28d1780373f90ac152bd2538abcf1924c
+Directory: 3.8.0
+
+Tags: 3.8.0-temurin, 3.8-temurin, latest
Architectures: amd64, arm64v8
GitCommit: 5cf119d9c5d61024fdba66f7be707413513a8b0d
Directory: 3.8.0
diff --git a/_bashbrew-list b/_bashbrew-list
index 4eae182..a0a3ba4 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,9 +1,17 @@
zookeeper:3.5
+zookeeper:3.5-temurin
zookeeper:3.5.9
+zookeeper:3.5.9-temurin
zookeeper:3.6
+zookeeper:3.6-temurin
zookeeper:3.6.3
+zookeeper:3.6.3-temurin
zookeeper:3.7
+zookeeper:3.7-temurin
zookeeper:3.7.1
+zookeeper:3.7.1-temurin
zookeeper:3.8
+zookeeper:3.8-temurin
zookeeper:3.8.0
+zookeeper:3.8.0-temurin
zookeeper:latest
diff --git a/zookeeper_3.5/Dockerfile b/zookeeper_3.5-temurin/Dockerfile
similarity index 100%
copy from zookeeper_3.5/Dockerfile
copy to zookeeper_3.5-temurin/Dockerfile
diff --git a/zookeeper_3.5/docker-entrypoint.sh b/zookeeper_3.5-temurin/docker-entrypoint.sh
similarity index 100%
copy from zookeeper_3.5/docker-entrypoint.sh
copy to zookeeper_3.5-temurin/docker-entrypoint.sh
diff --git a/zookeeper_3.5/Dockerfile b/zookeeper_3.5/Dockerfile
index 865e812..a7aa5c5 100644
--- a/zookeeper_3.5/Dockerfile
+++ b/zookeeper_3.5/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:11-jre
+FROM openjdk:11-jre-slim
ENV ZOO_CONF_DIR=/conf \
ZOO_DATA_DIR=/data \
diff --git a/zookeeper_3.6/Dockerfile b/zookeeper_3.6-temurin/Dockerfile
similarity index 100%
copy from zookeeper_3.6/Dockerfile
copy to zookeeper_3.6-temurin/Dockerfile
diff --git a/zookeeper_3.5/docker-entrypoint.sh b/zookeeper_3.6-temurin/docker-entrypoint.sh
similarity index 100%
copy from zookeeper_3.5/docker-entrypoint.sh
copy to zookeeper_3.6-temurin/docker-entrypoint.sh
diff --git a/zookeeper_3.6/Dockerfile b/zookeeper_3.6/Dockerfile
index b65ffd3..56494cb 100644
--- a/zookeeper_3.6/Dockerfile
+++ b/zookeeper_3.6/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:11-jre
+FROM openjdk:11-jre-slim
ENV ZOO_CONF_DIR=/conf \
ZOO_DATA_DIR=/data \
diff --git a/zookeeper_3.7/Dockerfile b/zookeeper_3.7-temurin/Dockerfile
similarity index 100%
copy from zookeeper_3.7/Dockerfile
copy to zookeeper_3.7-temurin/Dockerfile
diff --git a/zookeeper_3.7/docker-entrypoint.sh b/zookeeper_3.7-temurin/docker-entrypoint.sh
similarity index 100%
copy from zookeeper_3.7/docker-entrypoint.sh
copy to zookeeper_3.7-temurin/docker-entrypoint.sh
diff --git a/zookeeper_3.7/Dockerfile b/zookeeper_3.7/Dockerfile
index 8f5ad6a..b5d400a 100644
--- a/zookeeper_3.7/Dockerfile
+++ b/zookeeper_3.7/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:11-jre
+FROM openjdk:11-jre-slim
ENV ZOO_CONF_DIR=/conf \
ZOO_DATA_DIR=/data \
diff --git a/zookeeper_latest/Dockerfile b/zookeeper_3.8/Dockerfile
similarity index 99%
copy from zookeeper_latest/Dockerfile
copy to zookeeper_3.8/Dockerfile
index 23f9412..57a03b4 100644
--- a/zookeeper_latest/Dockerfile
+++ b/zookeeper_3.8/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:11-jre
+FROM openjdk:11-jre-slim
ENV ZOO_CONF_DIR=/conf \
ZOO_DATA_DIR=/data \
diff --git a/zookeeper_3.7/docker-entrypoint.sh b/zookeeper_3.8/docker-entrypoint.sh
similarity index 100%
copy from zookeeper_3.7/docker-entrypoint.sh
copy to zookeeper_3.8/docker-entrypoint.sh Relevant Maintainers:
|
Eventually you'll want to move the plain tags, right? Or will they be dropped when the respective We've moved base images on quite a few images and have found that giving them an escape option has been useful for users (even if that image will no longer be updated). |
Thanks for your feedback @yosifkit and sorry for the delayed response 😊 Yes, the plan is to move the plain tags during corresponding version upgrades. For example, currently
I think it makes sense to have both
I'm not sure about different versions of |
I think we could do a one-time build based on |
Base image update caused several bug reports (see 31z4/zookeeper-docker#139 and 31z4/zookeeper-docker#140). I realised that it wasn't a great idea to override existing tags. Here I rollback version specific tags and add separate tags for
temurin
based images. I will also update image docs a bit later.