fixed platform not being set for scratch images

djcass44 · Dec 18, 2023 · 83733b4 · 83733b4
1 parent e12a413
commit 83733b4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/pkg/containerutil/append.go b/pkg/containerutil/append.go
@@ -114,6 +114,15 @@ func (ib *Image) Append(ctx context.Context, fs fs.FullFS, platform *v1.Platform
 		return nil, err
 	}
 	cfg = cfg.DeepCopy()
+
+	// copy platform metadata
+	cfg.OS = platform.OS
+	cfg.Architecture = platform.Architecture
+	cfg.OSVersion = platform.OSVersion
+	cfg.Variant = platform.Variant
+	cfg.OSFeatures = platform.OSFeatures
+
+	// setup other config bits
 	cfg.Author = ib.author
 	cfg.Config.WorkingDir = filepath.Join("/home", ib.username)
 	cfg.Config.User = ib.username

diff --git a/pkg/packages/alpine/alpine.go b/pkg/packages/alpine/alpine.go
@@ -21,7 +21,7 @@ import (
 var installedFile = filepath.Join("/lib", "apk", "db", "installed")
 
 type PackageKeeper struct {
-	rootfs fs.FullFS
+	rootfs  fs.FullFS
 	indices []apk.NamedIndex
 }
 
@@ -39,7 +39,7 @@ func NewPackageKeeper(ctx context.Context, repositories []string, rootfs fs.Full
 
 	return &PackageKeeper{
 		indices: indices,
-		rootfs: rootfs,
+		rootfs:  rootfs,
 	}, nil
 }
 
@@ -74,7 +74,7 @@ func (p *PackageKeeper) Record(ctx context.Context, pkg *repository.RepositoryPa
 	scanner := bufio.NewScanner(bytes.NewReader(world))
 	for scanner.Scan() {
 		line := scanner.Text()
-		if line == "P:" + pkg.Name {
+		if line == "P:"+pkg.Name {
 			log.V(2).Info("located package in installed file")
 			return nil
 		}