From cf95ce7c86b00a6c670a52e2983a6bfb6baef0de Mon Sep 17 00:00:00 2001
From: Rui Chen <rui@chenrui.dev>
Date: Mon, 11 Sep 2023 21:04:28 -0400
Subject: [PATCH 1/3] dockerfile: update to use the latest LTS java

Signed-off-by: Rui Chen <rui@chenrui.dev>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 8b14c791b..953444a33 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # Running this image will start a language server that listens for TCP connections on port 49100
 # Every connection will be run in a forked child process
 
-ARG JDKVERSION=11
+ARG JDKVERSION=17
 
 FROM --platform=$BUILDPLATFORM eclipse-temurin:${JDKVERSION} AS builder
 

From af3f0463b7c25fce972823e442a418f098051ad6 Mon Sep 17 00:00:00 2001
From: fwcd <fwcdmail@gmail.com>
Date: Mon, 2 Oct 2023 22:01:32 +0100
Subject: [PATCH 2/3] Pass JDK version to build in Dockerfile

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 953444a33..fa2758fa3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ FROM --platform=$BUILDPLATFORM eclipse-temurin:${JDKVERSION} AS builder
 WORKDIR /src/kotlin-language-server
 
 COPY . .
-RUN ./gradlew :server:installDist
+RUN ./gradlew :server:installDist -PjavaVersion=${JDKVERSION}
 
 FROM eclipse-temurin:${JDKVERSION}
 

From dcf77ba2bb822d06e43ada296db52ab9695b8e17 Mon Sep 17 00:00:00 2001
From: fwcd <fwcdmail@gmail.com>
Date: Mon, 2 Oct 2023 22:07:43 +0100
Subject: [PATCH 3/3] Make `JDKVERSION` accessible from builder stage

---
 Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index fa2758fa3..77cb1d6ca 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,6 +5,8 @@ ARG JDKVERSION=17
 
 FROM --platform=$BUILDPLATFORM eclipse-temurin:${JDKVERSION} AS builder
 
+ARG JDKVERSION
+
 WORKDIR /src/kotlin-language-server
 
 COPY . .