jammy: Remove cached data for local repos before install

We don't really need to cache these since they are locally anyway.
It can also cause inconsistencies between builds if the repo config is
different, for instance during tests when swithcing between signed and
unsigned repos.

Signed-off-by: Brian Goff <[email protected]>

Author: cpuguy83

frontend/jammy/handle_container.go

@@ -104,8 +104,24 @@ func buildImageRootfs(worker llb.State, spec *dalec.Spec, sOpt dalec.SourceOpts,
 	debug := llb.Scratch().File(llb.Mkfile("debug", 0o644, []byte(`debug=2`)), opts...)
 	opts = append(opts, dalec.ProgressGroup("Install spec package"))
 
+	script := llb.Scratch().File(
+		llb.Mkfile("install.sh", 0o755, []byte(`#!/usr/bin/env sh
+set -ex
+
+rm -f /var/lib/apt/lists/_*
+apt autoclean -y
+
+apt update
+apt install -y /tmp/pkg/*.deb
+		`)),
+		opts...,
+	)
+
+	p := "/tmp/dalec/internal/install/container.sh"
+
 	return baseImg.Run(
-		dalec.ShArgs("set -x; apt update && apt install -y /tmp/pkg/*.deb"),
+		dalec.ShArgs(p),
+		llb.AddMount(p, script, llb.SourcePath("install.sh")),
 		customRepoOpts,
 		llb.AddEnv("DEBIAN_FRONTEND", "noninteractive"),
 		llb.AddMount("/tmp/pkg", deb, llb.Readonly),

frontend/jammy/handle_deb.go

@@ -2,7 +2,6 @@ package jammy
 
 import (
 	"context"
-	"fmt"
 	"io/fs"
 	"strings"
 
@@ -146,25 +145,60 @@ func customRepoMounts(worker llb.State, repos []dalec.PackageRepositoryConfig, s
 }
 
 func installPackages(ls []string, rOpts ...llb.RunOption) llb.RunOption {
+	script := llb.Scratch().File(
+		llb.Mkfile("install.sh", 0o755, []byte(`#!/usr/bin/env sh
+set -ex
+
+# Make sure any cached data from local repos is purged since this should not
+# be shared between builds.
+rm -f /var/lib/apt/lists/_*
+apt autoclean -y
+ls -lha /var/lib/apt/lists/
+
+apt update
+apt install -y `+strings.Join(ls, " ")+`
+`,
+		)),
+	)
+
+	p := "/tmp/dalec/internal/deb/install.sh"
 	return dalec.RunOptFunc(func(ei *llb.ExecInfo) {
-		// This only runs apt-get update if the pkgcache is older than 10 minutes.
-		dalec.ShArgs(`set -ex; apt update; apt install -y ` + strings.Join(ls, " ")).SetRunOption(ei)
+		llb.AddMount(p, script, llb.SourcePath("install.sh")).SetRunOption(ei)
+		dalec.ShArgs(p).SetRunOption(ei)
 		dalec.WithMountedAptCache(AptCachePrefix).SetRunOption(ei)
 		dalec.WithRunOptions(rOpts...).SetRunOption(ei)
 	})
 }
 
 func installWithConstraints(pkgPath string, pkgName string, rOpts ...llb.RunOption) llb.RunOption {
 	return dalec.RunOptFunc(func(ei *llb.ExecInfo) {
+		script := llb.Scratch().File(
+			llb.Mkfile("install.sh", 0o755, []byte(`#!/usr/bin/env sh
+set -ex
+
+# Make sure any cached data from local repos is purged since this should not
+# be shared between builds.
+rm -f /var/lib/apt/lists/_*
+apt autoclean -y
+ls -lha /var/lib/apt/lists/
+
+dpkg -i --force-depends `+pkgPath+`
+
+apt update
+aptitude install -y -f -o "Aptitude::ProblemResolver::Hints::=reject `+pkgName+` :UNINST"
+`),
+			))
 		// The apt solver always tries to select the latest package version even when constraints specify that an older version should be installed and that older version is available in a repo.
 		// This leads the solver to simply refuse to install our target package if the latest version of ANY dependency package is incompatible with the constraints.
 		// To work around this we first install the .deb for the package with dpkg, specifically ignoring any dependencies so that we can avoid the constraints issue.
 		// We then use aptitude to fix the (possibly broken) install of the package, and we pass the aptitude solver a hint to REJECT any solution that involves uninstalling the package.
 		// This forces aptitude to find a solution that will respect the constraints even if the solution involves pinning dependency packages to older versions.
-		dalec.ShArgs(`set -ex; dpkg -i --force-depends ` + pkgPath +
-			fmt.Sprintf(`; apt update; aptitude install -y -f -o "Aptitude::ProblemResolver::Hints::=reject %s :UNINST"`, pkgName)).SetRunOption(ei)
 		dalec.WithMountedAptCache(AptCachePrefix).SetRunOption(ei)
 		dalec.WithRunOptions(rOpts...).SetRunOption(ei)
+
+		p := "/tmp/dalec/internal/deb/install-with-constraints.sh"
+		llb.AddMount(p, script, llb.SourcePath("install.sh")).SetRunOption(ei)
+		dalec.ShArgs(p).SetRunOption(ei)
 	})
 }