Rollback Zookeeper 3.5, 3.6, 3.7 and 3.8 to openjdk base image

[31z4]

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.

[github-actions]

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:

• zookeeper: @31z4

[yosifkit]

Eventually you'll want to move the plain tags, right? Or will they be dropped when the respective openjdk tags are dropped? Perhaps adding a something similar to the -temurin for the openjdk images so that users have an escape once the plain tags move. Or maybe they also need some images to be FROM eclipse-temurin:11-jre-focal (instead of the jammy default)?

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).

[31z4]

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 3.5.9 and 3.5 are based on openjdk. Once 3.5.10 is released 3.5.10 and 3.5 becomes temurin (see #13894).

Perhaps adding a something similar to the -temurin for the openjdk images so that users have an escape once the plain tags move.

I think it makes sense to have both -temurin and -openjdk tags to help user migrate. But it looks like new builds based on openjdk are not allowed (see https://github.com/docker-library/official-images/actions/runs/3928318640/jobs/6715803837). Is there any workaround for that?

Or maybe they also need some images to be FROM eclipse-temurin:11-jre-focal (instead of the jammy default)?

I'm not sure about different versions of temurin based images. I may add it in the future if there is such demand.

[tianon]

I think we could do a one-time build based on openjdk to backfill those tags, but we'd expect them to be removed from the supported list after the backfill is successfully built/pushed. 🙈