Skip to content

Commit

Permalink
Revert "Make JAVA_HOME platform independent"
Browse files Browse the repository at this point in the history
This reverts commit 613e72f.
  • Loading branch information
thyrlian committed Jan 20, 2024
1 parent 613e72f commit 5896237
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 13 deletions.
7 changes: 1 addition & 6 deletions android-sdk/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,7 @@ RUN mkdir -p ${ANDROID_HOME}/cmdline-tools && \
rm *tools*linux*.zip

# set the environment variables
RUN JAVA_HOME=$(ls -d /usr/lib/jvm/java-${JDK_VERSION}-openjdk-* | head -n 1) && \
echo "export JAVA_HOME=$JAVA_HOME" > /tmp/java_home.sh
ENV JAVA_HOME /usr/lib/jvm/java-${JDK_VERSION}-openjdk-amd64
ENV GRADLE_HOME /opt/gradle
ENV KOTLIN_HOME /opt/kotlinc
ENV PATH ${PATH}:${GRADLE_HOME}/bin:${KOTLIN_HOME}/bin:${ANDROID_HOME}/cmdline-tools/latest/bin:${ANDROID_HOME}/cmdline-tools/tools/bin:${ANDROID_HOME}/platform-tools:${ANDROID_HOME}/emulator
Expand Down Expand Up @@ -94,9 +93,5 @@ RUN apt-get update && \
done && \
(rm /tmp/*.pub 2> /dev/null || true)

ADD entrypoint.sh /tmp/entrypoint.sh
RUN chmod +x /tmp/entrypoint.sh
ENTRYPOINT ["/tmp/entrypoint.sh"]

ADD supervisord.conf /etc/supervisor/conf.d/
CMD ["/usr/bin/supervisord"]
7 changes: 0 additions & 7 deletions android-sdk/entrypoint.sh

This file was deleted.

0 comments on commit 5896237

Please sign in to comment.