Skip to content

Commit

Permalink
Merge pull request #101 from thin-edge/fix-set-network-mode
Browse files Browse the repository at this point in the history
fix(container): set network mode when creating a container
  • Loading branch information
reubenmiller authored Nov 30, 2024
2 parents fc393f9 + 5433f36 commit c32d0d4
Showing 1 changed file with 14 additions and 7 deletions.
21 changes: 14 additions & 7 deletions cli/container/install.go
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,10 @@ func (c *InstallCommand) RunE(cmd *cobra.Command, args []string) error {
}

// Create shared network
if err := cli.CreateSharedNetwork(ctx, commonNetwork); err != nil {
return err
if commonNetwork != "" {
if err := cli.CreateSharedNetwork(ctx, commonNetwork); err != nil {
return err
}
}

//
Expand Down Expand Up @@ -168,21 +170,26 @@ func (c *InstallCommand) RunE(cmd *cobra.Command, args []string) error {
Labels: map[string]string{},
}

networkConfig := make(map[string]*network.EndpointSettings)
if commonNetwork != "" {
slog.Info("Connecting container to common network.", "network", commonNetwork)
networkConfig[commonNetwork] = &network.EndpointSettings{
NetworkID: commonNetwork,
}
}

resp, err := cli.Client.ContainerCreate(
ctx,
containerConfig,
&containerSDK.HostConfig{
PublishAllPorts: true,
NetworkMode: network.NetworkBridge,
RestartPolicy: containerSDK.RestartPolicy{
Name: containerSDK.RestartPolicyAlways,
},
},
&network.NetworkingConfig{
EndpointsConfig: map[string]*network.EndpointSettings{
commonNetwork: {
NetworkID: commonNetwork,
},
},
EndpointsConfig: networkConfig,
},
nil,
containerName,
Expand Down

0 comments on commit c32d0d4

Please sign in to comment.