tao.chen/mcp-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(deploy): align JAVA_HOME default to JDK 17 (match Dockerfile)

Browse Source 
The Dockerfile installs openjdk-17-jre-headless and sets
JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64, but the entrypoint
default was still /usr/lib/jvm/java-11-openjdk-amd64. The
validation caught the mismatch at container start:

  [entrypoint] FATAL: JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
  but /usr/lib/jvm/java-11-openjdk-amd64/bin/java is missing or
  not executable

That's exactly the failure mode the validation is designed to catch
- the deployment config got out of sync. Aligning all four files
(Dockerfile, entrypoint, .env.example, docker-compose.yml) to
java-17-openjdk-amd64.

No app code touched. 165/165 still pass.
This commit is contained in:
Claude
2026-06-25 17:27:27 +08:00
parent f2a3784b5c
commit 0cb7605afa
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env.example
+4 -4
View File
@@ -64,17 +64,17 @@ YARN_RESOURCE_MANAGER_URL=
# SPARK_SUBMIT_OPTS=-Dhttps.proxyHost=proxy.corp -Dhttps.proxyPort=3128 # SPARK_SUBMIT_OPTS=-Dhttps.proxyHost=proxy.corp -Dhttps.proxyPort=3128
# --- Java + Spark install paths --- # --- Java + Spark install paths ---
# Where the openjdk-11-jre-headless JDK lives, and where the Spark # Where the openjdk-17-jre-headless JDK lives, and where the Spark
# distribution was extracted during the image build. Defaults match the # distribution was extracted during the image build. Defaults match the
# Dockerfile's ENTRYPOINT script. Override if you mount a different # Dockerfile's ENTRYPOINT script. Override if you mount a different
# Java (e.g. /usr/lib/jvm/java-17-openjdk-arm64 on some ARM hosts) or # Java (e.g. /usr/lib/jvm/java-21-openjdk-amd64 on hosts with Java 21)
# a pre-installed Spark from a host volume (e.g. /opt/spark-3.1.2-bin-hadoop2.7). # or a pre-installed Spark from a host volume (e.g. /opt/spark-3.5.8-bin-hadoop3).
# #
# The container's docker-entrypoint.sh re-derives PATH from these values # The container's docker-entrypoint.sh re-derives PATH from these values
# at every start, so overriding them here actually changes which `java` # at every start, so overriding them here actually changes which `java`
# and `spark-submit` binaries the gunicorn process picks up. # and `spark-submit` binaries the gunicorn process picks up.
# #
# JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 # JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
# SPARK_HOME=/opt/spark # SPARK_HOME=/opt/spark
# --- Gunicorn process model (see gunicorn.conf.py; NOT read by common/config.py) --- # --- Gunicorn process model (see gunicorn.conf.py; NOT read by common/config.py) ---
docker-compose.yml
+2 -2
View File
@@ -60,9 +60,9 @@ services:
# Override to point at a different JDK install or pre-mounted Spark # Override to point at a different JDK install or pre-mounted Spark
# distribution. The entrypoint re-derives PATH from these at every # distribution. The entrypoint re-derives PATH from these at every
# container start, so overrides actually take effect. # container start, so overrides actually take effect.
# JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 # JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
# SPARK_HOME=/opt/spark # SPARK_HOME=/opt/spark
JAVA_HOME: ${JAVA_HOME:-/usr/lib/jvm/java-11-openjdk-amd64} JAVA_HOME: ${JAVA_HOME:-/usr/lib/jvm/java-17-openjdk-amd64}
SPARK_HOME: ${SPARK_HOME:-/opt/spark} SPARK_HOME: ${SPARK_HOME:-/opt/spark}
# --- gunicorn.conf.py knobs (NOT read by common/config.py) --- # --- gunicorn.conf.py knobs (NOT read by common/config.py) ---
docker-entrypoint.sh
+2 -1
View File
@@ -23,7 +23,8 @@
set -e set -e
# Defaults match the Dockerfile's build-time ENV # Defaults match the Dockerfile's build-time ENV
: "${JAVA_HOME:=/usr/lib/jvm/java-11-openjdk-amd64}" # (openjdk-17-jre-headless + Spark 3.5.8)
: "${JAVA_HOME:=/usr/lib/jvm/java-17-openjdk-amd64}"
: "${SPARK_HOME:=/opt/spark}" : "${SPARK_HOME:=/opt/spark}"
# --- Validation (fail fast with a clear error) --- # --- Validation (fail fast with a clear error) ---