Skip to content

Commit 3ecb213

Browse files
authored
fix(ci): use rootful container storage (#2921)
1 parent b421bf5 commit 3ecb213

2 files changed

Lines changed: 9 additions & 9 deletions

File tree

.github/workflows/reusable-build.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -122,15 +122,15 @@ jobs:
122122
id: load-rechunk
123123
shell: bash
124124
run: |
125-
just load-rechunk "${{ matrix.base_name }}" \
125+
sudo -E $(command -v just) load-rechunk "${{ matrix.base_name }}" \
126126
"${{ env.DEFAULT_TAG }}" \
127127
"${{ matrix.image_flavor }}"
128128
129129
- name: Secureboot Check
130130
id: secureboot
131131
shell: bash
132132
run: |
133-
just secureboot "${{ matrix.base_name }}" \
133+
sudo -E $(command -v just) secureboot "${{ matrix.base_name }}" \
134134
"${{ env.DEFAULT_TAG }}" \
135135
"${{ matrix.image_flavor }}"
136136
@@ -157,7 +157,7 @@ jobs:
157157
shell: bash
158158
run: |
159159
set -eoux pipefail
160-
just tag-images "${{ env.IMAGE_NAME }}" \
160+
sudo -E $(command -v just) tag-images "${{ env.IMAGE_NAME }}" \
161161
"${{ env.DEFAULT_TAG }}" \
162162
"${{ steps.generate-tags.outputs.alias_tags }}"
163163
@@ -186,7 +186,7 @@ jobs:
186186
set -euox pipefail
187187
188188
for tag in ${{ steps.generate-tags.outputs.alias_tags }}; do
189-
podman push ${{ env.IMAGE_NAME }}:${tag} ${{ steps.registry_case.outputs.lowercase }}/${{ env.IMAGE_NAME }}:${tag}
189+
sudo -E podman push ${{ env.IMAGE_NAME }}:${tag} ${{ steps.registry_case.outputs.lowercase }}/${{ env.IMAGE_NAME }}:${tag}
190190
done
191191
192192
if [[ "${{ matrix.image_flavor }}" =~ hwe ]]; then
@@ -196,8 +196,8 @@ jobs:
196196
surface_name="${image_name/hwe/surface}"
197197
198198
for tag in ${{ steps.generate-tags.outputs.alias_tags }}; do
199-
podman push ${asus_name}:${tag} ${{ steps.registry_case.outputs.lowercase }}/${asus_name}:${tag}
200-
podman push ${surface_name}:${tag} ${{ steps.registry_case.outputs.lowercase }}/${surface_name}:${tag}
199+
sudo -E podman push ${asus_name}:${tag} ${{ steps.registry_case.outputs.lowercase }}/${asus_name}:${tag}
200+
sudo -E podman push ${surface_name}:${tag} ${{ steps.registry_case.outputs.lowercase }}/${surface_name}:${tag}
201201
done
202202
fi
203203

Justfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -244,11 +244,11 @@ build $image="bluefin" $tag="latest" $flavor="main" rechunk="0" ghcr="0" pipelin
244244

245245
# Rechunk
246246
if [[ "{{ rechunk }}" == "1" && "{{ ghcr }}" == "1" && "{{ pipeline }}" == "1" ]]; then
247-
{{ just }} rechunk "${image}" "${tag}" "${flavor}" 1 1
247+
${SUDOIF} {{ just }} rechunk "${image}" "${tag}" "${flavor}" 1 1
248248
elif [[ "{{ rechunk }}" == "1" && "{{ ghcr }}" == "1" ]]; then
249-
{{ just }} rechunk "${image}" "${tag}" "${flavor}" 1
249+
${SUDOIF} {{ just }} rechunk "${image}" "${tag}" "${flavor}" 1
250250
elif [[ "{{ rechunk }}" == "1" ]]; then
251-
{{ just }} rechunk "${image}" "${tag}" "${flavor}"
251+
${SUDOIF} {{ just }} rechunk "${image}" "${tag}" "${flavor}"
252252
fi
253253

254254
# Build Image and Rechunk

0 commit comments

Comments
 (0)