Claude
5970fadcd2
Three problems with the prior Dockerfile:
1. JAVA_HOME and SPARK_HOME were hardcoded at build time (ENV ...),
so docker-compose / .env overrides had no effect.
2. PATH was constructed at build time using those hardcoded values,
so even if you could override the env vars, PATH would still
reference the old literal paths (e.g. /usr/lib/jvm/java-17-openjdk-amd64/bin
hardcoded into PATH at image build).
3. There was no .env.example entry for either, so operators had no
template to follow.
Fix:
- docker-entrypoint.sh: re-derives PATH from the (possibly overridden)
JAVA_HOME and SPARK_HOME at every container start. Strips any stale
JDK/Spark bin dirs from PATH first so a restart with a new override
actually changes which / resolve.
- Dockerfile: COPY + ENTRYPOINT [entrypoint.sh], CMD [gunicorn main:app].
The existing ENV JAVA_HOME and ENV SPARK_HOME stay as the defaults
so the image works out of the box; users override via .env.
- .env.example: new 'Java + Spark install paths' section, default
values match the Dockerfile, comments explain the entrypoint
re-derivation.
- docker-compose.yml: forwards JAVA_HOME and SPARK_HOME with
container-side defaults matching the Dockerfile.
Verified:
- 116/116 tests still pass
- Direct entrypoint run with JAVA_HOME=/fake/jdk shows PATH rebuilt as
/app/.venv/bin:/fake/jdk/bin:/fake/spark/bin:... (override took effect)
Note: uses awk instead of 'paste -sd:' for portability across macOS
(BSD paste doesn't support -s) and Linux (GNU does).
39 lines
1.5 KiB
Bash
Executable File
39 lines
1.5 KiB
Bash
Executable File
#!/bin/sh
|
|
# docker-entrypoint.sh
|
|
#
|
|
# Re-derives PATH from JAVA_HOME and SPARK_HOME at container start, so that
|
|
# overriding either via docker-compose / .env actually changes which
|
|
# `java` and `spark-submit` binaries the gunicorn process picks up.
|
|
#
|
|
# Without this, the image's built-in PATH (set at build time from the
|
|
# Dockerfile's ENV) would still reference the old literal paths even
|
|
# after the env vars are overridden at runtime.
|
|
#
|
|
# Usage in Dockerfile:
|
|
# ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
|
|
# CMD ["gunicorn", "main:app"]
|
|
set -e
|
|
|
|
# Defaults if not set (matches Dockerfile's build-time defaults)
|
|
: "${JAVA_HOME:=/usr/lib/jvm/java-17-openjdk-amd64}"
|
|
: "${SPARK_HOME:=/opt/spark}"
|
|
|
|
# Project venv always takes precedence
|
|
VENV_BIN="/app/.venv/bin"
|
|
|
|
# Strip any stale JAVA_HOME / SPARK_HOME bin dirs from PATH, then prepend
|
|
# the current ones so overrides actually take effect on a container restart.
|
|
# Uses awk instead of `paste -sd:` for portability (macOS paste is BSD and
|
|
# doesn't support -s).
|
|
PATH_CLEAN=$(echo "$PATH" | tr ':' '\n' | grep -v "/usr/lib/jvm/" | grep -v "/opt/spark/bin" | awk '{ printf "%s%s", $0, (NR==1?":":"") }' | sed 's/:$//')
|
|
export PATH="${VENV_BIN}:${JAVA_HOME}/bin:${SPARK_HOME}/bin:${PATH_CLEAN}"
|
|
export JAVA_HOME
|
|
export SPARK_HOME
|
|
|
|
echo "[entrypoint] JAVA_HOME=${JAVA_HOME}" >&2
|
|
echo "[entrypoint] SPARK_HOME=${SPARK_HOME}" >&2
|
|
echo "[entrypoint] PATH=${PATH}" >&2
|
|
|
|
# Run whatever CMD was passed (gunicorn main:app, or `python main.py`, etc.)
|
|
exec "$@"
|