From e04840f9c0e5e437264b803461dc3b70348e5c6c Mon Sep 17 00:00:00 2001 From: Serge Hallyn Date: Fri, 22 Dec 2023 10:13:00 -0600 Subject: [PATCH] local build test Signed-off-by: Serge Hallyn --- Makefile | 2 +- layers/install/stacker.yaml | 3 ++- layers/provision/stacker.yaml | 3 ++- pkg/mosconfig/files.go | 3 ++- pkg/mosconfig/mkboot.go | 8 ++++---- pkg/trust/artifacts.go | 2 +- 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 3a6454b..bfaa944 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ ORAS_VERSION := 1.0.0-rc.1 REGCTL := $(TOOLSDIR)/bin/regctl REGCTL_VERSION := 0.5.0 TOPDIR := $(shell git rev-parse --show-toplevel) -BOOTKIT_VERSION ?= "v0.0.18.231121" +BOOTKIT_VERSION ?= "v0.0.19-serge1" ROOTFS_VERSION = $(BOOTKIT_VERSION) archout = $(shell arch) diff --git a/layers/install/stacker.yaml b/layers/install/stacker.yaml index 0e49333..affc39e 100644 --- a/layers/install/stacker.yaml +++ b/layers/install/stacker.yaml @@ -2,7 +2,8 @@ install-base: build_only: true from: type: docker - url: "docker://zothub.io/machine/bootkit/rootfs:${{ROOTFS_VERSION}}-squashfs" + url: "oci:/home/serge/src/project-machine/build-bootkit/oci:rootfs-squashfs" + #url: "docker://zothub.io/machine/bootkit/rootfs:${{ROOTFS_VERSION}}-squashfs" install-rootfs-pkg: build_only: true diff --git a/layers/provision/stacker.yaml b/layers/provision/stacker.yaml index 9796f74..dacca7c 100644 --- a/layers/provision/stacker.yaml +++ b/layers/provision/stacker.yaml @@ -2,7 +2,8 @@ provision-base: build_only: true from: type: docker - url: "docker://zothub.io/machine/bootkit/rootfs:${{ROOTFS_VERSION}}-squashfs" + url: "oci:/home/serge/src/project-machine/build-bootkit/oci:rootfs-squashfs" + #url: "docker://zothub.io/machine/bootkit/rootfs:${{ROOTFS_VERSION}}-squashfs" provision-rootfs-pkg: build_only: true diff --git a/pkg/mosconfig/files.go b/pkg/mosconfig/files.go index c0b026d..e3dc3b1 100644 --- a/pkg/mosconfig/files.go +++ b/pkg/mosconfig/files.go @@ -410,7 +410,8 @@ func (i *ImportFile) HasTarget(name string) bool { func (i *ImportFile) CompleteTargets(keyProject string) (UserTargets, error) { if !i.HasTarget("hostfs") { - s := fmt.Sprintf("docker://zothub.io/machine/bootkit/demo-target-rootfs:%s-squashfs", trust.RelVersion) + //s := fmt.Sprintf("docker://zothub.io/machine/bootkit/demo-target-rootfs:%s-squashfs", trust.RelVersion) + s := "oci:/home/serge/src/project-machine/mos/oci:demo-target-rootfs-squashfs" newT := UserTarget{ ServiceName: "hostfs", ServiceType: "hostfs", diff --git a/pkg/mosconfig/mkboot.go b/pkg/mosconfig/mkboot.go index e3edc16..9c10988 100644 --- a/pkg/mosconfig/mkboot.go +++ b/pkg/mosconfig/mkboot.go @@ -439,7 +439,7 @@ product: "%s" update_type: complete targets: - service_name: livecd - source: "docker://zothub.io/machine/bootkit/provision-rootfs:%s-squashfs" + source: "oci:/home/serge/src/project-machine/mos/oci:provision-rootfs-squashfs" version: %s service_type: fs-only nsgroup: "none" @@ -453,7 +453,7 @@ product: "%s" update_type: complete targets: - service_name: livecd - source: "docker://zothub.io/machine/bootkit/install-rootfs:%s-squashfs" + source: "oci:/home/serge/src/project-machine/mos/oci:install-rootfs-squashfs" version: %s service_type: fs-only nsgroup: "none" @@ -488,7 +488,7 @@ func BuildProvisioner(keysetName, projectName, isofile string) error { if err != nil { return errors.Wrapf(err, "Failed to read project uuid (%q)", pPath) } - manifestText := fmt.Sprintf(provisionManifestTemplate, string(productUUID), LayerVersion, LayerVersion) + manifestText := fmt.Sprintf(provisionManifestTemplate, string(productUUID), LayerVersion) manifestpath := filepath.Join(dir, "manifest.yaml") err = os.WriteFile(manifestpath, []byte(manifestText), 0600) @@ -547,7 +547,7 @@ func BuildInstaller(keysetName, projectName, isofile string) error { if err != nil { return errors.Wrapf(err, "Failed to read project uuid (%q)", pPath) } - manifestText := fmt.Sprintf(installManifestTemplate, string(productUUID), LayerVersion, LayerVersion) + manifestText := fmt.Sprintf(installManifestTemplate, string(productUUID), LayerVersion) manifestpath := filepath.Join(dir, "manifest.yaml") err = os.WriteFile(manifestpath, []byte(manifestText), 0600) diff --git a/pkg/trust/artifacts.go b/pkg/trust/artifacts.go index 5a95cfe..9c0c0cd 100644 --- a/pkg/trust/artifacts.go +++ b/pkg/trust/artifacts.go @@ -206,7 +206,7 @@ func SetupBootkit(keysetName, bootkitVersion, mosctlPath string) error { utils.EnsureDir(ociDir) cachedOci := fmt.Sprintf("oci:%s:%s", ociDir, bootkitLayer) err = lib.ImageCopy(lib.ImageCopyOpts{ - Src: fmt.Sprintf("docker://zothub.io/machine/bootkit/%s", bootkitLayer), + Src: "oci:/home/serge/src/project-machine/build-bootkit/oci:bootkit-squashfs", Dest: cachedOci, Progress: os.Stdout, })