diff options
| author | Dirk Baechle <dl9obn@darc.de> | 2020-06-20 11:26:19 (GMT) |
|---|---|---|
| committer | Dirk Baechle <dl9obn@darc.de> | 2020-06-20 11:42:39 (GMT) |
| commit | 1bae51f1d624072dc6b134bf990efa1e4baf1361 (patch) | |
| tree | f26af2c778a21e2523071376e275616280ace10f /testing | |
| parent | 7cfdbee35d78cf8a550d6f3e5c132358e8fd4155 (diff) | |
| download | SCons-1bae51f1d624072dc6b134bf990efa1e4baf1361.zip SCons-1bae51f1d624072dc6b134bf990efa1e4baf1361.tar.gz SCons-1bae51f1d624072dc6b134bf990efa1e4baf1361.tar.bz2 | |
Added Sphinx support to the 'build' Docker images.
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/docker/fedora32/build/Dockerfile | 2 | ||||
| -rw-r--r-- | testing/docker/ubuntu19.10/build/Dockerfile | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/testing/docker/fedora32/build/Dockerfile b/testing/docker/fedora32/build/Dockerfile index 8d31d29..d4ef38d 100644 --- a/testing/docker/fedora32/build/Dockerfile +++ b/testing/docker/fedora32/build/Dockerfile @@ -4,7 +4,7 @@ FROM fedora:32 LABEL version="0.0.1" maintainer="Dirk Baechle <dl9obn@darc.de>" description="SCons Release Build, based on a Fedora 32" # Install additional packages -RUN dnf -y install git python3-lxml fop fontbox python3-devel lynx xterm vim vim-common nano unzip +RUN dnf -y install git python3-lxml binutils fop fontbox python3-devel python3-sphinx python3-sphinx_rtd_theme lynx xterm vim vim-common nano unzip # Install hyphenation patterns for FOP RUN mkdir /opt/offo && cd /opt/offo && curl -L --output offo-hyphenation-compiled.zip https://sourceforge.net/projects/offo/files/offo-hyphenation/2.2/offo-hyphenation-compiled.zip/download && unzip offo-hyphenation-compiled.zip && cp offo-hyphenation-compiled/fop-hyph.jar /usr/share/fop/ diff --git a/testing/docker/ubuntu19.10/build/Dockerfile b/testing/docker/ubuntu19.10/build/Dockerfile index 38f4dd7..06771de 100644 --- a/testing/docker/ubuntu19.10/build/Dockerfile +++ b/testing/docker/ubuntu19.10/build/Dockerfile @@ -4,14 +4,9 @@ FROM ubuntu:19.10 LABEL version="0.0.1" maintainer="Dirk Baechle <dl9obn@darc.de>" description="SCons Release Build, based on an Ubuntu 19.10" # Install additional packages -RUN apt-get update && apt-get -y install git python3-lxml fop libfontbox-java python3-dev rpm tar curl lynx xterm vim vim-common nano sudo +RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install binutils git python3-lxml fop libfontbox-java python3-dev python3-sphinx python3-sphinx-rtd-theme rpm tar curl lynx xterm vim vim-common nano sudo # Install hyphenation patterns for FOP RUN mkdir /opt/offo && cd /opt/offo && curl -L --output offo-hyphenation-compiled.zip https://sourceforge.net/projects/offo/files/offo-hyphenation/2.2/offo-hyphenation-compiled.zip/download && unzip offo-hyphenation-compiled.zip && cp offo-hyphenation-compiled/fop-hyph.jar /usr/share/fop/ -# Epydoc can be installed via pip3, but it doesn't seem to work properly. -# For the moment we don't install it and might replace it with Sphinx later... -# RUN apt-get -y install python3-pip && pip3 install epydoc - CMD ["/bin/bash"] - |