Release 2.1.0 changes

readme.md

@@ -18,7 +18,7 @@ Slack](https://img.shields.io/static/v1?logo=slack&logoColor=959DA5&label=Slack&
 
 -----
 
-**Latest Stable Release**: 2.0.9
+**Latest Stable Release**: 2.1.0
 
 -----
 

release-notes/2.1.0.md

@@ -0,0 +1,21 @@
+# Minitrino Release Notes: 2.1.0
+
+## Release Overview
+
+- [Minitrino Release Notes: 2.1.0](#minitrino-release-notes-210)
+  - [Release Overview](#release-overview)
+  - [CLI Changes and Additions](#cli-changes-and-additions)
+  - [Library Changes and Additions](#library-changes-and-additions)
+  - [Other](#other)
+
+## CLI Changes and Additions
+
+- N/A
+
+## Library Changes and Additions
+
+- Map proper Java install for specific versions of SEP
+
+## Other
+
+- N/A

src/cli/setup.py

@@ -10,7 +10,7 @@
 
 setup(
     name="minitrino",
-    version="2.0.9",
+    version="2.1.0",
     description="A command line tool that makes it easy to run modular Trino environments locally.",
     long_description=README,
     long_description_content_type="text/markdown",

src/lib/image/Dockerfile

@@ -16,7 +16,6 @@ RUN \
         iputils-ping \
         ldap-utils \
         apache2-utils \
-        openjdk-17-jdk \
         python3 \
         python-is-python3 \
         python3-pip
@@ -37,11 +36,13 @@ ENV STARBURST_VER=${STARBURST_VER}
 COPY --from=mid /usr/lib/starburst/bin/run-starburst /tmp/
 
 ADD ./src/scripts/install.sh /tmp/
+ADD ./src/scripts/install-java.sh /tmp/
 ADD ./src/scripts/run-minitrino.sh /tmp/
 ADD ./src/etc/starburst /etc/starburst
 
 RUN \
-    chmod +x /tmp/install.sh && \
+    chmod +x /tmp/install.sh /tmp/install-java.sh  && \
+    bash /tmp/install-java.sh ${USER} ${GROUP} ${UID} ${GID} && \
     bash /tmp/install.sh ${USER} ${GROUP} ${UID} ${GID}
 
 EXPOSE 8080

src/lib/image/src/scripts/install-java.sh

@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+# Trino versions and their corresponding Java versions:
+# >= 413 <= 435: Java 17
+# >= 436 <= 446: Java 21
+# >= 447: Java 22
+
+set -euxo pipefail
+
+TRINO_DIST="${STARBURST_VER:0:3}"
+
+if [ "$TRINO_DIST" -ge 413 ] && [ "$TRINO_DIST" -le 435 ]; then
+    JAVA_VER=17
+elif [ "$TRINO_DIST" -ge 436 ] && [ "$TRINO_DIST" -le 446 ]; then
+    JAVA_VER=21
+elif [ "$TRINO_DIST" -ge 447 ]; then
+    JAVA_VER=22
+else
+    echo "Invalid Trino version. Exiting..."
+    exit 1
+fi
+
+echo "Installing Java version $JAVA_VER"
+apt-get install -y openjdk-${JAVA_VER}-jdk

src/lib/version

@@ -1 +1 @@
-2.0.9
+2.1.0

src/test/setup.py

@@ -7,5 +7,5 @@
     name="minitrino-tests",
     version="0.0",
     packages=["src", "src/cli", "src/lib"],
-    install_requires=["minitrino", "jsonschema"],
+    install_requires=["minitrino", "jsonschema", "requests==2.31.0"],
 )

src/test/src/common.py

@@ -65,7 +65,7 @@ def start_docker_daemon():
         raise RuntimeError("Failed to start Docker daemon.")
 
     counter = 0
-    while counter < 61:
+    while counter <= 61:
         if counter == 61:
             raise TimeoutError("Docker daemon failed to start after one minute.")
         try: