Update docker files (#1620)

Author: tortmayr

CHANGELOG.md

@@ -2,10 +2,6 @@
 
 ## v2.6.0 - active
 
-### Changes
-
-### Potentially Breaking Changes
-
 ## [v2.5.0 - 07/09/2024](https://github.com/eclipse-glsp/glsp/releases/tag/v2.5.0)
 
 ### Changes

docker/README.md

@@ -16,7 +16,7 @@ Currently each image variant has at least the following components installed:
 
 -   Git >=2.17.1
 -   Node 20, yarn 1.22.4 and lerna
--   OpenJDK 17 and Maven >=3.6.0
+-   OpenJDK 21 and Maven >=3.6.0
 -   Python and GCC libraries to enable [Theia](https://theia-ide.org/) builds
 
 ## License

docker/ci/README.md

@@ -16,7 +16,7 @@
 -   [`latest`, `ubuntu`, `ubuntu-v6.0`](https://github.com/eclipse-glsp/glsp/blob/master/docker/ci/ubuntu/Dockerfile)
 -   [`uitest`,`uitest-v6.0`](https://github.com/eclipse-glsp/glsp/blob/master/docker/ci/uitest/Dockerfile)
 
--   [`alpine`, `alpine-v6.0`](https://github.com/eclipse-glsp/glsp/blob/master/docker/ci/alpine/Dockerfile)
+-   [`alpine`, `alpine-v7.1`, `alpine-v7.0`](https://github.com/eclipse-glsp/glsp/blob/master/docker/ci/alpine/Dockerfile)
 
 Note that these tags are fluent and not bound to a fixed image version.
 If you want to use a fixed version you can use the base tag with a version suffix e.g. `ubuntu-v1.0`.
@@ -35,7 +35,7 @@ Currently each image variant has at least the following components installed:
 
 -   Git >=2.17.1
 -   Node 20, yarn 1.22.19 and lerna
--   OpenJDK 17 and Maven >=3.6.0
+-   OpenJDK 21 and Maven >=3.6.0
 -   Python and GCC libraries to enable [Theia](https://theia-ide.org/) builds
 
 ## How to use this image
@@ -83,6 +83,8 @@ In addition, Google Chrome is installed which enables browser-based UI testing o
 -   [v4.0](https://hub.docker.com/r/eclipseglsp/ci/tags?page=1&name=v4.0): Update to node 16
 -   [v5.0](https://hub.docker.com/r/eclipseglsp/ci/tags?page=1&name=v5.0): Update to node 18, Java 17 and Alpine 3.17/Ubuntu 22.04
 -   [v6.0](https://hub.docker.com/r/eclipseglsp/ci/tags?page=1&name=v6.0): Update to node 20
+-   [v7.0](https://hub.docker.com/r/eclipseglsp/ci/tags?page=1&name=v7.0): Update to Java 21 (alpine only)
+-   [v7.1](https://hub.docker.com/r/eclipseglsp/ci/tags?page=1&name=v7.1): Additionally install Java 11 (alpine only)
 
 ## License
 

docker/ci/alpine/Dockerfile

@@ -1,15 +1,15 @@
 # eclipseglsp/ci:alpine
-# 6.0
+# 7.1
 FROM node:20-alpine3.22
 
 # Install Java, Maven, Git and dependecies for Theia
-ENV JAVA_HOME="/usr/lib/jvm/default-jvm/"
-RUN apk add --no-cache openjdk17 maven git openssh \
+ENV JAVA_HOME="/usr/lib/jvm/java-21-openjdk"
+RUN apk add --no-cache openjdk21 openjdk11 maven git openssh \
     make pkgconfig gcc g++ python3  libx11-dev libxkbfile-dev libsecret-dev rsync \
     yarn curl
 
 RUN npm install -g lerna
-# Has to be set explictly to find binaries 
-ENV PATH=$PATH:${JAVA_HOME}/
+# Has to be set explictly to find binaries
+ENV PATH=$PATH:${JAVA_HOME}/bin
 
 CMD ["/bin/sh"]