diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-08-30 10:29:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-30 10:29:36 -0400 |
| commit | 40627e08a4ec866cad31d98cd7ff1786e7535745 (patch) | |
| tree | 615974f46676aa66f928b383ad8a0a3e6ff0b7b4 /pkg | |
| parent | 7f141a71a298a201b8bed5f3e6d9c9972bf20c81 (diff) | |
| parent | b4f5a246a24569cc72b109c3477e867e503d14cb (diff) | |
| download | podman-40627e08a4ec866cad31d98cd7ff1786e7535745.tar.gz podman-40627e08a4ec866cad31d98cd7ff1786e7535745.tar.bz2 podman-40627e08a4ec866cad31d98cd7ff1786e7535745.zip | |
Merge pull request #15517 from tyler92/remove-libnetwork-dep
remove github.com/docker/libnetwork dependency
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/specgenutil/specgen.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkg/specgenutil/specgen.go b/pkg/specgenutil/specgen.go index 8c2c59fed..d0e09fe72 100644 --- a/pkg/specgenutil/specgen.go +++ b/pkg/specgenutil/specgen.go @@ -20,7 +20,6 @@ import ( "github.com/containers/podman/v4/pkg/specgen" systemdDefine "github.com/containers/podman/v4/pkg/systemd/define" "github.com/containers/podman/v4/pkg/util" - "github.com/docker/docker/opts" "github.com/docker/go-units" "github.com/opencontainers/runtime-spec/specs-go" ) @@ -461,11 +460,12 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *entities.ContainerCreateOptions // SHM Size if c.ShmSize != "" { - var m opts.MemBytes - if err := m.Set(c.ShmSize); err != nil { + val, err := units.RAMInBytes(c.ShmSize) + + if err != nil { return fmt.Errorf("unable to translate --shm-size: %w", err) } - val := m.Value() + s.ShmSize = &val } |