From: Quentin Schulz <quentin.schulz@cherry.de>
To: Antonin Godard <antonin.godard@bootlin.com>,
Quentin Schulz <foss@0leil.net>,
docs@lists.yoctoproject.org
Subject: Re: [docs] [PATCH RFC 2/2] tools: add script for building documentation inside containers
Date: Tue, 17 Dec 2024 14:50:45 +0100 [thread overview]
Message-ID: <edd1fc18-11c2-44fd-9d2a-ae21d22ff8a0@cherry.de> (raw)
In-Reply-To: <D6DWNFLPU4PT.3BJVWQZNVWNHO@bootlin.com>
Hi Antonin,
On 12/17/24 11:31 AM, Antonin Godard wrote:
> Hi Quentin,
>
> On Tue Dec 10, 2024 at 4:26 PM CET, Quentin Schulz wrote:
>> From: Quentin Schulz <quentin.schulz@cherry.de>
>>
>> This adds a script for building a container and building the
>> documentation within that new container image.
>>
>> The openSUSE instructions now require a --non-interactive flag otherwise
>> they fail to run. Sadly there doesn't seem to be a way to have this in
>> an environment variable à-la DEBIAN_FRONTEND=noninteractive.
>>
>> Note that the Ubuntu and openSUSE instructions currently do not work.
>>
>> Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
>> ---
>> documentation/tools/Containerfile.almalinux | 1 +
>> documentation/tools/Containerfile.apt | 21 +++++
>> documentation/tools/Containerfile.debian | 1 +
>> documentation/tools/Containerfile.dnf | 19 ++++
>> documentation/tools/Containerfile.fedora | 1 +
>> documentation/tools/Containerfile.ubuntu | 1 +
>> documentation/tools/Containerfile.zypper | 18 ++++
>> documentation/tools/build-docs-container | 101 +++++++++++++++++++++
>> documentation/tools/opensuse_host_packages_docs.sh | 2 +-
>> .../tools/opensuse_host_packages_essential.sh | 2 +-
>> 10 files changed, 165 insertions(+), 2 deletions(-)
>>
>> diff --git a/documentation/tools/Containerfile.almalinux b/documentation/tools/Containerfile.almalinux
>> new file mode 120000
>> index 0000000000000000000000000000000000000000..7237e9b99f4132957c0ad5b11fa6cefe9daaec74
>> --- /dev/null
>> +++ b/documentation/tools/Containerfile.almalinux
>> @@ -0,0 +1 @@
>> +Containerfile.dnf
>> \ No newline at end of file
>> diff --git a/documentation/tools/Containerfile.apt b/documentation/tools/Containerfile.apt
>> new file mode 100644
>> index 0000000000000000000000000000000000000000..a601699ce4005b3bc5288990dbf2e7fa235ea431
>> --- /dev/null
>> +++ b/documentation/tools/Containerfile.apt
>> @@ -0,0 +1,21 @@
>> +ARG ARG_FROM=debian:12 # default value to avoid warning
>> +FROM $ARG_FROM
>> +
>> +ARG HOST_DOCS_PACKAGES=ubuntu_host_packages_docs.sh
>> +
>> +ENV DEBIAN_FRONTEND=noninteractive
>> +
>> +# relative to the location of the dockerfile
>> +COPY --chmod=777 ${HOST_DOCS_PACKAGES} /temp/host_packages_docs.sh
>> +
>> +RUN apt-get update \
>> + && apt-get install -y sudo \
>> + && yes | /temp/host_packages_docs.sh \
>> + && apt-get --yes autoremove \
>> + && apt-get clean \
>> + && rm -rf /temp
>> +
>> +RUN git config --global --add safe.directory /docs
>> +
>> +ENTRYPOINT ["/usr/bin/env", "make", "-C", "documentation/"]
>> +CMD ["publish"]
>
> Are we able to override this from the command-line, with the
> build-docs-container script? I assume everything passed in "$*" below replaces
> CMD?
>
Yes, I'm currently calling the script like that:
./tools/build-docs-container fedora:40 html
./tools/build-docs-container fedora:40 latexpdf
or ./tools/build-docs-container fedora:40 latexpdf html (in v2, broken
in v1).
If you omit it, it'll call "publish", which is what you decided would be
the default in **your** v1. We can have nothing instead which would call
"all" I guess instead? Up to you.
Cheers,
Quentin
next prev parent reply other threads:[~2024-12-17 13:50 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-10 15:26 [PATCH RFC 0/2] add script for containers building the documentation Quentin Schulz
2024-12-10 15:26 ` [PATCH RFC 1/2] docs: use literalinclude for system requirements Quentin Schulz
2024-12-17 10:31 ` [docs] " Antonin Godard
2024-12-17 12:58 ` Quentin Schulz
2024-12-17 13:10 ` Antonin Godard
2024-12-17 13:15 ` Quentin Schulz
2024-12-10 15:26 ` [PATCH RFC 2/2] tools: add script for building documentation inside containers Quentin Schulz
2024-12-17 10:31 ` [docs] " Antonin Godard
2024-12-17 13:50 ` Quentin Schulz [this message]
2024-12-18 8:22 ` Antonin Godard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=edd1fc18-11c2-44fd-9d2a-ae21d22ff8a0@cherry.de \
--to=quentin.schulz@cherry.de \
--cc=antonin.godard@bootlin.com \
--cc=docs@lists.yoctoproject.org \
--cc=foss@0leil.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox