github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-07-04 18:37:00 +00:00
Code Issues Projects Releases Wiki Activity

Vendor after merging mtrmac/image:change-sigstore-layout

Browse Source
This commit is contained in:
Miloslav Trmač 2017-03-04 06:43:48 +01:00
parent 590703db95
commit e86ff0e79d
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
vendor/github.com/containers/image/docker/lookaside.go generated vendored
View File

@ -9,12 +9,12 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"github.com/Sirupsen/logrus"
"github.com/containers/image/docker/reference"
"github.com/containers/image/types"
"github.com/ghodss/yaml" "github.com/ghodss/yaml"
"github.com/opencontainers/go-digest" "github.com/opencontainers/go-digest"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/Sirupsen/logrus"
"github.com/containers/image/types"
) )
// systemRegistriesDirPath is the path to registries.d, used for locating lookaside Docker signature storage. // systemRegistriesDirPath is the path to registries.d, used for locating lookaside Docker signature storage.
@ -64,8 +64,8 @@ func configuredSignatureStorageBase(ctx *types.SystemContext, ref dockerReferenc
return nil, errors.Wrapf(err, "Invalid signature storage URL %s", topLevel) return nil, errors.Wrapf(err, "Invalid signature storage URL %s", topLevel)
} }
// FIXME? Restrict to explicitly supported schemes? // FIXME? Restrict to explicitly supported schemes?
repo := ref.ref.Name() // Note that this is without a tag or digest. repo := reference.Path(ref.ref) // Note that this is without a tag or digest.
if path.Clean(repo) != repo { // Coverage: This should not be reachable because /./ and /../ components are not valid in docker references if path.Clean(repo) != repo { // Coverage: This should not be reachable because /./ and /../ components are not valid in docker references
return nil, errors.Errorf("Unexpected path elements in Docker reference %s for signature storage", ref.ref.String()) return nil, errors.Errorf("Unexpected path elements in Docker reference %s for signature storage", ref.ref.String())
} }
url.Path = url.Path + "/" + repo url.Path = url.Path + "/" + repo
@ -195,6 +195,6 @@ func signatureStorageURL(base signatureStorageBase, manifestDigest digest.Digest
return nil return nil
} }
url := *base url := *base
url.Path = fmt.Sprintf("%s@%s/signature-%d", url.Path, manifestDigest.String(), index+1) url.Path = fmt.Sprintf("%s@%s=%s/signature-%d", url.Path, manifestDigest.Algorithm(), manifestDigest.Hex(), index+1)
return &url return &url
} }

26
vendor/k8s.io/client-go/README.md generated vendored
View File

@ -77,20 +77,21 @@ We will backport bugfixes--but not new features--into older versions of
#### Compatibility matrix #### Compatibility matrix
| | Kubernetes 1.3 | Kubernetes 1.4 | Kubernetes 1.5 | Kubernetes 1.6 (not released yet) | | | Kubernetes 1.3 | Kubernetes 1.4 | Kubernetes 1.5 | Kubernetes 1.6 |
|----------------|----------------|----------------|----------------|----------------| |---------------------|----------------|----------------|----------------|----------------|
| client-go 1.4 | + | ✓ | - | - | | client-go 1.4 | + | ✓ | - | - |
| client-go 1.5 | + | + | - | - | | client-go 1.5 | + | + | - | - |
| client-go 2.0 | + | + | ✓ | - | | client-go 2.0 | + | + | ✓ | - |
| client-go HEAD | + | + | + | ✓ | | client-go 3.0 beta | + | + | + | ✓ |
| client-go HEAD | + | + | + | + |
Key: Key:
* ✓ Exactly the same features / API objects in both client-go and the Kubernetes * `✓` Exactly the same features / API objects in both client-go and the Kubernetes
version. version.
* + client-go has features or api objects that may not be present in the * `+` client-go has features or api objects that may not be present in the
Kubernetes cluster, but everything they have in common will work. Kubernetes cluster, but everything they have in common will work.
* - The Kubernetes cluster has features the client-go library can't use * `-` The Kubernetes cluster has features the client-go library can't use
(additional API objects, etc). (additional API objects, etc).
See the [CHANGELOG](./CHANGELOG.md) for a detailed description of changes See the [CHANGELOG](./CHANGELOG.md) for a detailed description of changes
@ -101,13 +102,14 @@ between client-go versions.
| client-go 1.4 | Kubernetes main repo, 1.4 branch | = - | | client-go 1.4 | Kubernetes main repo, 1.4 branch | = - |
| client-go 1.5 | Kubernetes main repo, 1.5 branch | = - | | client-go 1.5 | Kubernetes main repo, 1.5 branch | = - |
| client-go 2.0 | Kubernetes main repo, 1.5 branch | ✓ | | client-go 2.0 | Kubernetes main repo, 1.5 branch | ✓ |
| client-go 3.0 | Kubernetes main repo, 1.6 branch | ✓ |
| client-go HEAD | Kubernetes main repo, master branch | ✓ | | client-go HEAD | Kubernetes main repo, master branch | ✓ |
Key: Key:
* ✓ Changes in main Kubernetes repo are actively published to client-go by a bot * `✓` Changes in main Kubernetes repo are actively published to client-go by a bot
* = Maintenance is manual, only severe security bugs will be patched. * `=` Maintenance is manual, only severe security bugs will be patched.
* - Deprecated; please upgrade. * `-` Deprecated; please upgrade.
#### Deprecation policy #### Deprecation policy