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

Commit 5b09e960 authored by Jackeagle's avatar Jackeagle
Browse files

Docker: Switch to Temurin JDK

parent 5a379735

Dockerfile

+11 −5
Original line number Diff line number Diff line
@@ -179,12 +179,18 @@ RUN curl https://storage.googleapis.com/git-repo-downloads/repo > /usr/local/bin 
RUN chmod a+x /usr/local/bin/repo

RUN ln -fs /usr/bin/python3 /usr/bin/python



# Use adoptopenjdk.net to be able to use OpeJDK8 on debian:buster

RUN curl -q https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add -

RUN add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/

RUN apt-get -qq update && apt-get install -y adoptopenjdk-8-hotspot=8u282-b08-3

RUN update-alternatives --set java /usr/lib/jvm/adoptopenjdk-8-hotspot-amd64/bin/java

# Add Adoptium (Temurin) repo securely

RUN mkdir -p /etc/apt/keyrings && \

    curl -fsSL https://packages.adoptium.net/artifactory/api/gpg/key/public \

    | gpg --dearmor -o /etc/apt/keyrings/adoptium.gpg



RUN echo "deb [signed-by=/etc/apt/keyrings/adoptium.gpg] https://packages.adoptium.net/artifactory/deb focal main" \

    > /etc/apt/sources.list.d/adoptium.list



RUN apt-get update && \

    apt-get install -y temurin-8-jdk



RUN update-alternatives --set java /usr/lib/jvm/temurin-8-jdk-amd64/bin/java



# Fix jack server SSL issue during build for openjdk (adoptopenjdk won't work for nougat and oreo)

RUN perl -0777 -i -p -e 's/(jdk.tls.disabledAlgorithms=.*?), TLSv1, TLSv1\.1/$1/g' \

Dockerfile.community

+12 −5
Original line number Diff line number Diff line
@@ -165,11 +165,18 @@ RUN curl https://storage.googleapis.com/git-repo-downloads/repo > /usr/local/bin 
RUN chmod a+x /usr/local/bin/repo

RUN ln -fs /usr/bin/python3 /usr/bin/python



# Use adoptopenjdk.net to be able to use OpeJDK8 on debian:buster

RUN curl -q https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add -

RUN add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/

RUN apt-get -qq update && apt-get install -y adoptopenjdk-8-hotspot

RUN update-alternatives --set java /usr/lib/jvm/adoptopenjdk-8-hotspot-amd64/bin/java

# Add Adoptium (Temurin) repo securely

RUN mkdir -p /etc/apt/keyrings && \

    curl -fsSL https://packages.adoptium.net/artifactory/api/gpg/key/public \

    | gpg --dearmor -o /etc/apt/keyrings/adoptium.gpg



RUN echo "deb [signed-by=/etc/apt/keyrings/adoptium.gpg] https://packages.adoptium.net/artifactory/deb focal main" \

    > /etc/apt/sources.list.d/adoptium.list



RUN apt-get update && \

    apt-get install -y temurin-8-jdk



RUN update-alternatives --set java /usr/lib/jvm/temurin-8-jdk-amd64/bin/java



# Set the work directory

########################