70e1750948
kettui reported the dev image roughly doubled in size after a recent nightly build. codex investigation traced it back to: 1. nightly workflow runs `python -m pytest` before docker build 2. one of the new tests imports web_server (test_tidal_auth_instructions.py) 3. importing web_server constructs YouTubeClient 4. YouTubeClient.__init__ called _check_ffmpeg() — which auto-downloads a ~388 MB ffmpeg/ffprobe bundle into ./tools/ when system ffmpeg isn't on PATH (CI runner doesn't have it) 5. .dockerignore didn't exclude tools/ffmpeg or tools/ffprobe 6. docker `COPY . .` shipped the binaries 7. the immediately-following `chown -R /app` rewrote every file into a new layer — so the 388 MB payload got counted twice in image size three fixes: 1. .dockerignore — block the auto-downloaded binaries even if they leak into the workspace (tools/ffmpeg, tools/ffprobe, .exe variants, .zip and .tar.xz download archives). Defense-in-depth so a future regression in the test/import path can't bloat the image again. 2. youtube_client — split _check_ffmpeg into a side-effect-free _locate_ffmpeg (pure existence check) and the original auto- download _check_ffmpeg. __init__ now calls _locate_ffmpeg + logs a warning when missing instead of triggering download. is_available() and the actual download dispatch paths still call _check_ffmpeg — so end users still get auto-download on first YouTube use, but `import web_server` doesn't drag a 388 MB binary into the workspace. 3. Dockerfile — replaced `COPY . .` + `chown -R /app` with `COPY --chown=soulsync:soulsync . .` + a scoped chown on just the runtime mount-point dirs. eliminates the layer that duplicated the entire /app tree just to flip ownership bits, so even legit workspace content isn't double-counted in the image. Combined effect: image size returns to baseline + future ffmpeg leaks can't bloat it. Inside the container nothing changes — the Dockerfile already installs system ffmpeg via apt, so YouTube downloads find it on PATH on first use and the auto-download path never fires. 2259 passed, 1 skipped, 0 failed.
98 lines
3.4 KiB
Docker
98 lines
3.4 KiB
Docker
# SoulSync WebUI Dockerfile
|
|
# Multi-architecture support for AMD64 and ARM64
|
|
|
|
# Stage 1: Builder — install Python dependencies with compilation tools
|
|
FROM python:3.11-slim AS builder
|
|
|
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
|
gcc \
|
|
libc6-dev \
|
|
libffi-dev \
|
|
libssl-dev \
|
|
&& rm -rf /var/lib/apt/lists/*
|
|
|
|
# Create virtualenv and install dependencies
|
|
RUN python -m venv /opt/venv
|
|
ENV PATH="/opt/venv/bin:$PATH"
|
|
|
|
COPY requirements.txt .
|
|
RUN pip install --no-cache-dir --upgrade pip && \
|
|
pip install --no-cache-dir -r requirements.txt
|
|
|
|
# Stage 2: Runtime — only runtime dependencies, no build tools
|
|
FROM python:3.11-slim
|
|
|
|
# Build-time commit SHA for update detection
|
|
ARG COMMIT_SHA=""
|
|
ENV SOULSYNC_COMMIT_SHA=${COMMIT_SHA}
|
|
|
|
# Copy pre-built virtualenv from builder
|
|
COPY --from=builder /opt/venv /opt/venv
|
|
ENV VIRTUAL_ENV=/opt/venv
|
|
ENV PATH="/opt/venv/bin:$PATH"
|
|
|
|
# Set working directory
|
|
WORKDIR /app
|
|
|
|
# Install runtime-only system dependencies (no gcc/build tools)
|
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
|
curl \
|
|
gosu \
|
|
ffmpeg \
|
|
libchromaprint-tools \
|
|
&& rm -rf /var/lib/apt/lists/*
|
|
|
|
# Create non-root user for security
|
|
RUN useradd --create-home --shell /bin/bash --uid 1000 soulsync
|
|
|
|
# Copy application code with ownership baked in.
|
|
# Using `COPY --chown` instead of `COPY` + `chown -R /app` avoids an
|
|
# extra image layer that duplicates the entire /app tree just to flip
|
|
# ownership bits — Docker layers are immutable, so chown -R rewrites
|
|
# every file into a new layer. On a clean repo that's small; if any
|
|
# bulky workspace file slips in (e.g. auto-downloaded ffmpeg binaries
|
|
# in tools/), it gets counted twice in the image. Cin caught this on
|
|
# 2026-05-08 — see the .dockerignore comment for the same incident.
|
|
COPY --chown=soulsync:soulsync . .
|
|
|
|
# Create runtime mount-point directories the app expects to exist.
|
|
# NOTE: /app/data is for database FILES, /app/database is the Python package
|
|
RUN mkdir -p /app/config /app/data /app/logs /app/downloads /app/Transfer /app/MusicVideos /app/scripts && \
|
|
chown soulsync:soulsync /app/config /app/data /app/logs /app/downloads /app/Transfer /app/MusicVideos /app/scripts
|
|
|
|
# Create defaults directory and copy template files
|
|
# These will be used by entrypoint.sh to initialize empty volumes
|
|
RUN mkdir -p /defaults && \
|
|
cp /app/config/config.example.json /defaults/config.json && \
|
|
cp /app/config/settings.py /defaults/settings.py && \
|
|
chmod 644 /defaults/config.json /defaults/settings.py
|
|
|
|
# Create volume mount points
|
|
# NOTE: Changed /app/database to /app/data to avoid overwriting Python package
|
|
VOLUME ["/app/config", "/app/data", "/app/logs", "/app/downloads", "/app/Transfer", "/app/MusicVideos", "/app/scripts"]
|
|
|
|
# Copy and set up entrypoint script
|
|
COPY entrypoint.sh /entrypoint.sh
|
|
RUN chmod +x /entrypoint.sh
|
|
|
|
# Note: Don't switch to soulsync user yet - entrypoint needs root to change UIDs
|
|
# The entrypoint script will switch to soulsync after setting up permissions
|
|
|
|
# Expose port
|
|
EXPOSE 8008
|
|
|
|
# Health check
|
|
HEALTHCHECK --interval=30s --timeout=10s --start-period=60s --retries=3 \
|
|
CMD curl -f http://localhost:8008/ || exit 1
|
|
|
|
# Set environment variables
|
|
ENV PYTHONPATH=/app
|
|
ENV PYTHONUNBUFFERED=1
|
|
ENV DATABASE_PATH=/app/data/music_library.db
|
|
ENV PUID=1000
|
|
ENV PGID=1000
|
|
ENV UMASK=022
|
|
|
|
# Set entrypoint and default command
|
|
ENTRYPOINT ["/entrypoint.sh"]
|
|
CMD ["gunicorn", "-c", "gunicorn.conf.py", "wsgi:application"]
|