mirror of
https://review.coreboot.org/flashrom.git
synced 2025-04-26 14:42:36 +02:00
util/docker: Update the script that updates the website
- Update the base system (alpine 3.8 -> 3.21) - Update sphinx and its modules (and from pip-install to alpine-install) - Remove unused features that increase maintenance overhead (autobuild/livehtml and ditaa) - Use the build system to generate docs (instead of calling sphinx in its own, custom ways) Change-Id: I844e4ea84b94444c96f29325fee205b0deb972da Signed-off-by: Patrick Georgi <patrick@georgi-clan.de> Reviewed-on: https://review.coreboot.org/c/flashrom/+/86681 Reviewed-by: Anastasia Klimchuk <aklm@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
parent
73666de3f2
commit
f5a3c7a35b
@ -1,29 +1,12 @@
|
||||
FROM alpine:3.8
|
||||
FROM alpine:3.21
|
||||
|
||||
COPY makeSphinx.sh /makeSphinx.sh
|
||||
|
||||
ADD https://sourceforge.net/projects/ditaa/files/ditaa/0.9/ditaa0_9.zip/download /tmp/ditaa.zip
|
||||
|
||||
RUN apk add --no-cache python3 make bash git openjdk8-jre ttf-dejavu fontconfig \
|
||||
&& pip3 install --upgrade --no-cache-dir pip \
|
||||
&& pip3 install --no-cache-dir \
|
||||
sphinx===1.8.3 \
|
||||
sphinx_rtd_theme===0.4.2 \
|
||||
recommonmark===0.5.0 \
|
||||
sphinx_autobuild===0.7.1 \
|
||||
sphinxcontrib-ditaa===0.6 \
|
||||
&& chmod 755 /makeSphinx.sh
|
||||
RUN cd /tmp \
|
||||
&& unzip ditaa.zip \
|
||||
&& mv ditaa0_9.jar /usr/lib
|
||||
ADD ditaa.sh /usr/bin/ditaa
|
||||
RUN apk add --no-cache sphinx py3-sphinx_rtd_theme bash git meson ninja gcc musl-dev pkgconf
|
||||
|
||||
VOLUME /data-in /data-out
|
||||
|
||||
# For Sphinx-autobuild
|
||||
# Port 8000 - HTTP server
|
||||
# Port 35729 - websockets connection to allow automatic browser reloads after each build
|
||||
EXPOSE 8000 35729
|
||||
COPY makeSphinx.sh /makeSphinx.sh
|
||||
|
||||
ENV MESON_PACKAGE_CACHE_DIR /tmp/meson-pkgcache/
|
||||
|
||||
ENTRYPOINT ["/bin/bash", "/makeSphinx.sh"]
|
||||
CMD []
|
||||
|
@ -1,2 +0,0 @@
|
||||
#!/usr/bin/env sh
|
||||
exec java -jar /usr/lib/ditaa0_9.jar $*
|
@ -1,12 +1,8 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
if [ "$1" == "livehtml" ]; then
|
||||
echo "Starting live documentation build"
|
||||
cd /data-in/ && sphinx-autobuild -b html doc /tmp/build/html
|
||||
else
|
||||
echo "Starting production documentation build"
|
||||
cd /data-in/ \
|
||||
&& sphinx-build -b html doc /tmp/build/html \
|
||||
&& rm -rf /data-out/* \
|
||||
&& mv /tmp/build/html/* /data-out/
|
||||
fi
|
||||
set -e
|
||||
cd /data-in/
|
||||
meson setup /tmp/build -Ddocumentation=enabled -Dgenerate_authors_list=enabled
|
||||
ninja -C /tmp/build doc/html
|
||||
rm -rf /data-out/*
|
||||
mv /tmp/build/doc/html/* /data-out/
|
||||
rm -rf /tmp/build
|
||||
|
Loading…
x
Reference in New Issue
Block a user