diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-06-07 01:00:07 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-06-13 12:49:32 +0000 |
| commit | be217caa3856c76a6b997c203422715e13b0335a (patch) | |
| tree | 49190e0813ba860ccc74d017ccf12562e009c6bc /vendor/github.com/projectatomic/buildah/util | |
| parent | 95ea3d4f3a77d014fdd1be43411ba96a85091712 (diff) | |
| download | podman-be217caa3856c76a6b997c203422715e13b0335a.tar.gz podman-be217caa3856c76a6b997c203422715e13b0335a.tar.bz2 podman-be217caa3856c76a6b997c203422715e13b0335a.zip | |
Vendor in latest buildah code
This will add --layers support.
Also add missing information in man pages on podman build features.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Closes: #938
Approved by: umohnani8
Diffstat (limited to 'vendor/github.com/projectatomic/buildah/util')
| -rw-r--r-- | vendor/github.com/projectatomic/buildah/util/util.go | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/vendor/github.com/projectatomic/buildah/util/util.go b/vendor/github.com/projectatomic/buildah/util/util.go index e8539f978..3f1d7530c 100644 --- a/vendor/github.com/projectatomic/buildah/util/util.go +++ b/vendor/github.com/projectatomic/buildah/util/util.go @@ -112,11 +112,6 @@ func ResolveName(name string, firstRegistry string, sc *types.SystemContext, sto logrus.Debugf("unable to read configured registries to complete %q: %v", name, err) registries = []string{} } - if sc.DockerInsecureSkipTLSVerify { - if unverifiedRegistries, err := sysregistries.GetInsecureRegistries(sc); err == nil { - registries = append(registries, unverifiedRegistries...) - } - } // Create all of the combinations. Some registries need an additional component added, so // use our lookaside map to keep track of them. If there are no configured registries, we'll |