openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-26 22:52:34 +02:00
Code Issues Releases Wiki Activity

util/docker: Update the script that updates the website

Browse Source 
- 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:
Patrick Georgi 2025-03-02 13:23:56 +01:00
parent 73666de3f2
commit f5a3c7a35b
3 changed files with 12 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
util/docker/flashrom.org/Dockerfile
View File

@ -1,29 +1,12 @@
FROM alpine:3.8 FROM alpine:3.21
COPY makeSphinx.sh /makeSphinx.sh RUN apk add --no-cache sphinx py3-sphinx_rtd_theme bash git meson ninja gcc musl-dev pkgconf
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
VOLUME /data-in /data-out VOLUME /data-in /data-out
# For Sphinx-autobuild COPY makeSphinx.sh /makeSphinx.sh
# Port 8000 - HTTP server
# Port 35729 - websockets connection to allow automatic browser reloads after each build ENV MESON_PACKAGE_CACHE_DIR /tmp/meson-pkgcache/
EXPOSE 8000 35729
ENTRYPOINT ["/bin/bash", "/makeSphinx.sh"] ENTRYPOINT ["/bin/bash", "/makeSphinx.sh"]
CMD [] CMD []

2
util/docker/flashrom.org/ditaa.sh
View File

@ -1,2 +0,0 @@
#!/usr/bin/env sh
exec java -jar /usr/lib/ditaa0_9.jar $*

18
util/docker/flashrom.org/makeSphinx.sh
View File

@ -1,12 +1,8 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -e
if [ "$1" == "livehtml" ]; then cd /data-in/
echo "Starting live documentation build" meson setup /tmp/build -Ddocumentation=enabled -Dgenerate_authors_list=enabled
cd /data-in/ && sphinx-autobuild -b html doc /tmp/build/html ninja -C /tmp/build doc/html
else rm -rf /data-out/*
echo "Starting production documentation build" mv /tmp/build/doc/html/* /data-out/
cd /data-in/ \ rm -rf /tmp/build
&& sphinx-build -b html doc /tmp/build/html \
&& rm -rf /data-out/* \
&& mv /tmp/build/html/* /data-out/
fi