summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@gmail.com>2018-02-16 15:18:31 -0500
committerAtomic Bot <atomic-devel@projectatomic.io>2018-02-19 14:17:18 +0000
commit07f15c26945eada770a30655b43cadcbb62bf2ae (patch)
treec825bf0d223ef9aea4f857d212528c6fd61bf3ec
parent5317ba792c30e4e32a117c16c44064bec4030001 (diff)
downloadpodman-07f15c26945eada770a30655b43cadcbb62bf2ae.tar.gz
podman-07f15c26945eada770a30655b43cadcbb62bf2ae.tar.bz2
podman-07f15c26945eada770a30655b43cadcbb62bf2ae.zip
Remove unused registry related options from libpod
Signed-off-by: Matthew Heon <matthew.heon@gmail.com> Closes: #349 Approved by: rhatdan
-rw-r--r--libpod/options.go12
-rw-r--r--libpod/runtime.go2
2 files changed, 2 insertions, 12 deletions
diff --git a/libpod/options.go b/libpod/options.go
index 9d0d63777..56e8fa203 100644
--- a/libpod/options.go
+++ b/libpod/options.go
@@ -45,10 +45,8 @@ func WithStorageConfig(config storage.StoreOptions) RuntimeOption {
}
}
-// WithImageConfig uses the given configuration to set up image handling
-// If this is not specified, the system default configuration will be used
-// instead
-func WithImageConfig(defaultTransport string, insecureRegistries, registries []string) RuntimeOption {
+// WithDefaultTransport sets the default transport for retrieving images
+func WithDefaultTransport(defaultTransport string) RuntimeOption {
return func(rt *Runtime) error {
if rt.valid {
return ErrRuntimeFinalized
@@ -56,12 +54,6 @@ func WithImageConfig(defaultTransport string, insecureRegistries, registries []s
rt.config.ImageDefaultTransport = defaultTransport
- rt.config.InsecureRegistries = make([]string, len(insecureRegistries))
- copy(rt.config.InsecureRegistries, insecureRegistries)
-
- rt.config.Registries = make([]string, len(registries))
- copy(rt.config.Registries, registries)
-
return nil
}
}
diff --git a/libpod/runtime.go b/libpod/runtime.go
index 6e26b0f1b..894e4b4d0 100644
--- a/libpod/runtime.go
+++ b/libpod/runtime.go
@@ -58,8 +58,6 @@ type Runtime struct {
type RuntimeConfig struct {
StorageConfig storage.StoreOptions
ImageDefaultTransport string
- InsecureRegistries []string
- Registries []string
SignaturePolicyPath string
StateType RuntimeStateStore
RuntimePath string