diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-24 17:46:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-24 17:46:20 +0200 |
| commit | 3c3adac52838bc4d2b0fdda2cbb8366c81444728 (patch) | |
| tree | e8f2c7807a36403a1ffef16a8147a1448e4a2221 /pkg/specgen/generate/container.go | |
| parent | dcb99f5315eea27f9cc8720937ae2f5c272a6a00 (diff) | |
| parent | 3eeb03d1f970478961acf21cecfdf90d5a75043f (diff) | |
| download | podman-3c3adac52838bc4d2b0fdda2cbb8366c81444728.tar.gz podman-3c3adac52838bc4d2b0fdda2cbb8366c81444728.tar.bz2 podman-3c3adac52838bc4d2b0fdda2cbb8366c81444728.zip | |
Merge pull request #5967 from giuseppe/run-test-fixes
v2, tests: fix various run_test.go failures
Diffstat (limited to 'pkg/specgen/generate/container.go')
| -rw-r--r-- | pkg/specgen/generate/container.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkg/specgen/generate/container.go b/pkg/specgen/generate/container.go index de3239fda..9797ad572 100644 --- a/pkg/specgen/generate/container.go +++ b/pkg/specgen/generate/container.go @@ -15,7 +15,11 @@ import ( func CompleteSpec(ctx context.Context, r *libpod.Runtime, s *specgen.SpecGenerator) error { var appendEntryPoint bool - // TODO add support for raw rootfs + // If a rootfs is used, then there is no image data + if s.ContainerStorageConfig.Rootfs != "" { + return nil + } + newImage, err := r.ImageRuntime().NewFromLocal(s.Image) if err != nil { return err |