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

Apache Storm 2.8.0 #18320

Merged
merged 2 commits into from
Jan 28, 2025
Merged

Apache Storm 2.8.0 #18320

merged 2 commits into from
Jan 28, 2025

Conversation

rzo1
Copy link
Contributor

@rzo1 rzo1 commented Jan 26, 2025

Updates to Apache Storm 2.8.0 with two notable changes

  • (1) We removed the version based directory in the image to allow for a better UX for end users
  • (2) Storm 2.8.0 only supports Java 17+ now, so the base image will also be Java 17 based now.

@rzo1 rzo1 requested a review from a team as a code owner January 26, 2025 09:06

This comment has been minimized.

@yosifkit
Copy link
Member

Changes seem fine, but it seems to be missing the version bump on line 36

@rzo1
Copy link
Contributor Author

rzo1 commented Jan 28, 2025

Really good catch! Will fix that

@rzo1
Copy link
Contributor Author

rzo1 commented Jan 28, 2025

@yosifkit fixed :)

Copy link

Diff for 7a40141:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index bd25f9b..9a6a27e 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -2,10 +2,6 @@ Maintainers: The Apache Storm Project <dev@storm.apache.org> (@asfbot), Julien N
 Architectures: amd64, arm64v8
 GitRepo: https://github.com/apache/storm-docker.git
 
-Tags: 2.7.1, 2.7, latest
-GitCommit: 59ee14a11bd6d890c8ff3ed7a327b8464ab79f3a
-Directory: 2.7.1
-
-Tags: 2.7.1-jre17, 2.7-jre17
-GitCommit: 59ee14a11bd6d890c8ff3ed7a327b8464ab79f3a
-Directory: 2.7.1-jre17
+Tags: 2.8.0, 2.8, latest, 2.8.0-jre17, 2.8-jre17
+GitCommit: fefacef2f400d8f437675b11e08bc6098a91c188
+Directory: 2.8.0
diff --git a/_bashbrew-list b/_bashbrew-list
index 70b47b3..31fa2c7 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,5 +1,5 @@
-storm:2.7
-storm:2.7-jre17
-storm:2.7.1
-storm:2.7.1-jre17
+storm:2.8
+storm:2.8-jre17
+storm:2.8.0
+storm:2.8.0-jre17
 storm:latest
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 23af01b..49fd5bf 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,2 +1 @@
-storm:2.7-jre17
-storm:latest
+storm:2.8-jre17
diff --git a/storm_2.7-jre17/Dockerfile b/storm_2.8-jre17/Dockerfile
similarity index 95%
rename from storm_2.7-jre17/Dockerfile
rename to storm_2.8-jre17/Dockerfile
index 81f5ce5..cbc103b 100644
--- a/storm_2.7-jre17/Dockerfile
+++ b/storm_2.8-jre17/Dockerfile
@@ -33,7 +33,7 @@ RUN set -eux; \
 # Verify that gosu binary works
     gosu nobody true
 
-ARG DISTRO_NAME=apache-storm-2.7.1
+ARG DISTRO_NAME=apache-storm-2.8.0
 
 
 # Download Apache Storm, verify its PGP signature, untar and clean up
@@ -91,11 +91,12 @@ RUN set -eux; \
     gpg --batch --verify "$DISTRO_NAME.tar.gz.asc" "$DISTRO_NAME.tar.gz"; \
     tar -xzf "$DISTRO_NAME.tar.gz"; \
     rm -rf "$GNUPGHOME" "$DISTRO_NAME.tar.gz" "$DISTRO_NAME.tar.gz.asc"; \
-    chown -R storm:storm "$DISTRO_NAME"
+    mv "$DISTRO_NAME" apache-storm; \
+    chown -R storm:storm apache-storm
 
-WORKDIR $DISTRO_NAME
+WORKDIR apache-storm
 
-ENV PATH $PATH:/$DISTRO_NAME/bin
+ENV PATH $PATH:/apache-storm/bin
 
 COPY docker-entrypoint.sh /
 ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/storm_2.7-jre17/docker-entrypoint.sh b/storm_2.8-jre17/docker-entrypoint.sh
similarity index 100%
rename from storm_2.7-jre17/docker-entrypoint.sh
rename to storm_2.8-jre17/docker-entrypoint.sh
diff --git a/storm_latest/Dockerfile b/storm_latest/Dockerfile
deleted file mode 100644
index d0ea3e4..0000000
diff --git a/storm_latest/docker-entrypoint.sh b/storm_latest/docker-entrypoint.sh
deleted file mode 100755
index 66dff6f..0000000

Relevant Maintainers:

@yosifkit yosifkit merged commit a30074c into docker-library:master Jan 28, 2025
6 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.

2 participants