Skip to content

Conversation

@31z4
Copy link
Contributor

@31z4 31z4 commented Aug 6, 2022

Because OpenJDK is fully deprecated as per docker-library/docs#2162.

@github-actions
Copy link

github-actions bot commented Aug 6, 2022

Diff for 4729bed:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index f70ea56..96cc7c2 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -2,9 +2,9 @@ Maintainers: Elisey Zanko <[email protected]> (@31z4)
 GitRepo: https://github.com/31z4/storm-docker.git
 
 Tags: 1.2.4, 1.2
-GitCommit: a80831113011cf40a53e91e98790e99ad5a76280
+GitCommit: 14c749848c8ff7c955f2b29c57e327ae80fbbb7e
 Directory: 1.2.4
 
 Tags: 2.4.0, 2.4, latest
-GitCommit: f72658afa5e9c4ee4d4d5ef5cf9b32b226d0ed19
+GitCommit: 14c749848c8ff7c955f2b29c57e327ae80fbbb7e
 Directory: 2.4.0
diff --git a/storm_1.2/Dockerfile b/storm_1.2/Dockerfile
index ee2293b..d19c21a 100644
--- a/storm_1.2/Dockerfile
+++ b/storm_1.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:8-jre-slim
+FROM eclipse-temurin:8-jre
 
 ENV STORM_CONF_DIR=/conf \
     STORM_DATA_DIR=/data \
@@ -21,12 +21,14 @@ RUN set -eux; \
         dirmngr \
         gosu \
         gnupg \
-        python \
+        python2 \
         procps \
         wget; \
     rm -rf /var/lib/apt/lists/*; \
 # Verify that gosu binary works
-    gosu nobody true
+    gosu nobody true; \
+# Set default version to Python 2
+    update-alternatives --install /usr/bin/python python /usr/bin/python2 0
 
 ARG GPG_KEY=5167DE337E7370373499FC1DA4A672F11B5050C8
 ARG DISTRO_NAME=apache-storm-1.2.4
diff --git a/storm_latest/Dockerfile b/storm_latest/Dockerfile
index f798525..b8a8506 100644
--- a/storm_latest/Dockerfile
+++ b/storm_latest/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:11-jre-slim
+FROM eclipse-temurin:11-jre
 
 ENV STORM_CONF_DIR=/conf \
     STORM_DATA_DIR=/data \
@@ -21,12 +21,14 @@ RUN set -eux; \
         dirmngr \
         gosu \
         gnupg \
-        python \
+        python2 \
         procps \
         wget; \
     rm -rf /var/lib/apt/lists/*; \
 # Verify that gosu binary works
-    gosu nobody true
+    gosu nobody true; \
+# Set default version to Python 2
+    update-alternatives --install /usr/bin/python python /usr/bin/python2 0
 
 ARG GPG_KEY=51379DA8A7AE5B02674EF15C134716AF768D9B6E
 ARG DISTRO_NAME=apache-storm-2.4.0

Relevant Maintainers:

@yosifkit yosifkit merged commit 4693fd9 into docker-library:master Aug 8, 2022
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.

2 participants