diff options
Diffstat (limited to 'util/docker')
| -rw-r--r-- | util/docker/coreboot-jenkins-node/Dockerfile | 12 | ||||
| -rw-r--r-- | util/docker/doc.coreboot.org/Dockerfile | 24 | ||||
| -rwxr-xr-x | util/docker/doc.coreboot.org/ditaa.sh | 2 |
3 files changed, 18 insertions, 20 deletions
diff --git a/util/docker/coreboot-jenkins-node/Dockerfile b/util/docker/coreboot-jenkins-node/Dockerfile index de1ccbd866..ae29e435ed 100644 --- a/util/docker/coreboot-jenkins-node/Dockerfile +++ b/util/docker/coreboot-jenkins-node/Dockerfile @@ -75,12 +75,12 @@ RUN echo "export PATH=$PATH:/opt/xgcc/bin" >> /home/coreboot/.bashrc && \ pip3 install --upgrade --no-cache-dir pip \ && pip3 install --no-cache-dir \ setuptools==58.2.0 \ - jinja2==3.0.3 \ - recommonmark===0.5.0 \ - sphinx===1.8.3 \ - sphinxcontrib-ditaa===0.6 \ - sphinx_autobuild===0.7.1 \ - sphinx_rtd_theme===0.4.2 \ + jinja2==3.1.2 \ + recommonmark===0.7.1 \ + sphinx===6.2.1 \ + sphinxcontrib-ditaa===1.0.2 \ + sphinx_autobuild===2021.3.14 \ + sphinx_rtd_theme===1.2.2 \ && mkdir -p /home/coreboot/.ssh && \ echo "{{SSH_KEY}}" > /home/coreboot/.ssh/authorized_keys && \ chmod 0700 /home/coreboot/.ssh && \ diff --git a/util/docker/doc.coreboot.org/Dockerfile b/util/docker/doc.coreboot.org/Dockerfile index a2e8f7b299..df741d81df 100644 --- a/util/docker/doc.coreboot.org/Dockerfile +++ b/util/docker/doc.coreboot.org/Dockerfile @@ -1,23 +1,21 @@ -FROM alpine:3.8 +FROM alpine:3.18.3 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 \ +RUN apk add --no-cache python3 py3-pip make bash git openjdk8-jre ttf-dejavu fontconfig \ && pip3 install --upgrade --no-cache-dir pip \ && pip3 install --no-cache-dir \ - jinja2==3.0.3 \ - recommonmark===0.5.0 \ - sphinx===1.8.3 \ - sphinxcontrib-ditaa===0.6 \ - sphinx_autobuild===0.7.1 \ - sphinx_rtd_theme===0.4.2 \ + jinja2==3.1.2 \ + recommonmark===0.7.1\ + sphinx===6.2.1 \ + sphinxcontrib-ditaa===1.0.2 \ + sphinx_autobuild===2021.3.14 \ + sphinx_rtd_theme===1.2.2 \ && chmod 755 /makeSphinx.sh -RUN cd /tmp \ - && unzip ditaa.zip \ - && mv ditaa0_9.jar /usr/lib +ADD https://github.com/stathissideris/ditaa/releases/download/v0.11.0/ditaa-0.11.0-standalone.jar \ + /usr/lib/ditaa-0.11.0-standalone.jar + ADD ditaa.sh /usr/bin/ditaa VOLUME /data-in /data-out diff --git a/util/docker/doc.coreboot.org/ditaa.sh b/util/docker/doc.coreboot.org/ditaa.sh index 637379f3e7..305deefdf2 100755 --- a/util/docker/doc.coreboot.org/ditaa.sh +++ b/util/docker/doc.coreboot.org/ditaa.sh @@ -1,2 +1,2 @@ #!/usr/bin/env sh -exec java -jar /usr/lib/ditaa0_9.jar $* +exec java -jar /usr/lib/ditaa-0.11.0-standalone.jar $* |