Skip to content

fix(ci): use rootful container storage #2921

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

Merged
castrojo merged 2 commits into from
Aug 3, 2025
Merged

fix(ci): use rootful container storage #2921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32a969b
fix(ci): use rootful container storage
renner0e Aug 3, 2025
a35c6e5
fix: use sudo for just tag-images
renner0e Aug 3, 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
12 changes: 6 additions & 6 deletions .github/workflows/reusable-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,15 +121,15 @@ jobs:
id: load-rechunk
shell: bash
run: |
just load-rechunk "${{ matrix.base_name }}" \
sudo -E $(command -v just) load-rechunk "${{ matrix.base_name }}" \
"${{ env.DEFAULT_TAG }}" \
"${{ matrix.image_flavor }}"

- name: Secureboot Check
id: secureboot
shell: bash
run: |
just secureboot "${{ matrix.base_name }}" \
sudo -E $(command -v just) secureboot "${{ matrix.base_name }}" \
"${{ env.DEFAULT_TAG }}" \
"${{ matrix.image_flavor }}"

Expand All @@ -156,7 +156,7 @@ jobs:
shell: bash
run: |
set -eoux pipefail
just tag-images "${{ env.IMAGE_NAME }}" \
sudo -E $(command -v just) tag-images "${{ env.IMAGE_NAME }}" \
"${{ env.DEFAULT_TAG }}" \
"${{ steps.generate-tags.outputs.alias_tags }}"

Expand Down Expand Up @@ -185,7 +185,7 @@ jobs:
set -euox pipefail

for tag in ${{ steps.generate-tags.outputs.alias_tags }}; do
podman push ${{ env.IMAGE_NAME }}:${tag} ${{ steps.registry_case.outputs.lowercase }}/${{ env.IMAGE_NAME }}:${tag}
sudo -E podman push ${{ env.IMAGE_NAME }}:${tag} ${{ steps.registry_case.outputs.lowercase }}/${{ env.IMAGE_NAME }}:${tag}
done

if [[ "${{ matrix.image_flavor }}" =~ hwe ]]; then
Expand All @@ -195,8 +195,8 @@ jobs:
surface_name="${image_name/hwe/surface}"

for tag in ${{ steps.generate-tags.outputs.alias_tags }}; do
podman push ${asus_name}:${tag} ${{ steps.registry_case.outputs.lowercase }}/${asus_name}:${tag}
podman push ${surface_name}:${tag} ${{ steps.registry_case.outputs.lowercase }}/${surface_name}:${tag}
sudo -E podman push ${asus_name}:${tag} ${{ steps.registry_case.outputs.lowercase }}/${asus_name}:${tag}
sudo -E podman push ${surface_name}:${tag} ${{ steps.registry_case.outputs.lowercase }}/${surface_name}:${tag}
done
fi

Expand Down
6 changes: 3 additions & 3 deletions Justfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,11 +244,11 @@ build $image="bluefin" $tag="latest" $flavor="main" rechunk="0" ghcr="0" pipelin

# Rechunk
if [[ "{{ rechunk }}" == "1" && "{{ ghcr }}" == "1" && "{{ pipeline }}" == "1" ]]; then
{{ just }} rechunk "${image}" "${tag}" "${flavor}" 1 1
${SUDOIF} {{ just }} rechunk "${image}" "${tag}" "${flavor}" 1 1
elif [[ "{{ rechunk }}" == "1" && "{{ ghcr }}" == "1" ]]; then
{{ just }} rechunk "${image}" "${tag}" "${flavor}" 1
${SUDOIF} {{ just }} rechunk "${image}" "${tag}" "${flavor}" 1
elif [[ "{{ rechunk }}" == "1" ]]; then
{{ just }} rechunk "${image}" "${tag}" "${flavor}"
${SUDOIF} {{ just }} rechunk "${image}" "${tag}" "${flavor}"
fi

# Build Image and Rechunk
Expand Down