docker: fix fedora java paths and JAVA_HOME, use alternatives to set …

…current java version
ElektraInitiative · Apr 9, 2021 · b5cff96 · b5cff96
1 parent 09daa2f
commit b5cff96
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/scripts/docker/cirrus/fedora/Dockerfile b/scripts/docker/cirrus/fedora/Dockerfile
@@ -62,6 +62,5 @@ RUN mkdir -p ${GTEST_ROOT} \
 # download and install gradle
 RUN cd /tmp && wget https://services.gradle.org/distributions/gradle-6.8.3-bin.zip && unzip gradle-6.8.3-bin.zip && rm gradle-6.8.3-bin.zip && mv gradle-6.8.3 /opt/gradle
 ENV PATH "${PATH}:/opt/gradle/bin"
-RUN echo "export JAVA_HOME=$(dirname $(dirname $(readlink $(readlink $(which javac)))))" >> /etc/profile.d/java.sh
-RUN echo "CLASSPATH=.:$JAVA_HOME/jre/lib:$JAVA_HOME/lib:$JAVA_HOME/lib/tools.jar" >> /etc/profile.d/java.sh
-RUN source /etc/profile.d/java.sh
+ENV JAVA_HOME=/etc/alternatives/jre
+RUN alternatives --auto java && alternatives --auto javac
diff --git a/scripts/docker/fedora/31/Dockerfile b/scripts/docker/fedora/31/Dockerfile
@@ -88,9 +88,9 @@ RUN useradd \
 # download and install gradle
 RUN cd /tmp && wget https://services.gradle.org/distributions/gradle-6.8.3-bin.zip && unzip gradle-6.8.3-bin.zip && rm gradle-6.8.3-bin.zip && mv gradle-6.8.3 /opt/gradle
 ENV PATH "${PATH}:/opt/gradle/bin"
-RUN echo "export JAVA_HOME=$(dirname $(dirname $(readlink $(readlink $(which javac)))))" >> /etc/profile.d/java.sh
-RUN echo "CLASSPATH=.:$JAVA_HOME/jre/lib:$JAVA_HOME/lib:$JAVA_HOME/lib/tools.jar" >> /etc/profile.d/java.sh
-RUN source /etc/profile.d/java.sh
+ENV JAVA_HOME=/etc/alternatives/jre
+# Pipe in 1 as Java 11 is first in the list
+RUN echo 1 | alternatives --config java && alternatives --auto javac
 
 USER ${JENKINS_USERID}
 

diff --git a/scripts/docker/fedora/32/Dockerfile b/scripts/docker/fedora/32/Dockerfile
@@ -89,9 +89,9 @@ RUN useradd \
 # download and install gradle
 RUN cd /tmp && wget https://services.gradle.org/distributions/gradle-6.8.3-bin.zip && unzip gradle-6.8.3-bin.zip && rm gradle-6.8.3-bin.zip && mv gradle-6.8.3 /opt/gradle
 ENV PATH "${PATH}:/opt/gradle/bin"
-RUN echo "export JAVA_HOME=$(dirname $(dirname $(readlink $(readlink $(which javac)))))" >> /etc/profile.d/java.sh
-RUN echo "CLASSPATH=.:$JAVA_HOME/jre/lib:$JAVA_HOME/lib:$JAVA_HOME/lib/tools.jar" >> /etc/profile.d/java.sh
-RUN source /etc/profile.d/java.sh
+ENV JAVA_HOME=/etc/alternatives/jre
+# Pipe in 1 as Java 11 is first in the list
+RUN echo 1 | alternatives --config java && alternatives --auto javac
 
 USER ${JENKINS_USERID}
 

diff --git a/scripts/docker/fedora/33/Dockerfile b/scripts/docker/fedora/33/Dockerfile
@@ -101,9 +101,8 @@ RUN useradd \
 # download and install gradle
 RUN cd /tmp && wget https://services.gradle.org/distributions/gradle-6.8.3-bin.zip && unzip gradle-6.8.3-bin.zip && rm gradle-6.8.3-bin.zip && mv gradle-6.8.3 /opt/gradle
 ENV PATH "${PATH}:/opt/gradle/bin"
-RUN echo "export JAVA_HOME=$(dirname $(dirname $(readlink $(readlink $(which javac)))))" >> /etc/profile.d/java.sh
-RUN echo "CLASSPATH=.:$JAVA_HOME/jre/lib:$JAVA_HOME/lib:$JAVA_HOME/lib/tools.jar" >> /etc/profile.d/java.sh
-RUN source /etc/profile.d/java.sh
+ENV JAVA_HOME=/etc/alternatives/jre
+RUN alternatives --auto java && alternatives --auto javac
 
 USER ${JENKINS_USERID}