opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-18 11:42:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19085 from dfr/emulate-linux

Browse Source 
pkg/specgen: properly identify image OS on FreeBSD
This commit is contained in:
OpenShift Merge Robot
2023-07-05 03:50:19 -04:00
committed by GitHub
parent 10615e784b 644f7cd9be
commit f33a3bdc35
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/specgen/generate/oci_freebsd.go
View File

@ -18,11 +18,17 @@ import (
// SpecGenToOCI returns the base configuration for the container.
func SpecGenToOCI(ctx context.Context, s *specgen.SpecGenerator, rt *libpod.Runtime, rtc *config.Config, newImage *libimage.Image, mounts []spec.Mount, pod *libpod.Pod, finalCmd []string, compatibleOptions *libpod.InfraInherit) (*spec.Spec, error) {
if s.ImageOS != "freebsd" && s.ImageOS != "linux" {
return nil, fmt.Errorf("unsupported image OS: %s", s.ImageOS)
inspectData, err := newImage.Inspect(ctx, nil)
if err != nil {
return nil, err
}
imageOs := inspectData.Os
if imageOs != "freebsd" && imageOs != "linux" {
return nil, fmt.Errorf("unsupported image OS: %s", imageOs)
}
g, err := generate.New(s.ImageOS)
g, err := generate.New(imageOs)
if err != nil {
return nil, err
}
@ -55,7 +61,7 @@ func SpecGenToOCI(ctx context.Context, s *specgen.SpecGenerator, rt *libpod.Runt
}
// Linux emulatioon
if s.ImageOS == "linux" {
if imageOs == "linux" {
var mounts []spec.Mount
for _, m := range configSpec.Mounts {
switch m.Destination {