Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions pkg/standalone/container.go
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,19 @@ func confirmContainerIsRunningOrExists(containerName string, isRunning bool, run
return true, nil
}

// publishPortNetworkArgs returns the extra network args needed so that -p
// mappings are honoured when the CLI does not pass an explicit --network.
// podman applies the containers.conf netns default (e.g. netns="host"), which
// silently drops every -p; "private" forces a fresh netns (bridge for rootful,
// pasta/slirp4netns for rootless), i.e. podman's own default. docker has no
// such override and does not accept "private", so it gets nothing.
func publishPortNetworkArgs(runtimeCmd string) []string {
if runtimeCmd == string(utils.PODMAN) {
return []string{"--network", "private"}
}
return nil
}

func isContainerRunError(err error) bool {
if exitError, ok := err.(*exec.ExitError); ok {
exitCode := exitError.ExitCode()
Expand Down
4 changes: 4 additions & 0 deletions pkg/standalone/standalone.go
Original file line number Diff line number Diff line change
Expand Up @@ -437,6 +437,7 @@ func runZipkin(wg *sync.WaitGroup, errorChan chan<- error, info initInfo) {
"--network", info.dockerNetwork,
"--network-alias", DaprZipkinContainerName)
} else {
args = append(args, publishPortNetworkArgs(runtimeCmd)...)
args = append(
args,
"-p", "9411:9411")
Expand Down Expand Up @@ -498,6 +499,7 @@ func runRedis(wg *sync.WaitGroup, errorChan chan<- error, info initInfo) {
"--network", info.dockerNetwork,
"--network-alias", DaprRedisContainerName)
} else {
args = append(args, publishPortNetworkArgs(runtimeCmd)...)
args = append(
args,
"-p", "6379:6379")
Expand Down Expand Up @@ -599,6 +601,7 @@ func runPlacementService(wg *sync.WaitGroup, errorChan chan<- error, info initIn
osPort = 6050
}

args = append(args, publishPortNetworkArgs(runtimeCmd)...)
args = append(args,
"-p", fmt.Sprintf("%v:50005", osPort),
"-p", fmt.Sprintf("%v:8080", healthPort),
Expand Down Expand Up @@ -710,6 +713,7 @@ func runSchedulerService(wg *sync.WaitGroup, errorChan chan<- error, info initIn
osPort = 6060
}

args = append(args, publishPortNetworkArgs(runtimeCmd)...)
args = append(args,
"-p", fmt.Sprintf("%v:50006", osPort),
"-p", fmt.Sprintf("%v:2379", schedulerEtcdPort),
Expand Down
5 changes: 5 additions & 0 deletions pkg/standalone/standalone_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -407,3 +407,8 @@ func TestIsSchedulerIncluded(t *testing.T) {
})
}
}

func TestPublishPortNetworkArgs(t *testing.T) {
assert.Equal(t, []string{"--network", "private"}, publishPortNetworkArgs("podman"))
assert.Nil(t, publishPortNetworkArgs("docker"))
}