diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-02-11 16:03:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-11 16:03:44 +0100 |
| commit | 27e42027f03287d7ca421351ea382302f7178324 (patch) | |
| tree | 19a7e97b7e1aa276e47adc07bba1270bd356ae2b | |
| parent | d9fa5af701b46a29d06d604ac2feacda07dbe255 (diff) | |
| parent | b0abd1c36ec5643c803b97a1c82f8d3121f902d4 (diff) | |
| download | podman-27e42027f03287d7ca421351ea382302f7178324.tar.gz podman-27e42027f03287d7ca421351ea382302f7178324.tar.bz2 podman-27e42027f03287d7ca421351ea382302f7178324.zip | |
Merge pull request #5161 from vrothberg/revert-96ab0c64b4e3
container create: relax os/arch checks
| -rw-r--r-- | cmd/podman/shared/create.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/podman/shared/create.go b/cmd/podman/shared/create.go index 010c80373..3062b0ca3 100644 --- a/cmd/podman/shared/create.go +++ b/cmd/podman/shared/create.go @@ -109,11 +109,11 @@ func CreateContainer(ctx context.Context, c *GenericCLIResults, runtime *libpod. } if overrideOS == "" && imageData.Os != goruntime.GOOS { - return nil, nil, errors.Errorf("incompatible image OS %q on %q host", imageData.Os, goruntime.GOOS) + logrus.Infof("Using %q (OS) image on %q host", imageData.Os, goruntime.GOOS) } if overrideArch == "" && imageData.Architecture != goruntime.GOARCH { - return nil, nil, errors.Errorf("incompatible image architecture %q on %q host", imageData.Architecture, goruntime.GOARCH) + logrus.Infof("Using %q (architecture) on %q host", imageData.Architecture, goruntime.GOARCH) } names := newImage.Names() |