particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use OCI upload implementation from osbuild/images (HMS-9027)

Browse source 
Delete the OCI upload implementation from osbuild-composer and use
the one from osbuild/images.

Signed-off-by: Tomáš Hozza <thozza@redhat.com>
This commit is contained in:
Tomáš Hozza 2025-08-12 12:37:00 +02:00 • committed by Achilleas Koutsou
parent 00a466f7c6
commit bce2bbf9e1
6 changed files with 23 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cmd/osbuild-upload-oci/main.go
View file

@ -7,7 +7,7 @@ import (
"math/big"
"os"
"github.com/osbuild/osbuild-composer/internal/upload/oci"
"github.com/osbuild/images/pkg/upload/oci"
"github.com/spf13/cobra"
)

18
cmd/osbuild-worker/jobimpl-osbuild.go
View file

@ -16,25 +16,23 @@ import (
"slices"
"strings"
"github.com/osbuild/images/pkg/arch"
"github.com/osbuild/images/pkg/container"
"github.com/osbuild/images/pkg/distro"
"github.com/osbuild/images/pkg/osbuild"
"github.com/osbuild/images/pkg/sbom"
"github.com/osbuild/osbuild-composer/internal/common"
"github.com/osbuild/osbuild-composer/internal/upload/oci"
ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types"
"github.com/google/uuid"
"github.com/sirupsen/logrus"
ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types"
"github.com/osbuild/images/pkg/arch"
"github.com/osbuild/images/pkg/cloud/azure"
"github.com/osbuild/images/pkg/container"
"github.com/osbuild/images/pkg/distro"
"github.com/osbuild/images/pkg/osbuild"
"github.com/osbuild/images/pkg/platform"
"github.com/osbuild/images/pkg/sbom"
"github.com/osbuild/images/pkg/upload/koji"
"github.com/osbuild/images/pkg/upload/oci"
"github.com/osbuild/images/pkg/upload/vmware"
"github.com/osbuild/osbuild-composer/internal/cloud/awscloud"
"github.com/osbuild/osbuild-composer/internal/cloud/gcp"
"github.com/osbuild/osbuild-composer/internal/common"
"github.com/osbuild/osbuild-composer/internal/osbuildexecutor"
"github.com/osbuild/osbuild-composer/internal/target"
"github.com/osbuild/osbuild-composer/internal/worker"

2
cmd/osbuild-worker/main.go
View file

@ -25,8 +25,8 @@ import (
"github.com/osbuild/images/pkg/dnfjson"
"github.com/osbuild/images/pkg/olog"
"github.com/osbuild/images/pkg/upload/koji"
"github.com/osbuild/images/pkg/upload/oci"
"github.com/osbuild/osbuild-composer/internal/cloud/awscloud"
"github.com/osbuild/osbuild-composer/internal/upload/oci"
"github.com/osbuild/osbuild-composer/internal/worker"
)