Skip to content

Commit 75a4411

Browse files
committed
Update java_home environment check
1 parent 1315f55 commit 75a4411

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

.devcontainer/Dockerfile

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,17 @@ RUN curl -sSL https://services.gradle.org/distributions/gradle-8.4-bin.zip -o gr
1616
ln -s /opt/gradle/bin/gradle /usr/local/bin/gradle && \
1717
rm gradle.zip
1818

19-
# Environment variables (auto-detect JAVA_HOME)
20-
ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-arm64
19+
# Create a universal JAVA_HOME symlink
20+
RUN if [ -d /usr/lib/jvm/java-17-openjdk-amd64 ]; then \
21+
ln -s /usr/lib/jvm/java-17-openjdk-amd64 /usr/lib/jvm/java-17-openjdk; \
22+
elif [ -d /usr/lib/jvm/java-17-openjdk-arm64 ]; then \
23+
ln -s /usr/lib/jvm/java-17-openjdk-arm64 /usr/lib/jvm/java-17-openjdk; \
24+
else \
25+
echo "No supported JDK installation found" && exit 1; \
26+
fi
27+
28+
# Set environment variables (arch-agnostic)
29+
ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk
2130
ENV PATH="${JAVA_HOME}/bin:${PATH}"
2231

2332
# Create non-root user

0 commit comments

Comments
 (0)