Skip to content

Commit 2bf2b22

Browse files
cpuguy83ndeloof
authored andcommitted
Add source policies for build
Build{x,kit} support passing in source policies via an (expirimental) env var. This change adds those policies to the build request. Signed-off-by: Brian Goff <[email protected]>
1 parent 8d81b87 commit 2bf2b22

File tree

1 file changed

+21
-15
lines changed

1 file changed

+21
-15
lines changed

pkg/compose/build.go

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -410,28 +410,34 @@ func (s *composeService) toBuildOptions(project *types.Project, service types.Se
410410
}}
411411
}
412412

413+
sp, err := build.ReadSourcePolicy()
414+
if err != nil {
415+
return build.Options{}, err
416+
}
417+
413418
return build.Options{
414419
Inputs: build.Inputs{
415420
ContextPath: service.Build.Context,
416421
DockerfileInline: service.Build.DockerfileInline,
417422
DockerfilePath: dockerFilePath(service.Build.Context, service.Build.Dockerfile),
418423
NamedContexts: toBuildContexts(service.Build.AdditionalContexts),
419424
},
420-
CacheFrom: pb.CreateCaches(cacheFrom),
421-
CacheTo: pb.CreateCaches(cacheTo),
422-
NoCache: service.Build.NoCache,
423-
Pull: service.Build.Pull,
424-
BuildArgs: flatten(resolveAndMergeBuildArgs(s.dockerCli, project, service, options)),
425-
Tags: tags,
426-
Target: service.Build.Target,
427-
Exports: exports,
428-
Platforms: plats,
429-
Labels: imageLabels,
430-
NetworkMode: service.Build.Network,
431-
ExtraHosts: service.Build.ExtraHosts.AsList(":"),
432-
Ulimits: toUlimitOpt(service.Build.Ulimits),
433-
Session: sessionConfig,
434-
Allow: allow,
425+
CacheFrom: pb.CreateCaches(cacheFrom),
426+
CacheTo: pb.CreateCaches(cacheTo),
427+
NoCache: service.Build.NoCache,
428+
Pull: service.Build.Pull,
429+
BuildArgs: flatten(resolveAndMergeBuildArgs(s.dockerCli, project, service, options)),
430+
Tags: tags,
431+
Target: service.Build.Target,
432+
Exports: exports,
433+
Platforms: plats,
434+
Labels: imageLabels,
435+
NetworkMode: service.Build.Network,
436+
ExtraHosts: service.Build.ExtraHosts.AsList(":"),
437+
Ulimits: toUlimitOpt(service.Build.Ulimits),
438+
Session: sessionConfig,
439+
Allow: allow,
440+
SourcePolicy: sp,
435441
}, nil
436442
}
437443

0 commit comments

Comments
 (0)