-
-
Notifications
You must be signed in to change notification settings - Fork 217
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "Make JAVA_HOME platform independent"
This reverts commit 70f18be.
- Loading branch information
Showing
2 changed files
with
4 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,9 +10,6 @@ FROM ubuntu:22.04 | |
# ---------------------------------------------------------------------- # | ||
LABEL maintainer "[email protected]" | ||
|
||
# set PLATFORM with available values for building the image: 'amd64' or 'arm64' | ||
ARG PLATFORM=amd64 | ||
|
||
# support multiarch: i386 architecture | ||
# install Java | ||
# install essential tools | ||
|
@@ -54,7 +51,7 @@ RUN mkdir -p ${ANDROID_HOME}/cmdline-tools && \ | |
rm *tools*linux*.zip | ||
|
||
# set the environment variables | ||
ENV JAVA_HOME /usr/lib/jvm/java-${JDK_VERSION}-openjdk-${PLATFORM} | ||
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 | ||
|