summaryrefslogtreecommitdiff
path: root/libpod/image/docker_registry_options.go
diff options
context:
space:
mode:
authorValentin Rothberg <rothberg@redhat.com>2021-04-22 08:01:12 +0200
committerValentin Rothberg <rothberg@redhat.com>2021-05-05 11:30:12 +0200
commit0f7d54b0260c1be992ee3b9cee359ef3a9e8bd21 (patch)
tree192e52054de2abf0c92d83ecdbc71d498c2ec947 /libpod/image/docker_registry_options.go
parent8eefca5a257121b177562742c972e39e1686140d (diff)
downloadpodman-0f7d54b0260c1be992ee3b9cee359ef3a9e8bd21.tar.gz
podman-0f7d54b0260c1be992ee3b9cee359ef3a9e8bd21.tar.bz2
podman-0f7d54b0260c1be992ee3b9cee359ef3a9e8bd21.zip
migrate Podman to containers/common/libimage
Migrate the Podman code base over to `common/libimage` which replaces `libpod/image` and a lot of glue code entirely. Note that I tried to leave bread crumbs for changed tests. Miscellaneous changes: * Some errors yield different messages which required to alter some tests. * I fixed some pre-existing issues in the code. Others were marked as `//TODO`s to prevent the PR from exploding. * The `NamesHistory` of an image is returned as is from the storage. Previously, we did some filtering which I think is undesirable. Instead we should return the data as stored in the storage. * Touched handlers use the ABI interfaces where possible. * Local image resolution: previously Podman would match "foo" on "myfoo". This behaviour has been changed and Podman will now only match on repository boundaries such that "foo" would match "my/foo" but not "myfoo". I consider the old behaviour to be a bug, at the very least an exotic corner case. * Futhermore, "foo:none" does *not* resolve to a local image "foo" without tag anymore. It's a hill I am (almost) willing to die on. * `image prune` prints the IDs of pruned images. Previously, in some cases, the names were printed instead. The API clearly states ID, so we should stick to it. * Compat endpoint image removal with _force_ deletes the entire not only the specified tag. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
Diffstat (limited to 'libpod/image/docker_registry_options.go')
-rw-r--r--libpod/image/docker_registry_options.go75
1 files changed, 0 insertions, 75 deletions
diff --git a/libpod/image/docker_registry_options.go b/libpod/image/docker_registry_options.go
deleted file mode 100644
index d95234e3d..000000000
--- a/libpod/image/docker_registry_options.go
+++ /dev/null
@@ -1,75 +0,0 @@
-package image
-
-import (
- "fmt"
-
- "github.com/containers/buildah/pkg/parse"
- "github.com/containers/image/v5/docker/reference"
- "github.com/containers/image/v5/types"
- podmanVersion "github.com/containers/podman/v3/version"
-)
-
-// DockerRegistryOptions encapsulates settings that affect how we connect or
-// authenticate to a remote registry.
-type DockerRegistryOptions struct {
- // DockerRegistryCreds is the user name and password to supply in case
- // we need to pull an image from a registry, and it requires us to
- // authenticate.
- DockerRegistryCreds *types.DockerAuthConfig
- // DockerCertPath is the location of a directory containing CA
- // certificates which will be used to verify the registry's certificate
- // (all files with names ending in ".crt"), and possibly client
- // certificates and private keys (pairs of files with the same name,
- // except for ".cert" and ".key" suffixes).
- DockerCertPath string
- // DockerInsecureSkipTLSVerify turns off verification of TLS
- // certificates and allows connecting to registries without encryption
- // - or forces it on even if registries.conf has the registry configured as insecure.
- DockerInsecureSkipTLSVerify types.OptionalBool
- // If not "", overrides the use of platform.GOOS when choosing an image or verifying OS match.
- OSChoice string
- // If not "", overrides the use of platform.GOARCH when choosing an image or verifying architecture match.
- ArchitectureChoice string
- // If not "", overrides_VARIANT_ instead of the running architecture variant for choosing images.
- VariantChoice string
- // RegistriesConfPath can be used to override the default path of registries.conf.
- RegistriesConfPath string
-}
-
-// GetSystemContext constructs a new system context from a parent context. the values in the DockerRegistryOptions, and other parameters.
-func (o DockerRegistryOptions) GetSystemContext(parent *types.SystemContext, additionalDockerArchiveTags []reference.NamedTagged) *types.SystemContext {
- sc := &types.SystemContext{
- DockerAuthConfig: o.DockerRegistryCreds,
- DockerCertPath: o.DockerCertPath,
- DockerInsecureSkipTLSVerify: o.DockerInsecureSkipTLSVerify,
- DockerArchiveAdditionalTags: additionalDockerArchiveTags,
- OSChoice: o.OSChoice,
- ArchitectureChoice: o.ArchitectureChoice,
- VariantChoice: o.VariantChoice,
- BigFilesTemporaryDir: parse.GetTempDir(),
- }
- if parent != nil {
- sc.SignaturePolicyPath = parent.SignaturePolicyPath
- sc.AuthFilePath = parent.AuthFilePath
- sc.DirForceCompress = parent.DirForceCompress
- sc.DockerRegistryUserAgent = parent.DockerRegistryUserAgent
- sc.OSChoice = parent.OSChoice
- sc.ArchitectureChoice = parent.ArchitectureChoice
- sc.BlobInfoCacheDir = parent.BlobInfoCacheDir
- }
- return sc
-}
-
-// GetSystemContext Constructs a new containers/image/types.SystemContext{} struct from the given signaturePolicy path
-func GetSystemContext(signaturePolicyPath, authFilePath string, forceCompress bool) *types.SystemContext {
- sc := &types.SystemContext{}
- if signaturePolicyPath != "" {
- sc.SignaturePolicyPath = signaturePolicyPath
- }
- sc.AuthFilePath = authFilePath
- sc.DirForceCompress = forceCompress
- sc.DockerRegistryUserAgent = fmt.Sprintf("libpod/%s", podmanVersion.Version)
- sc.BigFilesTemporaryDir = parse.GetTempDir()
-
- return sc
-}