Merge pull request dokku#7580 from dokku/7520-drop-network-on-dockerf…

…ile-build Do not set network flag when building dockerfile images
Tiamat-Tech · Mar 9, 2025 · c7f35eb · c7f35eb
2 parents ed58641 + 87cbbdb
commit c7f35eb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git 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
@@ -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)