Pull latest alpine-cloud-iamges, first metal tests
This commit is contained in:
parent
8fba004dab
commit
b03c948f4d
5
Makefile
5
Makefile
|
@ -6,7 +6,7 @@ STEP := publish
|
|||
all: build
|
||||
|
||||
build:
|
||||
cd alpine-cloud-images && ./build $(STEP) --clean --revise $(FILTER) --custom $(OVERLAY)/zdt --vars $(OVERLAY)/zdt/zdt.hcl
|
||||
cd alpine-cloud-images && ./build $(STEP) --clean --no-pad-uefi-bins --revise $(FILTER) --custom $(OVERLAY)/zdt --vars $(OVERLAY)/zdt/zdt.hcl
|
||||
|
||||
clean:
|
||||
rm -rf alpine-cloud-images/work
|
||||
|
@ -38,3 +38,6 @@ scan-image:
|
|||
qemu-nbd -c /dev/nbd0 --read-only alpine-cloud-images/work/images/aws/3.15.4-x86_64-bios-cloudinit-aws-kubezero/image.qcow2
|
||||
mount /dev/nbd0 /mnt/temp/
|
||||
trivy rootfs /mnt/temp
|
||||
|
||||
pull-upstream: ## pull latest shared alpine-cloud-images
|
||||
git stash && git subtree pull --prefix alpine-cloud-images git@gitlab.alpinelinux.org:alpine/cloud/alpine-cloud-images.git main --squash && git stash pop
|
||||
|
|
Binary file not shown.
|
@ -0,0 +1,14 @@
|
|||
# bare metal
|
||||
|
||||
name = ["metal"]
|
||||
machine_name = "Bare Metal"
|
||||
|
||||
# Kernel and firmware are 900M !
|
||||
size = 2G
|
||||
|
||||
EXCLUDE = ["aws"]
|
||||
|
||||
packages.linux-virt = null
|
||||
packages.linux-lts = true
|
||||
|
||||
# TODO: other kernel_modules, kernel_options, or initfs_features?
|
|
@ -0,0 +1,4 @@
|
|||
name = [vm] # we need a name to be able to skip
|
||||
machine_name = "Virtual"
|
||||
|
||||
# all image defaults are for virutal machines
|
|
@ -45,6 +45,10 @@ Dimensions {
|
|||
#cloudinit { include required("bootstrap/cloudinit.conf") }
|
||||
tiny { include required("bootstrap/tiny.conf") }
|
||||
}
|
||||
machine {
|
||||
vm { include required("machine/vm.conf") }
|
||||
metal { include required("machine/metal.conf") }
|
||||
}
|
||||
cloud {
|
||||
aws { include required("cloud/aws.conf") }
|
||||
aws.regions {
|
||||
|
@ -57,9 +61,9 @@ Dimensions {
|
|||
us-west-2 = true
|
||||
}
|
||||
}
|
||||
artifact {
|
||||
minimal { include required("minimal.conf") }
|
||||
kubezero { include required("kubezero.conf") }
|
||||
edition {
|
||||
minimal { include required("edition/minimal.conf") }
|
||||
kubezero { include required("edition/kubezero.conf") }
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue