local build test

Signed-off-by: Serge Hallyn <[email protected]>
project-machine · Dec 23, 2023 · e04840f · e04840f
1 parent 0e2c5b7
commit e04840f
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,
 	})