opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-02 00:30:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

libpod: set cid network alias in setupContainer()

Browse Source 
Since we have sqlite there is no point in duplicating this acroos two db
backends. Just set earlier when we validate the networks anyway.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger
2023-07-11 15:16:11 +02:00
parent e6dbb422ef
commit b6ec2127b8
3 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libpod/boltdb_state_internal.go
View File

@ -607,8 +607,6 @@ func (s *BoltState) addContainer(ctr *Container, pod *Pod) error {
if opts.InterfaceName == "" { if opts.InterfaceName == "" {
return fmt.Errorf("network interface name cannot be an empty string: %w", define.ErrInvalidArg) return fmt.Errorf("network interface name cannot be an empty string: %w", define.ErrInvalidArg)
} }
// always add the short id as alias for docker compat
opts.Aliases = append(opts.Aliases, ctr.config.ID[:12])
optBytes, err := json.Marshal(opts) optBytes, err := json.Marshal(opts)
if err != nil { if err != nil {
return fmt.Errorf("marshalling network options JSON for container %s: %w", ctr.ID(), err) return fmt.Errorf("marshalling network options JSON for container %s: %w", ctr.ID(), err)

2
libpod/runtime_ctr.go
View File

@ -282,6 +282,8 @@ func (r *Runtime) setupContainer(ctx context.Context, ctr *Container) (_ *Contai
return nil, errors.New("failed to find free network interface name") return nil, errors.New("failed to find free network interface name")
} }
} }
// always add the short id as alias for docker compat
opts.Aliases = append(opts.Aliases, ctr.config.ID[:12])
normalizeNetworks[netName] = opts normalizeNetworks[netName] = opts
} }

6
libpod/sqlite_state_internal.go
View File

@ -385,12 +385,6 @@ func (s *SQLiteState) rewriteContainerConfig(ctr *Container, newCfg *ContainerCo
} }
func (s *SQLiteState) addContainer(ctr *Container) (defErr error) { func (s *SQLiteState) addContainer(ctr *Container) (defErr error) {
for net := range ctr.config.Networks {
opts := ctr.config.Networks[net]
opts.Aliases = append(opts.Aliases, ctr.config.ID[:12])
ctr.config.Networks[net] = opts
}
configJSON, err := json.Marshal(ctr.config) configJSON, err := json.Marshal(ctr.config)
if err != nil { if err != nil {
return fmt.Errorf("marshalling container config json: %w", err) return fmt.Errorf("marshalling container config json: %w", err)