No need for documentation build deps on crossbuild checks

diff --git a/scripts/docker/build/debian12/Dockerfile.cb b/scripts/docker/build/debian12/Dockerfile.cb
index 16d009cb50dad58e484e0f3112431fa702aab5b2..3f3bf6ae86cf80f12e9fe0157783fd0309cd07f8 100644 (file)
--- a/scripts/docker/build/debian12/Dockerfile.cb
+++ b/scripts/docker/build/debian12/Dockerfile.cb
@@ -19,7 +19,6 @@ ARG DEBIAN_FRONTEND=noninteractive
 #
 RUN apt-get update && \
     apt-get install $APT_OPTS \
-        software-properties-common \
         devscripts \
         equivs \
         git \
@@ -66,35 +65,6 @@ RUN apt-get install $APT_OPTS \
         oathtool
 
 
-#
-#  Documentation build dependencies
-#
-
-WORKDIR /tmp
-
-#  - doxygen & JSON.pm
-RUN apt-get install $APT_OPTS \
-        doxygen \
-        graphviz \
-        libjson-perl
-
-#  - antora (needs npm)
-RUN bash -c "$(wget -O - https://deb.nodesource.com/setup_20.x)" && \
-    apt-get install $APT_OPTS nodejs && \
-    npm i -g @antora/cli@3.1.7 @antora/site-generator-default@3.1.7
-
-#  - pandoc
-RUN wget $(wget -qO - https://api.github.com/repos/jgm/pandoc/releases/latest | sed -ne 's/.*"browser_download_url".*"\(.*amd64\.deb\)"/\1/ p') && \
-    find . -mindepth 1 -maxdepth 1 -type f -name 'pandoc-*.deb' -print0 | \
-        xargs -0 -r apt-get install $APT_OPTS && \
-    find . -mindepth 1 -maxdepth 1 -type f -name 'pandoc-*.deb' -delete
-
-#  - asciidoctor
-RUN apt-get install $APT_OPTS \
-    ruby ruby-dev && \
-    gem install asciidoctor
-
-
 #
 #  Setup a src dir in /usr/local
 #

diff --git a/scripts/docker/build/debian13/Dockerfile.cb b/scripts/docker/build/debian13/Dockerfile.cb
index 244ce7c41d97b4574c1e16d0cd94aa917ecfbcd4..c69ca954523a0ce60f9878899ddf076172f7839f 100644 (file)
--- a/scripts/docker/build/debian13/Dockerfile.cb
+++ b/scripts/docker/build/debian13/Dockerfile.cb
@@ -65,35 +65,6 @@ RUN apt-get install $APT_OPTS \
         oathtool
 
 
-#
-#  Documentation build dependencies
-#
-
-WORKDIR /tmp
-
-#  - doxygen & JSON.pm
-RUN apt-get install $APT_OPTS \
-        doxygen \
-        graphviz \
-        libjson-perl
-
-#  - antora (needs npm)
-RUN bash -c "$(wget -O - https://deb.nodesource.com/setup_20.x)" && \
-    apt-get install $APT_OPTS nodejs && \
-    npm i -g @antora/cli@3.1.7 @antora/site-generator-default@3.1.7
-
-#  - pandoc
-RUN wget $(wget -qO - https://api.github.com/repos/jgm/pandoc/releases/latest | sed -ne 's/.*"browser_download_url".*"\(.*amd64\.deb\)"/\1/ p') && \
-    find . -mindepth 1 -maxdepth 1 -type f -name 'pandoc-*.deb' -print0 | \
-        xargs -0 -r apt-get install $APT_OPTS && \
-    find . -mindepth 1 -maxdepth 1 -type f -name 'pandoc-*.deb' -delete
-
-#  - asciidoctor
-RUN apt-get install $APT_OPTS \
-    ruby ruby-dev && \
-    gem install asciidoctor
-
-
 #
 #  Setup a src dir in /usr/local
 #

diff --git a/scripts/docker/build/debiansid/Dockerfile.cb b/scripts/docker/build/debiansid/Dockerfile.cb
index 7d6bf96ece655d2d12a39e78cd046b132ce1b56d..8db8238c4797d0b04c0b40da1758eeca1d46c082 100644 (file)
--- a/scripts/docker/build/debiansid/Dockerfile.cb
+++ b/scripts/docker/build/debiansid/Dockerfile.cb
@@ -19,7 +19,6 @@ ARG DEBIAN_FRONTEND=noninteractive
 #
 RUN apt-get update && \
     apt-get install $APT_OPTS \
-        software-properties-common \
         devscripts \
         equivs \
         git \
@@ -70,35 +69,6 @@ RUN apt-get install $APT_OPTS \
         oathtool
 
 
-#
-#  Documentation build dependencies
-#
-
-WORKDIR /tmp
-
-#  - doxygen & JSON.pm
-RUN apt-get install $APT_OPTS \
-        doxygen \
-        graphviz \
-        libjson-perl
-
-#  - antora (needs npm)
-RUN bash -c "$(wget -O - https://deb.nodesource.com/setup_20.x)" && \
-    apt-get install $APT_OPTS nodejs && \
-    npm i -g @antora/cli@3.1.7 @antora/site-generator-default@3.1.7
-
-#  - pandoc
-RUN wget $(wget -qO - https://api.github.com/repos/jgm/pandoc/releases/latest | sed -ne 's/.*"browser_download_url".*"\(.*amd64\.deb\)"/\1/ p') && \
-    find . -mindepth 1 -maxdepth 1 -type f -name 'pandoc-*.deb' -print0 | \
-        xargs -0 -r apt-get install $APT_OPTS && \
-    find . -mindepth 1 -maxdepth 1 -type f -name 'pandoc-*.deb' -delete
-
-#  - asciidoctor
-RUN apt-get install $APT_OPTS \
-    ruby ruby-dev && \
-    gem install asciidoctor
-
-
 #
 #  Setup a src dir in /usr/local
 #

diff --git a/scripts/docker/build/rocky10/Dockerfile.cb b/scripts/docker/build/rocky10/Dockerfile.cb
index 5821a2028230d2b29fa5719c599241901b269bd7..9eb824da9e7b189ea8190f49142b96b8d8014148 100644 (file)
--- a/scripts/docker/build/rocky10/Dockerfile.cb
+++ b/scripts/docker/build/rocky10/Dockerfile.cb
@@ -16,23 +16,6 @@ RUN dnf install -y rpmdevtools openssl epel-release git procps dnf-utils \
 
 RUN dnf config-manager --set-enabled crb
 
-#
-#  Documentation build dependencies
-#
-
-#  - doxygen & JSON.pm
-RUN dnf install -y doxygen graphviz perl-JSON
-#  - antora (npm needed)
-RUN curl -sL https://rpm.nodesource.com/setup_20.x | bash -
-RUN dnf install -y nodejs
-RUN npm i -g @antora/cli@3.1.7 @antora/site-generator-default@3.1.7
-#  - pandoc
-RUN curl -o - -L $(curl -s https://api.github.com/repos/jgm/pandoc/releases/latest | grep "browser_download_url.*tar.gz" | cut -d '"' -f 4 | head -1) | tar xzvf - -C /tmp/
-RUN mv /tmp/pandoc-*/bin/* /usr/local/bin
-#  - asciidoctor
-RUN dnf install -y rubygems-devel
-RUN gem install asciidoctor
-
 #
 #  Setup a src dir in /usr/local
 #

diff --git a/scripts/docker/build/rocky9/Dockerfile.cb b/scripts/docker/build/rocky9/Dockerfile.cb
index 124c704a8d15c94e6b15b9e5abcd1247c768bcd9..824c69f3b8efb4f14571722f0d454a3b7e99d354 100644 (file)
--- a/scripts/docker/build/rocky9/Dockerfile.cb
+++ b/scripts/docker/build/rocky9/Dockerfile.cb
@@ -16,23 +16,6 @@ RUN dnf install -y rpmdevtools openssl epel-release git procps dnf-utils \
 
 RUN dnf config-manager --set-enabled crb
 
-#
-#  Documentation build dependencies
-#
-
-#  - doxygen & JSON.pm
-RUN dnf install -y doxygen graphviz perl-JSON
-#  - antora (npm needed)
-RUN curl -sL https://rpm.nodesource.com/setup_20.x | bash -
-RUN dnf install -y nodejs
-RUN npm i -g @antora/cli@3.1.7 @antora/site-generator-default@3.1.7
-#  - pandoc
-RUN curl -o - -L $(curl -s https://api.github.com/repos/jgm/pandoc/releases/latest | grep "browser_download_url.*tar.gz" | cut -d '"' -f 4 | head -1) | tar xzvf - -C /tmp/
-RUN mv /tmp/pandoc-*/bin/* /usr/local/bin
-#  - asciidoctor
-RUN dnf install -y rubygems-devel
-RUN gem install asciidoctor
-
 #
 #  Setup a src dir in /usr/local
 #

diff --git a/scripts/docker/build/ubuntu22/Dockerfile.cb b/scripts/docker/build/ubuntu22/Dockerfile.cb
index 486b4392a84debbaebf784f7f0344cee9ea3fe16..a58ff32f44cd4975af87ddde2a320e70284810fe 100644 (file)
--- a/scripts/docker/build/ubuntu22/Dockerfile.cb
+++ b/scripts/docker/build/ubuntu22/Dockerfile.cb
@@ -19,7 +19,6 @@ ARG DEBIAN_FRONTEND=noninteractive
 #
 RUN apt-get update && \
     apt-get install $APT_OPTS \
-        software-properties-common \
         devscripts \
         equivs \
         git \
@@ -66,35 +65,6 @@ RUN apt-get install $APT_OPTS \
         oathtool
 
 
-#
-#  Documentation build dependencies
-#
-
-WORKDIR /tmp
-
-#  - doxygen & JSON.pm
-RUN apt-get install $APT_OPTS \
-        doxygen \
-        graphviz \
-        libjson-perl
-
-#  - antora (needs npm)
-RUN bash -c "$(wget -O - https://deb.nodesource.com/setup_20.x)" && \
-    apt-get install $APT_OPTS nodejs && \
-    npm i -g @antora/cli@3.1.7 @antora/site-generator-default@3.1.7
-
-#  - pandoc
-RUN wget $(wget -qO - https://api.github.com/repos/jgm/pandoc/releases/latest | sed -ne 's/.*"browser_download_url".*"\(.*amd64\.deb\)"/\1/ p') && \
-    find . -mindepth 1 -maxdepth 1 -type f -name 'pandoc-*.deb' -print0 | \
-        xargs -0 -r apt-get install $APT_OPTS && \
-    find . -mindepth 1 -maxdepth 1 -type f -name 'pandoc-*.deb' -delete
-
-#  - asciidoctor
-RUN apt-get install $APT_OPTS \
-    ruby ruby-dev && \
-    gem install asciidoctor
-
-
 #
 #  Setup a src dir in /usr/local
 #

diff --git a/scripts/docker/build/ubuntu24/Dockerfile.cb b/scripts/docker/build/ubuntu24/Dockerfile.cb
index e099653c504920920edc8b6c9e2680667d88859b..5c8dfd82c66d6c5f80ceaabc071ac36ce797a2e2 100644 (file)
--- a/scripts/docker/build/ubuntu24/Dockerfile.cb
+++ b/scripts/docker/build/ubuntu24/Dockerfile.cb
@@ -19,7 +19,6 @@ ARG DEBIAN_FRONTEND=noninteractive
 #
 RUN apt-get update && \
     apt-get install $APT_OPTS \
-        software-properties-common \
         devscripts \
         equivs \
         git \
@@ -66,35 +65,6 @@ RUN apt-get install $APT_OPTS \
         oathtool
 
 
-#
-#  Documentation build dependencies
-#
-
-WORKDIR /tmp
-
-#  - doxygen & JSON.pm
-RUN apt-get install $APT_OPTS \
-        doxygen \
-        graphviz \
-        libjson-perl
-
-#  - antora (needs npm)
-RUN bash -c "$(wget -O - https://deb.nodesource.com/setup_20.x)" && \
-    apt-get install $APT_OPTS nodejs && \
-    npm i -g @antora/cli@3.1.7 @antora/site-generator-default@3.1.7
-
-#  - pandoc
-RUN wget $(wget -qO - https://api.github.com/repos/jgm/pandoc/releases/latest | sed -ne 's/.*"browser_download_url".*"\(.*amd64\.deb\)"/\1/ p') && \
-    find . -mindepth 1 -maxdepth 1 -type f -name 'pandoc-*.deb' -print0 | \
-        xargs -0 -r apt-get install $APT_OPTS && \
-    find . -mindepth 1 -maxdepth 1 -type f -name 'pandoc-*.deb' -delete
-
-#  - asciidoctor
-RUN apt-get install $APT_OPTS \
-    ruby ruby-dev && \
-    gem install asciidoctor
-
-
 #
 #  Setup a src dir in /usr/local
 #

diff --git a/scripts/docker/m4/crossbuild.deb.m4 b/scripts/docker/m4/crossbuild.deb.m4
index 4650dc774855456d5ba0c9dac1c31b8f01a64210..c5e73b8a6d01a5a0a068a4009080b4460a11f39c 100644 (file)
--- a/scripts/docker/m4/crossbuild.deb.m4
+++ b/scripts/docker/m4/crossbuild.deb.m4
@@ -94,37 +94,6 @@ dnl for tests:
         oathtool
 
 
-#
-#  Documentation build dependencies
-#
-define(`NODE_VER', `20')dnl
-define(`ANTORA_VER', `3.1.7')dnl
-
-WORKDIR /tmp
-
-#  - doxygen & JSON.pm
-RUN apt-get install $APT_OPTS \
-        doxygen \
-        graphviz \
-        libjson-perl
-
-#  - antora (needs npm)
-RUN bash -c "$(wget -O - https://deb.nodesource.com/setup_`'NODE_VER.x)" && \
-    apt-get install $APT_OPTS nodejs && \
-    npm i -g @antora/cli@ANTORA_VER @antora/site-generator-default@ANTORA_VER
-
-#  - pandoc
-RUN wget $(wget -qO - https://api.github.com/repos/jgm/pandoc/releases/latest | sed -ne 's/.*"browser_download_url".*"\(.*amd64\.deb\)"/\1/ p') && \
-    find . -mindepth 1 -maxdepth 1 -type f -name 'pandoc-*.deb' -print0 | \
-        xargs -0 -r apt-get install $APT_OPTS && \
-    find . -mindepth 1 -maxdepth 1 -type f -name 'pandoc-*.deb' -delete
-
-#  - asciidoctor
-RUN apt-get install $APT_OPTS \
-    ruby ruby-dev && \
-    gem install asciidoctor
-
-
 #
 #  Setup a src dir in /usr/local
 #

diff --git a/scripts/docker/m4/crossbuild.rpm.m4 b/scripts/docker/m4/crossbuild.rpm.m4
index 70b459c02b49e0dfcf68251bd2cba8dda7db33f1..3be5bb75fd287b1b403d2a7216804f44d257f446 100644 (file)
--- a/scripts/docker/m4/crossbuild.rpm.m4
+++ b/scripts/docker/m4/crossbuild.rpm.m4
@@ -11,25 +11,6 @@ RUN dnf install -y rpmdevtools openssl epel-release git procps dnf-utils \
 
 RUN dnf config-manager --set-enabled crb
 
-#
-#  Documentation build dependencies
-#
-define(`NODE_VER', `20')dnl
-define(`ANTORA_VER', `3.1.7')dnl
-
-#  - doxygen & JSON.pm
-RUN dnf install -y doxygen graphviz perl-JSON
-#  - antora (npm needed)
-RUN curl -sL https://rpm.nodesource.com/setup_`'NODE_VER.x | bash -
-RUN dnf install -y nodejs
-RUN npm i -g @antora/cli@ANTORA_VER @antora/site-generator-default@ANTORA_VER
-#  - pandoc
-RUN curl -o - -L $(curl -s https://api.github.com/repos/jgm/pandoc/releases/latest | grep "browser_download_url.*tar.gz" | cut -d '"' -f 4 | head -1) | tar xzvf - -C /tmp/
-RUN mv /tmp/pandoc-*/bin/* /usr/local/bin
-#  - asciidoctor
-RUN dnf install -y rubygems-devel
-RUN gem install asciidoctor
-
 #
 #  Setup a src dir in /usr/local
 #