4c9fa2436e
The production images built on mutable tags with --pull, so the same commit could produce different bases, and neither Dockerfile upgraded its OS packages even though the local ones did. The published API image carried 56 HIGH and 3 CRITICAL findings, 15 of them with an upstream fix available. Pin both bases by digest and upgrade OS packages in the production images. That removes all 3 CRITICAL and 13 of the 15 fixable findings. The remaining two, msgpack and setuptools, come from a third-party SBOM; neither package is importable or listed by pip in the built image, which I confirmed rather than taking the previous report's word for it. The web image could not be fixed this way: the official 1.28 line pins nginx=1.28.3-r1 in /etc/apk/world, so apk upgrade leaves five HIGH findings in place even though Alpine ships 1.28.3-r7. Moving to nginx:alpine (1.31.6) clears them completely; 1.29-alpine scans worse, at 37 HIGH. Same uid 101 and the same template entrypoint, and the local images now use the same pinned bases so the integration suite exercises what ships. Full suite passes on nginx 1.31.6, including the browser end-to-end. With both images at zero CRITICAL, the image scan now blocks on CRITICAL and reports HIGH, instead of reporting everything. PYTHON_BASE_IMAGE and NGINX_BASE_IMAGE are wired through to the builds so a base can move forward without editing the repository, which is what PORTAINER.md already promised. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
29 lines
1.3 KiB
Docker
29 lines
1.3 KiB
Docker
# syntax=docker/dockerfile:1
|
|
# Pinned by digest so a rebuild of the same commit produces the same base.
|
|
# Override with the PYTHON_BASE_IMAGE repository variable to move it forward
|
|
# deliberately, and update this default in the same change.
|
|
ARG PYTHON_BASE_IMAGE=python:3.12-slim@sha256:2f17fc044b579bab302c2e8054d3a686e2cb9a83de48e70534b94cd8ebbe06a9
|
|
FROM ${PYTHON_BASE_IMAGE}
|
|
|
|
ARG VCS_REF=unknown
|
|
LABEL org.opencontainers.image.title="DTF Portal/API" \
|
|
org.opencontainers.image.revision="$VCS_REF" \
|
|
org.opencontainers.image.source="DTF System repository"
|
|
|
|
# The base is pinned, so its OS packages are frozen at the digest's build date.
|
|
# Upgrade them here or the image ships known-fixed Debian vulnerabilities, which
|
|
# is what the production image was doing while the local one already did this.
|
|
RUN apt-get update \
|
|
&& apt-get upgrade -y \
|
|
&& rm -rf /var/lib/apt/lists/*
|
|
|
|
WORKDIR /app
|
|
COPY local/requirements.txt local/requirements.lock /app/local/
|
|
RUN python -m pip install --no-cache-dir --require-hashes -r local/requirements.lock
|
|
COPY local /app/local
|
|
RUN useradd --uid 10001 --create-home --shell /usr/sbin/nologin dtf
|
|
USER 10001:10001
|
|
ENV PYTHONDONTWRITEBYTECODE=1 PYTHONUNBUFFERED=1 PYTHONPATH=/app
|
|
EXPOSE 8000
|
|
CMD ["uvicorn", "local.app:app", "--host", "0.0.0.0", "--port", "8000", "--no-access-log"]
|