diff options
| author | Christian Breunig <christian@breunig.cc> | 2026-08-30 15:00:43 +0200 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2026-08-30 15:00:43 +0200 |
| commit | 84868c44b4d54f67481073ac7f7f41542b5d0d2a (patch) | |
| tree | c2c5a5be72ed2f287734e45dce1f028c4918df0f /docker | |
| parent | 6006dc82c92994149d906625c8abe7ff611a4fc9 (diff) | |
| download | vyos-documentation-84868c44b4d54f67481073ac7f7f41542b5d0d2a.tar.gz vyos-documentation-84868c44b4d54f67481073ac7f7f41542b5d0d2a.zip | |
Docker: T9264: fix container build and publishing
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 8598b808..bf4859f0 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -37,16 +37,15 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ librsvg2-bin \ poppler-utils -RUN pip3 install --break-system-packages \ - Sphinx \ - sphinx-rtd-theme \ - sphinx-autobuild \ - sphinx-notfound-page \ - lxml \ - myst-parser \ - sphinx_design \ - sphinx_llms_txt \ - sphinx_sitemap +# Install the Python toolchain from the repository's requirements.txt so the +# image matches the versions Read the Docs and the virtualenv path use. Do not +# duplicate the package list here — an unpinned install silently drifts from +# requirements.txt (a fresh unpinned build resolved Sphinx 9.0.4 against the +# pinned 7.2.6), so the container and RTD stop building the same docs. This +# requires the build context to be the repository root, not docker/. +COPY requirements.txt /tmp/requirements.txt +RUN pip3 install --break-system-packages -r /tmp/requirements.txt && \ + rm /tmp/requirements.txt # Cleanup RUN rm -rf /var/lib/apt/lists/* @@ -56,7 +55,7 @@ EXPOSE 8000 # Allow password-less 'sudo' for all users in group 'sudo' RUN sed "s/^%sudo.*/%sudo\tALL=(ALL) NOPASSWD:ALL/g" -i /etc/sudoers -COPY entrypoint.sh /usr/local/bin/entrypoint.sh +COPY docker/entrypoint.sh /usr/local/bin/entrypoint.sh # We need to convert the entrypoint with appropriate line endings, else # there will be an error: @@ -69,7 +68,7 @@ RUN dos2unix /usr/local/bin/entrypoint.sh # directly, since Debian's imagemagick package is built --without-rsvg and # its built-in SVG coder can't handle embedded base64 raster <image> # elements. See docker/im-convert.sh for the full rationale. -COPY im-convert.sh /usr/local/bin/im-convert +COPY docker/im-convert.sh /usr/local/bin/im-convert RUN dos2unix /usr/local/bin/im-convert && chmod +x /usr/local/bin/im-convert ENTRYPOINT ["/usr/local/bin/entrypoint.sh"] |