fix arch
This commit is contained in:
parent
441202ef09
commit
205cec65c4
1 changed files with 8 additions and 2 deletions
10
Taskfile.yml
10
Taskfile.yml
|
|
@ -12,6 +12,10 @@ vars:
|
||||||
# bootc-image-builder now lives in github.com/osbuild/image-builder and is
|
# bootc-image-builder now lives in github.com/osbuild/image-builder and is
|
||||||
# published here; quay.io/centos-bootc/bootc-image-builder is frozen.
|
# published here; quay.io/centos-bootc/bootc-image-builder is frozen.
|
||||||
BIB_IMAGE: ghcr.io/osbuild/bootc-image-builder:latest
|
BIB_IMAGE: ghcr.io/osbuild/bootc-image-builder:latest
|
||||||
|
# Aurora is amd64-only (and the kmod stage hardcodes x86_64), so pin it
|
||||||
|
# explicitly; otherwise an arm64 host (e.g. Apple Silicon) builds for arm64.
|
||||||
|
PLATFORM: linux/amd64
|
||||||
|
TARGET_ARCH: amd64
|
||||||
SKOPEO_IMAGE: quay.io/skopeo/stable:latest
|
SKOPEO_IMAGE: quay.io/skopeo/stable:latest
|
||||||
# bootc-image-builder reads images from a containers-storage mounted at
|
# bootc-image-builder reads images from a containers-storage mounted at
|
||||||
# /var/lib/containers/storage. Under podman that's root's real store; docker
|
# /var/lib/containers/storage. Under podman that's root's real store; docker
|
||||||
|
|
@ -33,7 +37,7 @@ tasks:
|
||||||
this lands in root's containers-storage, which bootc and
|
this lands in root's containers-storage, which bootc and
|
||||||
bootc-image-builder read; under docker, the ISO tasks copy it over).
|
bootc-image-builder read; under docker, the ISO tasks copy it over).
|
||||||
cmds:
|
cmds:
|
||||||
- sudo {{.CONTAINER_RUNTIME}} build -t {{.IMAGE}} -f Containerfile .
|
- sudo {{.CONTAINER_RUNTIME}} build --platform {{.PLATFORM}} -t {{.IMAGE}} -f Containerfile .
|
||||||
sources:
|
sources:
|
||||||
- Containerfile
|
- Containerfile
|
||||||
- overlay/**/*
|
- overlay/**/*
|
||||||
|
|
@ -54,6 +58,7 @@ tasks:
|
||||||
-v {{.OUTPUT_DIR}}:/output
|
-v {{.OUTPUT_DIR}}:/output
|
||||||
-v {{.STORAGE}}:/var/lib/containers/storage
|
-v {{.STORAGE}}:/var/lib/containers/storage
|
||||||
{{.BIB_IMAGE}}
|
{{.BIB_IMAGE}}
|
||||||
|
--target-arch {{.TARGET_ARCH}}
|
||||||
--type iso localhost/{{.IMAGE}}
|
--type iso localhost/{{.IMAGE}}
|
||||||
generates:
|
generates:
|
||||||
- "{{.OUTPUT_DIR}}/bootiso/install.iso"
|
- "{{.OUTPUT_DIR}}/bootiso/install.iso"
|
||||||
|
|
@ -66,7 +71,7 @@ tasks:
|
||||||
{{.COPR_REPO}} COPR project; override with
|
{{.COPR_REPO}} COPR project; override with
|
||||||
`task build-installer-image COPR_REPO=you/other-project`.
|
`task build-installer-image COPR_REPO=you/other-project`.
|
||||||
cmds:
|
cmds:
|
||||||
- sudo {{.CONTAINER_RUNTIME}} build -t {{.INSTALLER_IMAGE}} --build-arg COPR_REPO={{.COPR_REPO}} -f installer/Containerfile installer/
|
- sudo {{.CONTAINER_RUNTIME}} build --platform {{.PLATFORM}} -t {{.INSTALLER_IMAGE}} --build-arg COPR_REPO={{.COPR_REPO}} -f installer/Containerfile installer/
|
||||||
sources:
|
sources:
|
||||||
- installer/Containerfile
|
- installer/Containerfile
|
||||||
|
|
||||||
|
|
@ -90,6 +95,7 @@ tasks:
|
||||||
-v {{.OUTPUT_DIR}}:/output
|
-v {{.OUTPUT_DIR}}:/output
|
||||||
-v {{.STORAGE}}:/var/lib/containers/storage
|
-v {{.STORAGE}}:/var/lib/containers/storage
|
||||||
{{.BIB_IMAGE}}
|
{{.BIB_IMAGE}}
|
||||||
|
--target-arch {{.TARGET_ARCH}}
|
||||||
--type bootc-installer
|
--type bootc-installer
|
||||||
--bootc-installer-payload-ref localhost/{{.IMAGE}}
|
--bootc-installer-payload-ref localhost/{{.IMAGE}}
|
||||||
localhost/{{.INSTALLER_IMAGE}}
|
localhost/{{.INSTALLER_IMAGE}}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue