[docker-io/f20] add insecure-registry config variable

[Lokesh Mandvekar]

commit 41188629ecca09ba7a84ccbdff42fcb9f4e389ee
Author: Lokesh Mandvekar <lsm5 at fedoraproject.org>
Date:   Wed Feb 11 06:18:49 2015 +0100

    add insecure-registry config variable
    
    Signed-off-by: Lokesh Mandvekar <lsm5 at fedoraproject.org>

 docker.service   |    6 +++++-
 docker.sysconfig |    4 ++++
 2 files changed, 9 insertions(+), 1 deletions(-)
---
diff --git a/docker.service b/docker.service
index c1bfbe1..65fd0df 100644
--- a/docker.service
+++ b/docker.service
@@ -8,7 +8,11 @@ Type=notify
 EnvironmentFile=-/etc/sysconfig/docker
 EnvironmentFile=-/etc/sysconfig/docker-storage
 EnvironmentFile=-/etc/sysconfig/docker-network
-ExecStart=/usr/bin/docker -d $OPTIONS $DOCKER_STORAGE_OPTIONS $DOCKER_NETWORK_OPTIONS
+ExecStart=/usr/bin/docker -d \
+          $OPTIONS \
+          $DOCKER_STORAGE_OPTIONS \
+          $DOCKER_NETWORK_OPTIONS \
+          $INSECURE_REGISTRY
 LimitNOFILE=1048576
 LimitNPROC=1048576
 LimitCORE=infinity
diff --git a/docker.sysconfig b/docker.sysconfig
index b66118e..64d45ee 100644
--- a/docker.sysconfig
+++ b/docker.sysconfig
@@ -4,6 +4,10 @@
 OPTIONS='--selinux-enabled'
 DOCKER_CERT_PATH=/etc/docker
 
+# Enable insecure registry communication by appending the registry URL
+# to the INSECURE_REGISTRY variable below and uncommenting it
+# INSECURE_REGISTRY='--insecure-registry '
+
 # On SELinux System, if you remove the --selinux-enabled option, you
 # also need to turn on the docker_transition_unconfined boolean.
 # setsebool -P docker_transition_unconfined