From 87cbbdbc9abe1236f373e70d32870e3637de1616 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 9 Mar 2025 06:56:56 -0400 Subject: [PATCH] fix: do not set network flag when building dockerfile images The network flag is unsupported by the docker image build command under buildx (which is default now). Closes #7520 --- plugins/network/src/triggers/triggers.go | 9 ++++++--- plugins/network/triggers.go | 7 ++++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/plugins/network/src/triggers/triggers.go b/plugins/network/src/triggers/triggers.go index 1a54d0f43..bd14ef953 100644 --- a/plugins/network/src/triggers/triggers.go +++ b/plugins/network/src/triggers/triggers.go @@ -20,13 +20,16 @@ func main() { switch trigger { case "docker-args-process-build": appName := flag.Arg(0) - err = network.TriggerDockerArgsProcess(appName) + imageSourceType := flag.Arg(1) + err = network.TriggerDockerArgsProcess("build", appName, imageSourceType) case "docker-args-process-deploy": appName := flag.Arg(0) - err = network.TriggerDockerArgsProcess(appName) + imageSourceType := flag.Arg(1) + err = network.TriggerDockerArgsProcess("deploy", appName, imageSourceType) case "docker-args-process-run": appName := flag.Arg(0) - err = network.TriggerDockerArgsProcess(appName) + imageSourceType := flag.Arg(1) + err = network.TriggerDockerArgsProcess("run", appName, imageSourceType) case "install": err = network.TriggerInstall() case "network-build-config": diff --git a/plugins/network/triggers.go b/plugins/network/triggers.go index 6ad20bd0c..370ffd68f 100644 --- a/plugins/network/triggers.go +++ b/plugins/network/triggers.go @@ -10,12 +10,17 @@ import ( ) // TriggerDockerArgsProcess outputs the network plugin docker options for an app -func TriggerDockerArgsProcess(appName string) error { +func TriggerDockerArgsProcess(stage string, appName string, imageSourceType string) error { stdin, err := io.ReadAll(os.Stdin) if err != nil { return err } + if stage == "build" && imageSourceType == "dockerfile" { + fmt.Print(string(stdin)) + return nil + } + initialNetwork := reportComputedInitialNetwork(appName) if initialNetwork != "" { fmt.Printf(" --network=%s ", initialNetwork)