1
0
Fork 0
mirror of https://github.com/JasonN3/build-container-installer.git synced 2025-12-25 02:47:56 +01:00

Fix image_src not setting default value (#122)

This commit is contained in:
Jason Nagin 2024-06-13 11:58:32 -04:00 committed by GitHub
parent 3d7e6b3725
commit 19c4aae2f2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 9 additions and 5 deletions

View file

@ -107,6 +107,7 @@ jobs:
arch: ${{ needs.load_vars.outputs.ARCH }} arch: ${{ needs.load_vars.outputs.ARCH }}
image_name: ${{ matrix.image_name }} image_name: ${{ matrix.image_name }}
image_repo: ${{ matrix.image_repo}} image_repo: ${{ matrix.image_repo}}
image_src: ${{ matrix.image_src }}
image_tag: ${{ matrix.version }} image_tag: ${{ matrix.version }}
version: ${{ matrix.version }} version: ${{ matrix.version }}
repos: ${{ matrix.repos }} repos: ${{ matrix.repos }}
@ -118,6 +119,7 @@ jobs:
iso_name: build/${{ matrix.image_name }}-${{ matrix.version }}${{ matrix.flatpaks == 'false' && '' || format('-{0}', matrix.flatpaks) }}.iso iso_name: build/${{ matrix.image_name }}-${{ matrix.version }}${{ matrix.flatpaks == 'false' && '' || format('-{0}', matrix.flatpaks) }}.iso
- name: Upload ISO as artifact - name: Upload ISO as artifact
if: matrix.version != 'fake'
id: upload id: upload
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:

View file

@ -37,6 +37,12 @@ on:
"version": "40", "version": "40",
"image_repo": "quay.io/fedora", "image_repo": "quay.io/fedora",
"image_name": "fedora-bootc" "image_name": "fedora-bootc"
},
{
"version": "fake",
"image_repo": "quay.io/fedora",
"image_name": "fedora-bootc",
"image_src": "docker://quay.io/fedora-ostree-desktops/base:39"
} }
] ]
}' }'

View file

@ -1,9 +1,5 @@
ifeq ($(IMAGE_SRC),)
IMAGE_SRC := docker://$(IMAGE_REPO)/$(IMAGE_NAME):$(IMAGE_TAG)
endif
$(IMAGE_NAME)-$(IMAGE_TAG): $(IMAGE_NAME)-$(IMAGE_TAG):
skopeo copy $(IMAGE_SRC) oci:$(IMAGE_NAME)-$(IMAGE_TAG) skopeo copy $(if $(IMAGE_SRC),$(IMAGE_SRC),docker://$(IMAGE_REPO)/$(IMAGE_NAME):$(IMAGE_TAG)) oci:$(IMAGE_NAME)-$(IMAGE_TAG)
install-deps: install-deps:
$(install_pkg) skopeo $(install_pkg) skopeo