Commit 7a82dc42 authored by Ondřej Surý's avatar Ondřej Surý Committed by Michał Kępień

Add sphinx-doc dependencies to buster image

parent 2aa539bb
......@@ -40,6 +40,7 @@ dnstap_debian_sid_i386 := yes
python_qa_debian_buster_amd64 := yes
respdiff_debian_buster_amd64 := yes
shellcheck_debian_sid_amd64 := yes
sphinx_debian_buster_amd64 := yes
# Install latest stable version of LLVM/Clang
clang_debian_stretch_amd64 := 10
......@@ -88,6 +89,7 @@ $(TARGETS): PYTHON_QA = $(python_qa_$(VENDOR)_$(VERSION)_$(ARCH))
$(TARGETS): RESPDIFF = $(respdiff_$(VENDOR)_$(VERSION)_$(ARCH))
$(TARGETS): SHELLCHECK = $(shellcheck_$(VENDOR)_$(VERSION)_$(ARCH))
$(TARGETS): SOFTHSM = $(softhsm_$(VENDOR)_$(VERSION)_$(ARCH))
$(TARGETS): SPHINX = $(sphinx_$(VENDOR)_$(VERSION)_$(ARCH))
$(TARGETS):
$(info Building $(CI_REGISTRY_IMAGE)/$(CI_REGISTRY_NAME) from $(SOURCE_IMAGE))
mkdir -p bind9/$@
......@@ -105,6 +107,7 @@ $(TARGETS):
-e 's,@RESPDIFF@,$(RESPDIFF),g' \
-e 's,@SHELLCHECK@,$(SHELLCHECK),g' \
-e 's,@SOFTHSM@,$(SOFTHSM),g' \
-e 's,@SPHINX@,$(SPHINX),g' \
-e 's,@SOURCE_IMAGE@,$(SOURCE_IMAGE),g' \
-e 's,@VENDOR@,$(VENDOR),g' \
-e 's,@VERSION@,$(VERSION),g' \
......
......@@ -72,8 +72,6 @@ RUN apt-get -y install \
python3-ply \
python3-pytest \
python3-requests \
python3-sphinx \
python3-sphinx-rtd-theme \
sudo \
xsltproc \
zip \
......@@ -111,6 +109,7 @@ RUN if [ "@RESPDIFF@" = "yes" ]; then apt-get -y install python3-dpkt python3-lm
RUN if [ "@SHELLCHECK@" = "yes" ]; then apt-get -y install shellcheck; fi
RUN if [ "@SOFTHSM@" -ge "2" ] 2>/dev/null; then apt-get -y install libsofthsm2 softhsm2; fi
RUN if [ "@SOFTHSM@" -lt "2" ] 2>/dev/null; then apt-get -y install libsofthsm softhsm; fi
RUN if [ "@SPHINX@" = "yes" ] 2>/dev/null; then apt-get -y install python3-sphinx python3-sphinx-rtd-theme texlive-full texlive-xetex xindy; fi
COPY kyua.tar /
RUN if [ ! -s /kyua.tar ]; then \
curl -sSL "https://github.com/jmmv/atf/releases/download/atf-${ATF_VERSION}/atf-${ATF_VERSION}.tar.gz" | tar -xz -C /usr/src && \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment