chore(ci): prepull image for ISO build

ublue-os · Jul 2, 2024 · 837e676 · 837e676
1 parent 2fcded2
commit 837e676
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/.github/workflows/reusable-build-iso.yml b/.github/workflows/reusable-build-iso.yml
@@ -118,6 +118,16 @@ jobs:
           fi
           echo "flatpak-dir-shortname=${FLATPAK_DIR_SHORTNAME}" >> $GITHUB_OUTPUT
 
+      - name: Pull main and akmods images
+        uses: Wandalen/wretry.action@v3.5.0
+        with:
+          attempt_limit: 3
+          attempt_delay: 15000
+          command: |
+            # pull the base images used for FROM in Containerfile so
+            # we can retry on that unfortunately common failure case
+            docker pull "ghcr.io/ublue-os/${{ env.IMAGE_NAME }}:${{ inputs.fedora_version }}"
+
       - name: Determine Flatpak Dependencies
         id: flatpak_dependencies
         uses: Wandalen/wretry.action@v3.5.0
@@ -150,7 +160,6 @@ jobs:
               --volume ${FLATPAK_REFS_DIR}:/output \
               --volume ${TEMP_FLATPAK_INSTALL_DIR}:/temp_flatpak_install_dir \
               ${image} /temp_flatpak_install_dir/script.sh
-            docker rmi ${image}
 
       - name: Build ISOs
         uses: jasonn3/build-container-installer@v1.2.1

diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml
@@ -152,26 +152,23 @@ jobs:
           attempt_limit: 3
           attempt_delay: 1500
           action: EyeCantCU/cosign-action/verify@11f8c114a5e67c7a663c9dfcaf76d85429d254bc # v0.2.2
-          with: |
-            containers: ${{ env.BASE_IMAGE_NAME}}-${{ env.image_flavor }}:${{ env.fedora_version }}
+          with: "containers: ${{ env.BASE_IMAGE_NAME}}-${{ env.image_flavor }}:${{ env.fedora_version }}"
 
       - name: Verify akmods image
         uses: Wandalen/wretry.action@v3.5.0
         with:
           attempt_limit: 3
           attempt_delay: 1500
           action: EyeCantCU/cosign-action/verify@11f8c114a5e67c7a663c9dfcaf76d85429d254bc # v0.2.2
-          with: |
-            containers: akmods:${{ env.AKMODS_FLAVOR }}-${{ env.fedora_version }}
+          with: "containers: akmods:${{ env.AKMODS_FLAVOR }}-${{ env.fedora_version }}"
 
       - name: Verify nvidia akmods image
         uses: Wandalen/wretry.action@v3.5.0
         with:
           attempt_limit: 3
           attempt_delay: 1500
           action: EyeCantCU/cosign-action/verify@11f8c114a5e67c7a663c9dfcaf76d85429d254bc # v0.2.2
-          with: |
-            containers: akmod:coreos-${{ env.fedora_version }}
+          with: "containers: akmod:coreos-${{ env.fedora_version }}"
 
       - name: Verify Chainguard images
         if: matrix.base_name != 'bluefin' && matrix.base_name != 'aurora'