tmp

Signed-off-by: Mateusz Gozdek <mgozdek@microsoft.com>

Author: invidian

targets/linux/deb/distro/distro.go

@@ -110,49 +110,14 @@ func (cfg *Config) Handle(ctx context.Context, client gwclient.Client) (*gwclien
 		Description: "Builds a container image for testing purposes only.",
 	})
 
-	mux.Add("testing/container/distroless", func(ctx context.Context, client gwclient.Client) (*gwclient.Result, error) {
-		return frontend.BuildWithPlatform(ctx, client, func(ctx context.Context, client gwclient.Client, platform *ocispecs.Platform, spec *dalec.Spec, targetKey string) (gwclient.Reference, *dalec.DockerImageSpec, error) {
-			sOpt, err := frontend.SourceOptFromClient(ctx, client, platform)
-			if err != nil {
-				return nil, nil, err
-			}
+	mux.Add("container", func(ctx context.Context, client gwclient.Client) (*gwclient.Result, error) {
+		cfg := *cfg
+		cfg.DefaultOutputImage = ""
 
-			var opts []llb.ConstraintsOpt
-			opts = append(opts, dalec.ProgressGroup(spec.Name))
-			opts = append(opts, dalec.Platform(platform))
-
-			worker := cfg.Worker(sOpt, opts...)
-
-			// TODO: Add back support for prebuilt packages.
-			pkgSt := cfg.BuildPkg(ctx, client, sOpt, spec, targetKey, opts...)
-
-			img, err := cfg.BuildImageConfig(ctx, sOpt, spec, platform, targetKey)
-			if err != nil {
-				return nil, nil, err
-			}
-
-			input := BuildContainerInput{
-				Config: cfg,
-				Client: client,
-				Worker: worker,
-				SOpt:   sOpt,
-				Spec:   spec,
-				Target: targetKey,
-				DebSt:  pkgSt,
-				Opts:   opts,
-			}
-
-			ctr := BuildDistrolessContainer(ctx, input)
-
-			tests := cfg.RunTests(ctx, client, spec, sOpt, ctr, targetKey, opts...)
-
-			ref, err := getRef(ctx, client, ctr.With(tests))
-
-			return ref, img, err
-		})
+		return linux.HandleContainer(&cfg)(ctx, client)
 	}, &targets.Target{
-		Name:        "testing/container/distroless",
-		Description: "Builds a distroless container image for testing purposes only.",
+		Name:        "container",
+		Description: "Builds a container image.",
 	})
 
 	mux.Add("dsc", cfg.HandleSourcePkg, &targets.Target{

test/custom_repo_test.go

@@ -154,7 +154,7 @@ func testCustomRepo(ctx context.Context, t *testing.T, workerCfg workerConfig, t
 			sr = newSolveRequest(
 				withSpec(ctx, t, getSpec(depSpec, nil, repoPath, "public.key")),
 				withBuildContext(ctx, t, "test-repo", repoState),
-				withBuildTarget(targetCfg.Container),
+				withBuildTarget(targetCfg.Package),
 				withPlatformPtr(workerCfg.Platform),
 			)
 
@@ -204,7 +204,7 @@ func testCustomRepo(ctx context.Context, t *testing.T, workerCfg workerConfig, t
 				withSpec(ctx, t, spec),
 				withBuildContext(ctx, t, "test-repo", repoState),
 				withBuildContext(ctx, t, "repo-public-key", gpgKey),
-				withBuildTarget(targetCfg.Container),
+				withBuildTarget(targetCfg.Package),
 				withPlatformPtr(workerCfg.Platform),
 			)