Work in progress
Some checks failed
Build container image for previewing the Fedora Docs / build (stg) (push) Has been cancelled
Build container image for previewing the Fedora Docs / build (prod) (push) Has been cancelled
Build fedocs container image for Fedora Docs / build (x86_64, latest, buildroot) (push) Successful in 2m49s
Build fedocs container image for Fedora Docs / merge (x86_64, latest, buildroot) (push) Successful in 44s
Build Antora container image for Fedora Docs / build (x86_64, latest, buildroot) (push) Successful in 3m40s
Build Antora container image for Fedora Docs / merge (x86_64, latest, buildroot) (push) Successful in 43s

Signed-off-by: Hristo Marinov <hricky@fedoraproject.org>
This commit is contained in:
Hristo Marinov 2026-09-19 23:24:40 +03:00
commit 59854fab48
Signed by: hricky
SSH key fingerprint: SHA256:NS+6xKG+ZusCHGCD9Fvi8Lo265bX1i0gLyEACnjaWZw
2 changed files with 53 additions and 39 deletions

View file

@ -16,7 +16,7 @@ env:
CHUNKAH_REPO: "quay.io/coreos/chunkah"
CHUNKAH_TAG: "dev"
CHUNKAH_TMP_OCIARCHIVE: "chunkah"
# CHUNKAH_TMP_OCIARCHIVE: "chunkah"
# chunkah's own image needs an EL10-built rpm-sequoia for PQC support we
# don't need (see Containerfile comment); we extract its binary onto a
# plain Fedora rootfs instead, pinned to the Fedora release chunkah's own
@ -25,11 +25,12 @@ env:
NODEJS_VERSION: "26"
IMAGE_TITLE: "Fedora Docs Antora"
IMAGE_DESCRIPTION: "Antora container image for the Fedora Docs build and preview tools"
IMAGE_SOURCE: "https://forge.fedoraproject.org/docs/docs-fp-o"
IMAGE_LICENSES: "MIT"
QUAY_EXPIRES_AFTER: "4w"
# The image labels are now hardcoded in the Containerfile.
# IMAGE_TITLE: "Fedora Docs Antora"
# IMAGE_DESCRIPTION: "Antora container image for the Fedora Docs build and preview tools"
# IMAGE_SOURCE: "https://forge.fedoraproject.org/docs/docs-fp-o"
# IMAGE_LICENSES: "MIT"
# QUAY_EXPIRES_AFTER: "4w"
on:
pull_request:
@ -76,10 +77,13 @@ jobs:
id: antora-version
run: |
set -xeuo pipefail
readonly ANTORA_VERSION=$(curl --silent \
"https://gitlab.com/api/v4/projects/4180516/repository/tags?order_by=updated&sort=desc&per_page=1" \
| jq --raw-output '.[].name[1:]')
echo "version=${ANTORA_VERSION}" >> "${FORGEJO_OUTPUT}"
# Pinned to match the production docs build; fedocs previews and the
# site build (build-site-container) both inherit it from this image.
echo "version=3.1.15" >> "${FORGEJO_OUTPUT}"
# readonly ANTORA_VERSION=$(curl --silent \
# "https://gitlab.com/api/v4/projects/4180516/repository/tags?order_by=updated&sort=desc&per_page=1" \
# | jq --raw-output '.[].name[1:]')
# echo "version=${ANTORA_VERSION}" >> "${FORGEJO_OUTPUT}"
- name: "Build container image"
uses: https://github.com/redhat-actions/buildah-build@v3
@ -94,13 +98,13 @@ jobs:
BASEIMAGE_TAG=${{ env.BASEIMAGE_TAG }}
CHUNKAH_REPO=${{ env.CHUNKAH_REPO }}
CHUNKAH_TAG=${{ env.CHUNKAH_TAG }}
CHUNKAH_TMP_OCIARCHIVE=${{ env.CHUNKAH_TMP_OCIARCHIVE }}
CHUNKAH_TOOL_BASE_IMAGE=${{ env.BASEIMAGE_REPO }}:${{ env.CHUNKAH_TOOL_BASE_TAG }}
IMAGE_TITLE=${{ env.IMAGE_TITLE }}
IMAGE_DESCRIPTION=${{ env.IMAGE_DESCRIPTION }}
IMAGE_SOURCE=${{ env.IMAGE_SOURCE }}
IMAGE_LICENSES=${{ env.IMAGE_LICENSES }}
QUAY_EXPIRES_AFTER=${{ env.QUAY_EXPIRES_AFTER }}
# CHUNKAH_TMP_OCIARCHIVE=${{ env.CHUNKAH_TMP_OCIARCHIVE }}
# IMAGE_TITLE=${{ env.IMAGE_TITLE }}
# IMAGE_DESCRIPTION=${{ env.IMAGE_DESCRIPTION }}
# IMAGE_SOURCE=${{ env.IMAGE_SOURCE }}
# IMAGE_LICENSES=${{ env.IMAGE_LICENSES }}
# QUAY_EXPIRES_AFTER=${{ env.QUAY_EXPIRES_AFTER }}
extra-args: |
--pull=newer
--skip-unused-stages=false

View file

@ -6,7 +6,7 @@ ARG BASEIMAGE_TAG=overridden
ARG CHUNKAH_REPO=overridden
ARG CHUNKAH_TAG=overridden
ARG CHUNKAH_TMP_OCIARCHIVE=overridden
# ARG CHUNKAH_TMP_OCIARCHIVE=overridden
ARG CHUNKAH_TOOL_BASE_IMAGE=overridden
FROM ${BASEIMAGE_REPO}:${BASEIMAGE_TAG} AS antora
@ -96,7 +96,7 @@ ENV CHUNKAH_ROOTFS=/chunkah
# - Use more layers (128)
FROM chunkah-tool AS chunkah
ARG CHUNKAH_TMP_OCIARCHIVE=overridden
# ARG CHUNKAH_TMP_OCIARCHIVE=overridden
RUN --mount=from=antora,src=/,target=/chunkah,ro \
--mount=type=bind,target=/run/src,rw \
@ -104,30 +104,40 @@ RUN --mount=from=antora,src=/,target=/chunkah,ro \
--verbose \
--skip-special-files \
--max-layers 128 \
--output oci:/run/src/${CHUNKAH_TMP_OCIARCHIVE}
--output oci:/run/src/chunkah
# --output oci:/run/src/${CHUNKAH_TMP_OCIARCHIVE}
# Create the final image from the rechunked oci-archive
# Redeclare ARG for this stage
ARG CHUNKAH_TMP_OCIARCHIVE=overridden
ARG IMAGE_TITLE=overridden
ARG IMAGE_DESCRIPTION=overridden
ARG IMAGE_SOURCE=overridden
ARG IMAGE_LICENSES=overridden
ARG QUAY_EXPIRES_AFTER=overridden
# ARG CHUNKAH_TMP_OCIARCHIVE=overridden
# ARG IMAGE_TITLE=overridden
# ARG IMAGE_DESCRIPTION=overridden
# ARG IMAGE_SOURCE=overridden
# ARG IMAGE_LICENSES=overridden
# ARG QUAY_EXPIRES_AFTER=overridden
FROM --after=chunkah oci:${CHUNKAH_TMP_OCIARCHIVE}
# FROM --after=chunkah oci:${CHUNKAH_TMP_OCIARCHIVE}
FROM --after=chunkah oci:chunkah
ARG IMAGE_TITLE=overridden
ARG IMAGE_DESCRIPTION=overridden
ARG IMAGE_SOURCE=overridden
ARG IMAGE_LICENSES=overridden
ARG QUAY_EXPIRES_AFTER=overridden
# ARG IMAGE_TITLE=overridden
# ARG IMAGE_DESCRIPTION=overridden
# ARG IMAGE_SOURCE=overridden
# ARG IMAGE_LICENSES=overridden
# ARG QUAY_EXPIRES_AFTER=overridden
LABEL org.opencontainers.image.title="${IMAGE_TITLE}"
LABEL org.opencontainers.image.description="${IMAGE_DESCRIPTION}"
LABEL org.opencontainers.image.source="${IMAGE_SOURCE}"
LABEL org.opencontainers.image.licenses="${IMAGE_LICENSES}"
LABEL quay.expires-after="${QUAY_EXPIRES_AFTER}"
# The labels are static, so they're hardcoded here instead of being passed in
# as build-args from the workflow.
# LABEL org.opencontainers.image.title="${IMAGE_TITLE}"
# LABEL org.opencontainers.image.description="${IMAGE_DESCRIPTION}"
# LABEL org.opencontainers.image.source="${IMAGE_SOURCE}"
# LABEL org.opencontainers.image.licenses="${IMAGE_LICENSES}"
# LABEL quay.expires-after="${QUAY_EXPIRES_AFTER}"
LABEL org.opencontainers.image.title="Fedora Docs Antora"
LABEL org.opencontainers.image.description="Antora container image for the Fedora Docs build and preview tools"
LABEL org.opencontainers.image.source="https://forge.fedoraproject.org/docs/docs-fp-o"
LABEL org.opencontainers.image.licenses="MIT"
LABEL quay.expires-after="4w"
ENV NODE_PATH=/usr/local/lib/node_modules