Skip to content

WIP: move to sysregistriesv2 #709

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
vrothberg wants to merge 1 commit into from
Closed

WIP: move to sysregistriesv2 #709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions cmd/podman/search.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@ import (
"strings"

"github.com/containers/image/docker"
"github.com/containers/image/pkg/sysregistriesv2"
"github.com/containers/image/types"
"github.com/pkg/errors"
"github.com/projectatomic/libpod/cmd/podman/formats"
"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
"github.com/projectatomic/libpod/libpod/common"
sysreg "github.com/projectatomic/libpod/pkg/registries"
"github.com/sirupsen/logrus"
"github.com/urfave/cli"
)
Expand Down Expand Up @@ -107,22 +108,25 @@ func searchCmd(c *cli.Context) error {
filter: c.StringSlice("filter"),
}

var registries []string
var searchRegistries []string
if len(c.StringSlice("registry")) > 0 {
registries = c.StringSlice("registry")
searchRegistries = c.StringSlice("registry")
} else {
registries, err = sysreg.GetRegistries()
registries, err := sysregistriesv2.GetRegistries(&types.SystemContext{})
if err != nil {
return errors.Wrapf(err, "error getting registries to search")
}
for _, reg := range sysregistriesv2.FindUnqualifiedSearchRegistries(registries) {
searchRegistries = append(searchRegistries, reg.URL.String())
}
}

filter, err := parseSearchFilter(&opts)
if err != nil {
return err
}

return generateSearchOutput(term, registries, opts, *filter)
return generateSearchOutput(term, searchRegistries, opts, *filter)
}

func genSearchFormat(format string) string {
Expand Down
4 changes: 2 additions & 2 deletions contrib/spec/podman.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ BuildRequires: golang(github.com/containers/image/docker/tarfile)
BuildRequires: golang(github.com/containers/image/image)
BuildRequires: golang(github.com/containers/image/oci/archive)
BuildRequires: golang(github.com/containers/image/pkg/strslice)
BuildRequires: golang(github.com/containers/image/pkg/sysregistries)
BuildRequires: golang(github.com/containers/image/pkg/sysregistriesv2)
BuildRequires: golang(github.com/containers/image/signature)
BuildRequires: golang(github.com/containers/image/storage)
BuildRequires: golang(github.com/containers/image/tarball)
Expand Down Expand Up @@ -256,7 +256,7 @@ Requires: golang(github.com/containers/image/docker/tarfile)
Requires: golang(github.com/containers/image/image)
Requires: golang(github.com/containers/image/oci/archive)
Requires: golang(github.com/containers/image/pkg/strslice)
Requires: golang(github.com/containers/image/pkg/sysregistries)
Requires: golang(github.com/containers/image/pkg/sysregistries2)
Requires: golang(github.com/containers/image/signature)
Requires: golang(github.com/containers/image/storage)
Requires: golang(github.com/containers/image/tarball)
Expand Down
17 changes: 12 additions & 5 deletions libpod/image/pull.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,12 @@ import (
"github.com/containers/image/docker/reference"
"github.com/containers/image/docker/tarfile"
ociarchive "github.com/containers/image/oci/archive"
"github.com/containers/image/pkg/sysregistries"
"github.com/containers/image/pkg/sysregistriesv2"
is "github.com/containers/image/storage"
"github.com/containers/image/tarball"
"github.com/containers/image/transports/alltransports"
"github.com/containers/image/types"
"github.com/pkg/errors"
"github.com/projectatomic/libpod/pkg/registries"
"github.com/projectatomic/libpod/pkg/util"
"github.com/sirupsen/logrus"
)
Expand Down Expand Up @@ -179,10 +178,16 @@ func (i *Image) pullImage(ctx context.Context, writer io.Writer, authfile, signa
}
defer policyContext.Destroy()

insecureRegistries, err := registries.GetInsecureRegistries()
registries, err := sysregistriesv2.GetRegistries(&types.SystemContext{})
if err != nil {
return "", err
}
insecureRegistries := []string{}
for _, reg := range registries {
if reg.Insecure {
insecureRegistries = append(insecureRegistries, reg.URL.String())
}
}

for _, imageInfo := range pullStructs {
copyOptions := getCopyOptions(writer, signaturePolicyPath, dockerOptions, nil, signingOptions, authfile, "", false)
Expand Down Expand Up @@ -238,12 +243,14 @@ func (i *Image) createNamesToPull() ([]*pullStruct, error) {
if len(envOverride) > 0 {
registryConfigPath = envOverride
}
searchRegistries, err := sysregistries.GetRegistries(&types.SystemContext{SystemRegistriesConfPath: registryConfigPath})
registries, err := sysregistriesv2.GetRegistries(&types.SystemContext{SystemRegistriesConfPath: registryConfigPath})
if err != nil {
return nil, err
}
searchRegistries := sysregistriesv2.FindUnqualifiedSearchRegistries(registries)

for _, registry := range searchRegistries {
decomposedImage.registry = registry
decomposedImage.registry = registry.URL.String()
srcRef, err := alltransports.ParseImageName(decomposedImage.assembleWithTransport())
if err != nil {
return nil, errors.Wrapf(err, "unable to parse '%s'", i.InputName)
Expand Down
31 changes: 20 additions & 11 deletions libpod/runtime.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"sync"

"github.com/BurntSushi/toml"
"github.com/containers/image/pkg/sysregistriesv2"
is "github.com/containers/image/storage"
"github.com/containers/image/types"
"github.com/containers/storage"
Expand All @@ -16,7 +17,6 @@ import (
"github.com/pkg/errors"
"github.com/projectatomic/libpod/libpod/image"
"github.com/projectatomic/libpod/pkg/hooks"
sysreg "github.com/projectatomic/libpod/pkg/registries"
"github.com/sirupsen/logrus"
"github.com/ulule/deepcopier"
)
Expand Down Expand Up @@ -552,21 +552,30 @@ func (r *Runtime) Info() ([]InfoData, error) {
}
info = append(info, InfoData{Type: "store", Data: storeInfo})

reg, err := sysreg.GetRegistries()
registries, err := sysregistriesv2.GetRegistries(&types.SystemContext{})
if err != nil {
return nil, errors.Wrapf(err, "error getting registries")
}
registries := make(map[string]interface{})
registries["registries"] = reg
info = append(info, InfoData{Type: "registries", Data: registries})

i, err := sysreg.GetInsecureRegistries()
if err != nil {
return nil, errors.Wrapf(err, "error getting registries")
// search registries
searchRegs := []string{}
for _, reg := range sysregistriesv2.FindUnqualifiedSearchRegistries(registries) {
searchRegs = append(searchRegs, reg.URL.String())
}
searchInfo := make(map[string]interface{})
searchInfo["registries"] = searchRegs
info = append(info, InfoData{Type: "registries", Data: searchInfo})

// insecure registries
insecureRegs := []string{}
for _, reg := range registries {
if reg.Insecure {
insecureRegs = append(insecureRegs, reg.URL.String())
}
}
insecureRegistries := make(map[string]interface{})
insecureRegistries["registries"] = i
info = append(info, InfoData{Type: "insecure registries", Data: insecureRegistries})
insecureInfo := make(map[string]interface{})
insecureInfo["registries"] = insecureRegs
info = append(info, InfoData{Type: "insecure registries", Data: insecureInfo})
return info, nil
}

Expand Down
55 changes: 0 additions & 55 deletions libpod/runtime_img_test.go
View file
Open in desktop

This file was deleted.

37 changes: 0 additions & 37 deletions pkg/registries/registries.go
View file
Open in desktop

This file was deleted.

12 changes: 9 additions & 3 deletions pkg/varlinkapi/images.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@ import (
"fmt"

"github.com/containers/image/docker"
"github.com/containers/image/pkg/sysregistriesv2"
"github.com/containers/image/types"
"github.com/opencontainers/image-spec/specs-go/v1"
"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
ioprojectatomicpodman "github.com/projectatomic/libpod/cmd/podman/varlink"
"github.com/projectatomic/libpod/libpod/image"
sysreg "github.com/projectatomic/libpod/pkg/registries"
"github.com/projectatomic/libpod/pkg/util"
)

Expand Down Expand Up @@ -180,12 +181,17 @@ func (i *LibpodAPI) RemoveImage(call ioprojectatomicpodman.VarlinkCall, name str
// Requires an image name and a search limit as int
func (i *LibpodAPI) SearchImage(call ioprojectatomicpodman.VarlinkCall, name string, limit int64) error {
sc := image.GetSystemContext("", "", false)
registries, err := sysreg.GetRegistries()
registries, err := sysregistriesv2.GetRegistries(&types.SystemContext{})
if err != nil {
return call.ReplyErrorOccurred(fmt.Sprintf("unable to get system registries: %q", err))
}
searchRegistries := []string{}
for _, reg := range sysregistriesv2.FindUnqualifiedSearchRegistries(registries) {
searchRegistries = append(searchRegistries, reg.URL.String())
}

var imageResults []ioprojectatomicpodman.ImageSearch
for _, reg := range registries {
for _, reg := range searchRegistries {
results, err := docker.SearchRegistry(getContext(), sc, reg, name, int(limit))
if err != nil {
return call.ReplyErrorOccurred(err.Error())
Expand Down
2 changes: 1 addition & 1 deletion vendor.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ github.com/containerd/cgroups 7a5fdd8330119dc70d850260db8f3594d89d6943
github.com/containerd/continuity master
github.com/containernetworking/cni v0.4.0
github.com/containernetworking/plugins master
github.com/containers/image 88423e35d5f11939b0db4fb8f2939fc04adf2463
github.com/containers/image a74645804cf01ae934fd61ca53790ec1ec89683b
github.com/containers/storage ce923c1ed9e51c8fe58e41a86abc05be7b824f62
github.com/coreos/go-systemd v14
github.com/cri-o/ocicni master
Expand Down
51 changes: 44 additions & 7 deletions vendor/github.com/containers/image/docker/daemon/daemon_transport.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading