From d32b5803be0617efc7ee749442b8bbf4c5b89100 Mon Sep 17 00:00:00 2001
From: Nicolas Gelot <nicolas.gelot@e.email>
Date: Wed, 12 Oct 2022 21:03:16 +0200
Subject: [PATCH 1/2] Revert "Fix build failure coming from last jdk 11"

This reverts commit aa17f78a8d2c99253e9221bbd529d40cf821b0cc.
---
 Dockerfile | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8e78df4a..3e5075d3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,19 +19,4 @@ ENV SNAP="/snap/snapcraft/current"
 ENV SNAP_NAME="snapcraft"
 ENV SNAP_ARCH="amd64"
 
-RUN apt-get install -y nsis rsync wget
-
-RUN mkdir /usr/lib/jdk && \
-        cd /usr/lib/jdk && \
-        wget https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15%2B10/OpenJDK11U-jdk_x64_linux_hotspot_11.0.15_10.tar.gz && \ 
-        tar -xvf OpenJDK11U-jdk_x64_linux_hotspot_11.0.15_10.tar.gz
-
-RUN echo 'PATH="${PATH}:/usr/lib/jdk/jdk-11.0.15+10/bin"' >> /etc/environment && \
-        echo 'JAVA_HOME="/usr/lib/jdk/jdk-11.0.15+10"' >> /etc/environment && \
-        update-alternatives --install "/usr/bin/java" "java" "/usr/lib/jdk/jdk-11.0.15+10/bin/java" 0 && \
-        update-alternatives --install "/usr/bin/javac" "javac" "/usr/lib/jdk/jdk-11.0.15+10/bin/javac" 0 && \
-        update-alternatives --set java /usr/lib/jdk/jdk-11.0.15+10/bin/java && \
-        update-alternatives --set javac /usr/lib/jdk/jdk-11.0.15+10/bin/javac && \
-        update-alternatives --list java && \
-        update-alternatives --list javac && \
-        rm /usr/lib/jdk/OpenJDK11U-jdk_x64_linux_hotspot_11.0.15_10.tar.gz 
+RUN apt-get install -y openjdk-11-jdk nsis rsync
\ No newline at end of file
-- 
GitLab


From 88194c324033b5d733742128cee3ccc1711ecf40 Mon Sep 17 00:00:00 2001
From: Nicolas Gelot <nicolas.gelot@e.email>
Date: Wed, 12 Oct 2022 21:27:13 +0200
Subject: [PATCH 2/2] Fix jlink build failure with the runtime jdk

Ref: https://gitlab.e.foundation/e/devices/easy-installer/-/issues/436
---
 Dockerfile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 3e5075d3..4874c86b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,4 +19,8 @@ ENV SNAP="/snap/snapcraft/current"
 ENV SNAP_NAME="snapcraft"
 ENV SNAP_ARCH="amd64"
 
-RUN apt-get install -y openjdk-11-jdk nsis rsync
\ No newline at end of file
+RUN apt-get install -y nsis rsync
+
+# install jvm
+COPY buildSrc/linux/jdk-11.0.2 /usr/lib/jdk/jdk-11.0.2
+ENV JAVA_HOME=/usr/lib/jdk/jdk-11.0.2
-- 
GitLab