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

allow for other source types

This commit is contained in:
Jason Nagin 2024-06-11 11:41:58 -04:00 committed by GitHub
parent e0e4de8f9a
commit da07f96920
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 6 additions and 1 deletions

View file

@ -6,6 +6,7 @@ export ARCH := x86_64
export EXTRA_BOOT_PARAMS := export EXTRA_BOOT_PARAMS :=
export IMAGE_NAME := base export IMAGE_NAME := base
export IMAGE_REPO := quay.io/fedora-ostree-desktops export IMAGE_REPO := quay.io/fedora-ostree-desktops
export IMAGE_SRC = docker://$(IMAGE_REPO)/$(IMAGE_NAME):$(IMAGE_TAG)
export IMAGE_TAG = $(VERSION) export IMAGE_TAG = $(VERSION)
export IMAGE_SIGNED := true export IMAGE_SIGNED := true
REPOS := $(subst :,\:,$(wildcard /etc/yum.repos.d/*.repo)) REPOS := $(subst :,\:,$(wildcard /etc/yum.repos.d/*.repo))

View file

@ -56,6 +56,7 @@ The following variables can be used to customize the created ISO.
| image_name | Name of the source container image | base | :white_check_mark: | :white_check_mark: | | image_name | Name of the source container image | base | :white_check_mark: | :white_check_mark: |
| image_repo | Repository containing the source container image | quay.io/fedora-ostree-desktops | :white_check_mark: | :white_check_mark: | | image_repo | Repository containing the source container image | quay.io/fedora-ostree-desktops | :white_check_mark: | :white_check_mark: |
| image_signed | Whether the container image is signed. The policy to test the signing must be configured inside the container image | true | :white_check_mark: | :white_check_mark: | | image_signed | Whether the container image is signed. The policy to test the signing must be configured inside the container image | true | :white_check_mark: | :white_check_mark: |
| image_src | Overrides the source of the container image. Must be formatted for the skopeo copy command | docker://*IMAGE_REPO*/*IMAGE_NAME*:*IMAGE_TAG* | :white_check_mark: | :white_check_mark: |
| image_tag | Tag of the source container image | *VERSION* | :white_check_mark: | :white_check_mark: | | image_tag | Tag of the source container image | *VERSION* | :white_check_mark: | :white_check_mark: |
| iso_name | Name of the ISO you wish to output when completed | build/deploy.iso | :white_check_mark: | :white_check_mark: | | iso_name | Name of the ISO you wish to output when completed | build/deploy.iso | :white_check_mark: | :white_check_mark: |
| make_target | Overrides the default make target | *ISO_NAME*-Checksum | :white_check_mark: | :x: | | make_target | Overrides the default make target | *ISO_NAME*-Checksum | :white_check_mark: | :x: |

View file

@ -63,6 +63,9 @@ inputs:
description: Whether the container image is signed. The policy to test the signing must be configured inside the container image description: Whether the container image is signed. The policy to test the signing must be configured inside the container image
required: false required: false
default: "true" default: "true"
image_src:
description: Overrides the source of the container image. Must be formatted for the skopeo copy command
required: false
image_tag: image_tag:
description: Tag of the source container image. Defaults to the installer version description: Tag of the source container image. Defaults to the installer version
required: false required: false

View file

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