@@ -38,7 +38,11 @@ type Results struct {
3838
3939// Returns a Container built from the Dockerfile in the provided Directory
4040func (m * Ci ) Build (_ context.Context , dir * dagger.Directory ) * dagger.Container {
41- return dag .Container ().Build (dir )
41+ return dag .Container ().
42+ WithDirectory ("/src" , dir ).
43+ WithWorkdir ("/src" ).
44+ Directory ("/src" ).
45+ DockerBuild ()
4246}
4347
4448// Returns the result of haml-lint run against the sources in the provided Directory
@@ -178,6 +182,11 @@ func (m *Ci) BaseTestContainer(_ context.Context, dir *dagger.Directory) *dagger
178182 WithExec ([]string {"bundle" , "install" , "--jobs" , "4" , "--retry" , "3" })
179183}
180184
185+ // Publish the Container built from the Dockerfile in the provided registry
186+ func (m * Ci ) Publish (ctx context.Context , dir * dagger.Directory , destImage string ) (string , error ) {
187+ return m .Build (ctx , dir ).Publish (ctx , destImage )
188+ }
189+
181190// Executes all the steps and returns a Results object
182191func (m * Ci ) Ci (
183192 ctx context.Context ,
@@ -226,14 +235,14 @@ func (m *Ci) CiIntegration(
226235 }()
227236
228237 /*
229- var vulnerabilityScan = func() *dagger.File {
230- defer wg.Done()
231- return m.Vulnscan(m.Sbom(m.Build(ctx, dir)))
232- }()
233- var image = func() *dagger.Container {
234- defer wg.Done()
235- return m.Build(ctx, dir)
236- }()
238+ var vulnerabilityScan = func() *dagger.File {
239+ defer wg.Done()
240+ return m.Vulnscan(m.Sbom(m.Build(ctx, dir)))
241+ }()
242+ var image = func() *dagger.Container {
243+ defer wg.Done()
244+ return m.Build(ctx, dir)
245+ }()
237246 */
238247
239248 var testReports = func () * dagger.Directory {
@@ -250,11 +259,11 @@ func (m *Ci) CiIntegration(
250259 securityScanName , _ := securityScan .Name (ctx )
251260 //vulnerabilityScanName, _ := vulnerabilityScan.Name(ctx)
252261 result_container := dag .Container ().
253- WithWorkdir ("/tmp/out" ).
254- WithFile (fmt .Sprintf ("/tmp/out/lint/%s" , lintOutputName ), lintOutput ).
255- WithFile (fmt .Sprintf ("/tmp/out/scan/%s" , securityScanName ), securityScan ).
256- WithDirectory ("/tmp/out/unit-tests/" , testReports )
257- //WithFile(fmt.Sprintf("/tmp/out/vuln/%s", vulnerabilityScanName), vulnerabilityScan)
262+ WithWorkdir ("/tmp/out" ).
263+ WithFile (fmt .Sprintf ("/tmp/out/lint/%s" , lintOutputName ), lintOutput ).
264+ WithFile (fmt .Sprintf ("/tmp/out/scan/%s" , securityScanName ), securityScan ).
265+ WithDirectory ("/tmp/out/unit-tests/" , testReports )
266+ //WithFile(fmt.Sprintf("/tmp/out/vuln/%s", vulnerabilityScanName), vulnerabilityScan)
258267 return result_container .
259- Directory ("." )
268+ Directory ("." )
260269}
0 commit comments