Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add artifacthub metadata on rechunker step #86

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

feat: add artifacthub metadata on rechunker step #86

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e66bba6
feat: add artifacthub metadata on rechunker step
tulilirockz Jan 5, 2025
d583bba
fix: make sure labels is quoted
tulilirockz Jan 5, 2025
3d38cfc
fix: quoting in description
tulilirockz Jan 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 29 additions & 1 deletion Justfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,34 @@ rechunk $image="aurora" $tag="latest" $flavor="main" ghcr="0" pipeline="0":
if [[ -z "$(git status -s)" ]]; then
SHA=$(git rev-parse HEAD)
fi

# Should generate a timestamp like what is defined on the ArtifactHub documentation
# E.G: 2022-02-08T15:38:15Z'
# https://artifacthub.io/docs/topics/repositories/container-images/
# https://linux.die.net/man/1/date
CREATED_DATE="$(date -u +%Y\-%m\-%d\T%H\:%M\:%S\Z)"

LABELS=()
LABELS+=("org.opencontainers.image.created=$CREATED_DATE")
LABELS+=("org.opencontainers.image.description='An interpretation of the Ubuntu spirit built on Fedora technology'")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please change this description to “The ultimate productivity workstation”? 😀

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hahaha ofc!

LABELS+=("org.opencontainers.image.documentation=https://getaurora.dev")
LABELS+=("org.opencontainers.image.source=https://github.com/ublue-os/aurora/blob/main/Containerfile")
LABELS+=("org.opencontainers.image.title=bluefin")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be aurora instead of bluefin?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh my god yea! I was rushing to get this done before I went out, Ill work on this better later today/tomorrow

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Drafting this for now

LABELS+=("org.opencontainers.image.url=https://getaurora.dev")
LABELS+=("org.opencontainers.image.vendor=ublue-os")
LABELS+=("org.opencontainers.image.version=$fedora_version")
LABELS+=("io.artifacthub.package.deprecated=false")
LABELS+=("io.artifacthub.package.keywords=bootc,fedora,aurora,ublue,universal-blue")
LABELS+=("io.artifacthub.package.license=Apache-2.0")
LABELS+=("io.artifacthub.package.logo-url=https://avatars.githubusercontent.com/u/120078124?s=200&v=4")
LABELS+=("containers.bootc=1")

FINAL_LABELS="io.artifacthub.package.readme-url=https://raw.githubusercontent.com/ublue-os/aurora/refs/heads/main/README.md"
# Escape labels in a way that sudoif works with it
for label in "${LABELS[@]}"; do
FINAL_LABELS+="$'\n'$label"
done

# Run Rechunker
just sudoif podman run --rm \
--pull=newer \
Expand All @@ -352,7 +380,7 @@ rechunk $image="aurora" $tag="latest" $flavor="main" ghcr="0" pipeline="0":
--env REPO=/var/ostree/repo \
--env PREV_REF=ghcr.io/ublue-os/"${image_name}":"${tag}" \
--env OUT_NAME="$OUT_NAME" \
--env LABELS="org.opencontainers.image.title=${image_name}$'\n''io.artifacthub.package.readme-url=https://raw.githubusercontent.com/ublue-os/aurora/refs/heads/main/README.md'$'\n''io.artifacthub.package.logo-url=https://avatars.githubusercontent.com/u/120078124?s=200&v=4'$'\n'" \
--env "LABELS=$FINAL_LABELS" \
--env "DESCRIPTION='An interpretation of the Ubuntu spirit built on Fedora technology'" \
--env "VERSION=${VERSION}" \
--env VERSION_FN=/workspace/version.txt \
Expand Down