Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd9d1b57 authored by Nicolas Gelot's avatar Nicolas Gelot
Browse files

Merge branch '436-fix-build-with-jlink' into 'master' 

Fix jlink build failure with jdk runtime

Closes #436

See merge request !184
parents 3af5effc 88194c32

Dockerfile

+4 −15
Original line number Diff line number Diff line
@@ -19,19 +19,8 @@ ENV SNAP="/snap/snapcraft/current" 
ENV SNAP_NAME="snapcraft"

ENV SNAP_ARCH="amd64"



RUN apt-get install -y nsis rsync wget

RUN apt-get install -y nsis rsync



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 
# 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