Drop internal/common/distro.go in favor of osbuild/images
Drop `common.GetHostDistroName()` implementation and use `distro.GetHostDistroName()` from the osbuild/images instead. Signed-off-by: Tomáš Hozza <thozza@redhat.com>
This commit is contained in:
parent
fb1b27c0ef
commit
c4e5ab5aca
5 changed files with 5 additions and 110 deletions
|
|
@ -16,6 +16,7 @@ import (
|
|||
"strings"
|
||||
|
||||
"github.com/osbuild/images/pkg/container"
|
||||
"github.com/osbuild/images/pkg/distro"
|
||||
"github.com/osbuild/images/pkg/osbuild"
|
||||
|
||||
"github.com/osbuild/osbuild-composer/internal/upload/oci"
|
||||
|
|
@ -351,7 +352,7 @@ func (impl *OSBuildJobImpl) Run(job worker.Job) error {
|
|||
Arch: common.CurrentArch(),
|
||||
}
|
||||
|
||||
hostOS, _, _, err := common.GetHostDistroName()
|
||||
hostOS, err := distro.GetHostDistroName()
|
||||
if err != nil {
|
||||
logWithId.Warnf("Failed to get host distro name: %v", err)
|
||||
hostOS = "linux"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue