From: Ian Wienand Date: Tue, 22 Oct 2024 23:55:38 +0000 (+1100) Subject: docs: also install asciidoctor in container X-Git-Tag: 106~353 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7455de2e54abeadfcccda62cd47ccf8b38dc9070;p=thirdparty%2Fdracut-ng.git docs: also install asciidoctor in container This is a pre-requirement change to enable building man pages with an asciidoctor toolchain in CI. --- diff --git a/test/container/Dockerfile-alpine b/test/container/Dockerfile-alpine index b40c003a4..937019891 100644 --- a/test/container/Dockerfile-alpine +++ b/test/container/Dockerfile-alpine @@ -7,6 +7,7 @@ ENV CC=clang # see https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/61369 RUN apk add --no-cache \ asciidoc \ + asciidoctor \ bash \ binutils \ blkid \ diff --git a/test/container/Dockerfile-arch b/test/container/Dockerfile-arch index 2ed839d8d..e54a69a07 100644 --- a/test/container/Dockerfile-arch +++ b/test/container/Dockerfile-arch @@ -5,6 +5,7 @@ ENV TEST_FSTYPE=xfs RUN pacman --noconfirm -Syu \ asciidoc \ + asciidoctor \ astyle \ base-devel \ bluez \ diff --git a/test/container/Dockerfile-debian b/test/container/Dockerfile-debian index f9df68a03..2ab8ae8a1 100644 --- a/test/container/Dockerfile-debian +++ b/test/container/Dockerfile-debian @@ -9,6 +9,7 @@ FROM docker.io/${DISTRIBUTION} RUN apt-get update -y -qq && apt-get upgrade -y -qq && apt-get install -y -qq --no-install-recommends dracut && \ DEBIAN_FRONTEND=noninteractive apt-get install -y -qq --no-install-recommends -o Dpkg::Use-Pty=0 \ asciidoc \ + asciidoctor \ astyle \ bluez \ btrfs-progs \ diff --git a/test/container/Dockerfile-fedora b/test/container/Dockerfile-fedora index b62f420b1..c9040ef4b 100644 --- a/test/container/Dockerfile-fedora +++ b/test/container/Dockerfile-fedora @@ -4,6 +4,7 @@ FROM registry.fedoraproject.org/${DISTRIBUTION} # Install needed packages for the dracut CI container RUN dnf -y install --setopt=install_weak_deps=False \ asciidoc \ + asciidoctor \ astyle \ bash-completion \ bluez \ diff --git a/test/container/Dockerfile-gentoo b/test/container/Dockerfile-gentoo index e9fbc129a..a735e501c 100644 --- a/test/container/Dockerfile-gentoo +++ b/test/container/Dockerfile-gentoo @@ -42,6 +42,7 @@ RUN emerge --quiet --deep --autounmask-continue=y --with-bdeps=n --noreplace \ dev-lang/rust-bin \ dev-libs/libxslt \ dev-libs/openssl \ + dev-ruby/asciidoctor \ net-fs/cifs-utils \ net-fs/nfs-utils \ net-misc/dhcp \ diff --git a/test/container/Dockerfile-opensuse b/test/container/Dockerfile-opensuse index de33f61bc..206a3f6a2 100644 --- a/test/container/Dockerfile-opensuse +++ b/test/container/Dockerfile-opensuse @@ -42,6 +42,7 @@ RUN dnf -y install --setopt=install_weak_deps=False \ qemu-kvm \ rng-tools \ rpm-build \ + ruby3.3-rubygem-asciidoctor \ sbsigntools \ ShellCheck \ shfmt \ diff --git a/test/container/Dockerfile-ubuntu b/test/container/Dockerfile-ubuntu index d18e0ba98..223aad439 100644 --- a/test/container/Dockerfile-ubuntu +++ b/test/container/Dockerfile-ubuntu @@ -9,6 +9,7 @@ ENV V=2 RUN apt-get update -y -qq && apt-get upgrade -y -qq && \ DEBIAN_FRONTEND=noninteractive apt-get install -y -qq --no-install-recommends -o Dpkg::Use-Pty=0 \ asciidoc \ + asciidoctor \ astyle \ bluez \ btrfs-progs \ diff --git a/test/container/Dockerfile-void b/test/container/Dockerfile-void index b2d0c8dcc..a1f06e22d 100644 --- a/test/container/Dockerfile-void +++ b/test/container/Dockerfile-void @@ -53,6 +53,7 @@ RUN xbps-install -Syu xbps && xbps-install -yu \ plymouth \ qemu \ rng-tools \ + ruby-asciidoctor \ sbsigntool \ shellcheck \ shfmt \