Merge pull request #30 from factorhouse/nvenegas/java25-updates

Update paths & base images for Java 25

Author: nvenegas

.github/workflows/rc_release.yml

@@ -37,28 +37,18 @@ jobs:
       - name: Download and verify JAR(s)
         run: |
           ./scripts/jar.sh "${{github.event.inputs.manifest}}"
-      - name: Release Flex JDK11 JAR
+      - name: Release Flex JDK25 JAR
         run: |
           VERSION=${{github.event.inputs.version}}
           VERSION="${VERSION//./-}"
-          aws s3 cp target/flex-java11-standalone.jar s3://${{ secrets.RELEASES_BUCKET }}/flex-$VERSION-java11.jar
-      - name: Release Flex JDK8 JAR
-        run: |
-          VERSION=${{github.event.inputs.version}}
-          VERSION="${VERSION//./-}"
-          aws s3 cp target/flex-java8-standalone.jar s3://${{ secrets.RELEASES_BUCKET }}/flex-$VERSION-java8.jar
-      - name: Release Flex JDK17 JAR
-        run: |
-          VERSION=${{github.event.inputs.version}}
-          VERSION="${VERSION//./-}"
-          aws s3 cp target/flex-java17-standalone.jar s3://${{ secrets.RELEASES_BUCKET }}/flex-$VERSION-java17.jar
-      -
-        # Add support for more platforms with QEMU (optional)
-        # https://github.com/docker/setup-qemu-action
-        name: Set up QEMU
+          aws s3 cp target/flex-java25-standalone.jar s3://${{ secrets.RELEASES_BUCKET }}/flex-$VERSION-java25.jar
+
+      # Add support for more platforms with QEMU (optional)
+      # https://github.com/docker/setup-qemu-action
+      - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
-      -
-        name: Set up Docker Buildx
+
+      - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Build Flex
         run: |

.github/workflows/release.yml

@@ -48,23 +48,11 @@ jobs:
           role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
           aws-region: us-east-1
 
-      - name: Release Flex JDK11 JAR
+      - name: Release Flex JDK25 JAR
         run: |
           VERSION=${{github.event.inputs.version}}
           VERSION="${VERSION//./-}"
-          aws s3 cp target/flex-java11-standalone.jar s3://${{ secrets.RELEASES_BUCKET }}/flex-$VERSION-java11.jar
-
-      - name: Release Flex JDK8 JAR
-        run: |
-          VERSION=${{github.event.inputs.version}}
-          VERSION="${VERSION//./-}"
-          aws s3 cp target/flex-java8-standalone.jar s3://${{ secrets.RELEASES_BUCKET }}/flex-$VERSION-java8.jar
-
-      - name: Release Flex JDK17 JAR
-        run: |
-          VERSION=${{github.event.inputs.version}}
-          VERSION="${VERSION//./-}"
-          aws s3 cp target/flex-java17-standalone.jar s3://${{ secrets.RELEASES_BUCKET }}/flex-$VERSION-java17.jar
+          aws s3 cp target/flex-java25-standalone.jar s3://${{ secrets.RELEASES_BUCKET }}/flex-$VERSION-java25.jar
 
       - name: Release Dependency Check Report
         run: |
@@ -78,10 +66,9 @@ jobs:
       - name: Log into GitHub packages
         run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
 
-      -
-        # Add support for more platforms with QEMU (optional)
-        # https://github.com/docker/setup-qemu-action
-        name: Set up QEMU
+      # Add support for more platforms with QEMU (optional)
+      # https://github.com/docker/setup-qemu-action
+      - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
       -
         name: Set up Docker Buildx

dockerfile/flex-ce/Dockerfile

@@ -1,4 +1,4 @@
-FROM amazoncorretto:17.0.18
+FROM amazoncorretto:25.0.3
 
 ARG VERSION
 ARG RELEASE
@@ -12,7 +12,7 @@ LABEL name="Flex for Apache Flink" \
       description="Flex features a rich data-oriented UI, specialized dashboards that deliver instant visibility into Flink Clusters, and developer tools that allow engineers to get to the heart of their systems quickly."
 
 COPY resources/eula.txt /licenses/eula.txt
-COPY target/flex-ce-standalone.jar /opt/factorhouse/lib/flex.jar
+COPY target/flex-ce-java25-standalone.jar /opt/factorhouse/lib/flex.jar
 COPY resources/entrypoint.sh /usr/local/bin/flex.sh
 
 RUN mkdir -p /opt/factorhouse/config/flex

dockerfile/flex/Dockerfile

@@ -1,4 +1,4 @@
-FROM amazoncorretto:17.0.18
+FROM amazoncorretto:25.0.3
 
 ARG VERSION
 ARG RELEASE
@@ -12,7 +12,7 @@ LABEL name="Flex for Apache Flink" \
       description="Flex features a rich data-oriented UI, specialized dashboards that deliver instant visibility into Flink Clusters, and developer tools that allow engineers to get to the heart of their systems quickly."
 
 COPY resources/eula.txt /licenses/eula.txt
-COPY target/flex-java17-standalone.jar /opt/factorhouse/lib/flex.jar
+COPY target/flex-java25-standalone.jar /opt/factorhouse/lib/flex.jar
 COPY resources/entrypoint.sh /usr/local/bin/flex.sh
 
 RUN yum install shadow-utils -y