Combine build and push in a single step.

voormedia · Nov 13, 2024 · deeeeb4 · deeeeb4
1 parent 6a94d1c
commit deeeeb4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v2.5.4
+
+* Combine build and push in a single step.
+
 # v2.5.3
 
 * Increase compatibility with older docker clients.

diff --git a/pkg/build/cmd.go b/pkg/build/cmd.go
@@ -41,10 +41,7 @@ func Run(log *util.Logger, app *config.ResolvedApp, buildCacheTag string) error
 		log.Fatal(err)
 	}
 
-	log.Note("Pushing to", app.Repository())
-	if err := docker.Push(log, app); err != nil {
-		log.Fatal(err)
-	}
+	log.Note("Pushed to", app.Repository())
 
 	if app.PostBuild != "" {
 		err := util.Run(log, "sh", "-c", app.PostBuild)

diff --git a/pkg/internal/docker/cli.go b/pkg/internal/docker/cli.go
@@ -59,21 +59,14 @@ func Build(log *util.Logger, app *config.ResolvedApp, buildCacheTag string) erro
 
 	return util.Run(log,
 		"docker", append(cmd,
-			"--output=type=image",
+			"--output=type=image,name="+app.Repository()+",push=true",
 			"--file", dockerfile,
 			"--tag", app.Repository(),
 			"--platform", app.Platform,
 			app.Root,
 		)...)
 }
 
-func Push(log *util.Logger, app *config.ResolvedApp) error {
-	return util.Run(log,
-		"docker",
-		"push", app.Repository(),
-	)
-}
-
 func supportsCacheExport(log *util.Logger) bool {
 	output, err := util.Capture(log, "docker", "buildx", "inspect", "--debug")
 	if err != nil {