diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-11-03 17:15:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-03 17:15:46 +0100 |
| commit | 4105b025d60dd6d067fa293de11c45dcfd7ea30e (patch) | |
| tree | 8e5f61e3adc5cb03d57a71a1998999d9d7587bb4 /pkg/specgenutil/specgen.go | |
| parent | a245da1e52b63c451f4683f7a9b225aa49521939 (diff) | |
| parent | 001d48929dcbe4f3a8eeb3db2a7bfdce5a90f81a (diff) | |
| download | podman-4105b025d60dd6d067fa293de11c45dcfd7ea30e.tar.gz podman-4105b025d60dd6d067fa293de11c45dcfd7ea30e.tar.bz2 podman-4105b025d60dd6d067fa293de11c45dcfd7ea30e.zip | |
Merge pull request #12166 from Luap99/mac
MAC address json unmarshal should allow strings
Diffstat (limited to 'pkg/specgenutil/specgen.go')
| -rw-r--r-- | pkg/specgenutil/specgen.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkg/specgenutil/specgen.go b/pkg/specgenutil/specgen.go index 683cd2918..4e8f954fb 100644 --- a/pkg/specgenutil/specgen.go +++ b/pkg/specgenutil/specgen.go @@ -11,6 +11,7 @@ import ( "github.com/containers/image/v5/manifest" "github.com/containers/podman/v3/cmd/podman/parse" "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v3/libpod/network/types" ann "github.com/containers/podman/v3/pkg/annotations" "github.com/containers/podman/v3/pkg/domain/entities" envLib "github.com/containers/podman/v3/pkg/env" @@ -457,7 +458,8 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *entities.ContainerCreateOptions s.DNSSearch = c.Net.DNSSearch s.DNSOptions = c.Net.DNSOptions s.StaticIP = c.Net.StaticIP - s.StaticMAC = c.Net.StaticMAC + // type cast to types.HardwareAddr + s.StaticMAC = (*types.HardwareAddr)(c.Net.StaticMAC) s.NetworkOptions = c.Net.NetworkOptions s.UseImageHosts = c.Net.NoHosts } |