ElektraInitiative#3713 reintroduced setting JAVA_HOME and CASSPATH in…

… fedora Dockerfiles to prevent error: "Could not find tools.jar. Please check that /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.282.b08-0.fc32.x86_64/jre contains a valid JDK installation."
a-kraschitzer · Apr 14, 2021 · 238bd89 · 238bd89
1 parent 0b2cda3
commit 238bd89
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/scripts/docker/cirrus/fedora/Dockerfile b/scripts/docker/cirrus/fedora/Dockerfile
@@ -63,7 +63,5 @@ RUN mkdir -p ${GTEST_ROOT} \
 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 "export PATH=$PATH:$JAVA_HOME/bin" >> /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
-
diff --git a/scripts/docker/fedora/31/Dockerfile b/scripts/docker/fedora/31/Dockerfile
@@ -88,6 +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
 
 USER ${JENKINS_USERID}
 

diff --git a/scripts/docker/fedora/32/Dockerfile b/scripts/docker/fedora/32/Dockerfile
@@ -89,6 +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
 
 USER ${JENKINS_USERID}
 

diff --git a/scripts/docker/fedora/33/Dockerfile b/scripts/docker/fedora/33/Dockerfile
@@ -101,6 +101,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
 
 USER ${JENKINS_USERID}