github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: do not set network flag when building dockerfile images

Browse Source 
The network flag is unsupported by the docker image build command under buildx (which is default now).

Closes #7520
This commit is contained in:
Jose Diaz-Gonzalez
2025-03-09 06:56:56 -04:00
parent ed58641d41
commit 87cbbdbc9a
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/network/src/triggers/triggers.go
View File

@@ -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":

7
plugins/network/triggers.go
View File

@@ -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)