Skip to content

Commit

Permalink
docker: add sphinx dependencies to Dockerfiles
Browse files Browse the repository at this point in the history
Prepare for conversion to sphinx for documentation.

Remove ruby and asciidoctor, add sphinx and other deps.
  • Loading branch information
gonsie authored and grondo committed Jul 24, 2020
1 parent 8e25d95 commit a844f06
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 12 deletions.
9 changes: 4 additions & 5 deletions src/test/docker/bionic/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ RUN apt-get update \
sudo \
vim \
luarocks \
ruby \
munge \
lcov \
ccache \
Expand Down Expand Up @@ -61,7 +60,9 @@ RUN apt-get update \
python3-wheel \
&& rm -rf /var/lib/apt/lists/* \
&& for PY in python3.6 python3.7 python3.8 ; do \
sudo $PY -m pip install --upgrade --ignore-installed coverage cffi six pyyaml jsonschema ; \
sudo $PY -m pip install --upgrade --ignore-installed \
coverage cffi six pyyaml jsonschema \
sphinx sphinx-rtd-theme sphinxcontrib-spelling; \
done ; \
apt-get -qq purge -y python3-pip \
&& apt-get -qq autoremove -y
Expand Down Expand Up @@ -90,6 +91,7 @@ RUN apt-get update \
libfaketime \
pylint \
cppcheck \
enchant \
aspell \
aspell-en \
&& rm -rf /var/lib/apt/lists/*
Expand All @@ -99,9 +101,6 @@ RUN locale-gen en_US.UTF-8
# NOTE: luaposix installed by rocks due to Ubuntu bug: #1752082 https://bugs.launchpad.net/ubuntu/+source/lua-posix/+bug/1752082
RUN luarocks install luaposix

# NOTE: we need asciidoctor 1.5.7 to handle manpages, install with gem install
RUN /usr/bin/gem install asciidoctor

# Install caliper by hand for now:
RUN mkdir caliper \
&& cd caliper \
Expand Down
7 changes: 4 additions & 3 deletions src/test/docker/centos7/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ RUN yum -y update \
python36-six \
python36-yaml \
python36-jsonschema \
ruby \
sqlite \
valgrind \
valgrind-devel \
man-db \
enchant \
aspell \
aspell-en \
devtoolset-7-make \
Expand All @@ -64,15 +64,16 @@ RUN yum -y update \
libs3-devel \
&& yum clean all

# Sphinx packages for docs
RUN python3 -m pip install sphinx sphinx-rtd-theme sphinxcontrib-spelling

# The cmake from yum is incredibly ancient, download a less ancient one
RUN wget -q --no-check-certificate https://cmake.org/files/v3.10/cmake-3.10.1-Linux-x86_64.tar.gz\
&& tar -xzf cmake-3.10.1-Linux-x86_64.tar.gz\
&& cp -fR cmake-3.10.1-Linux-x86_64/* /usr\
&& rm -rf cmake-3.10.1-Linux-x86_64\
&& rm cmake-3.10.1-Linux-x86_64.tar.gz

RUN /usr/bin/gem install asciidoctor

# Install caliper by hand for now:
RUN mkdir caliper \
&& cd caliper \
Expand Down
7 changes: 4 additions & 3 deletions src/test/docker/centos8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ RUN yum -y install \
man-db \
git \
sudo \
ruby \
munge \
ccache \
lua \
Expand All @@ -40,7 +39,7 @@ RUN yum -y install \
gcc-c++ \
make \
cmake

# Python
RUN yum -y install \
python36 \
Expand Down Expand Up @@ -72,6 +71,7 @@ RUN yum -y install \
lua-posix \
libfaketime \
cppcheck \
enchant \
aspell \
aspell-en

Expand All @@ -84,7 +84,8 @@ RUN alternatives --set python /usr/bin/python3
# Add /usr/bin/mpicc link so MPI tests are built
RUN alternatives --install /usr/bin/mpicc mpicc /usr/lib64/mpich/bin/mpicc 100

RUN /usr/bin/gem install asciidoctor
# Sphinx packages for docs
RUN python3 -m pip install sphinx sphinx-rtd-theme sphinxcontrib-spelling

# Install caliper by hand for now:
RUN mkdir caliper \
Expand Down
5 changes: 4 additions & 1 deletion src/test/docker/focal/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ RUN apt-get update \
lua-posix \
mpich \
valgrind \
asciidoctor \
jq \
&& rm -rf /var/lib/apt/lists/*

Expand Down Expand Up @@ -70,6 +69,9 @@ RUN apt-get update \
python3-jsonschema \
&& rm -rf /var/lib/apt/lists/*

# Sphinx packages for docs
RUN python3 -m pip install sphinx sphinx-rtd-theme sphinxcontrib-spelling

# Other deps
RUN apt-get update \
&& apt-get -qq install -y --no-install-recommends \
Expand All @@ -95,6 +97,7 @@ RUN apt-get update \
libfaketime \
pylint \
cppcheck \
enchant \
aspell \
aspell-en \
&& rm -rf /var/lib/apt/lists/*
Expand Down

0 comments on commit a844f06

Please sign in to comment.