commit b26063a59492feb1ed5a69f7962683bf7e145ed1
Author: Lokesh Mandvekar <l...@fedoraproject.org>
Date: Tue Feb 10 01:20:27 2015 +0100
rebuild - Tue Feb 10 01:20:27 CET 2015
Signed-off-by: Lokesh Mandvekar <l...@fedoraproject.org>
docker-io.spec | 10 ++++++++--
docker.service | 6 +++++-
docker.sysconfig | 4 ++++
sources | 2 +-
4 files changed, 18 insertions(+), 4 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 098e99c..8e9e365 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -11,14 +11,14 @@
%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
-%global commit c03d6f57b6956f305a9afcbdc530a15bbe729fce
+%global commit 76baa351c07d7fe847d14fafbcb5a3ba97519a1a
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global tar_import_path code.google.com/p/go/src/pkg/archive/tar
Name: %{repo}-io
Version: 1.4.1
-Release: 25.git%{shortcommit}%{?dist}
+Release: 27.git%{shortcommit}%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
URL: http://www.docker.com
@@ -368,6 +368,12 @@ exit 0
%{_datadir}/zsh/site-functions/_docker
%changelog
+* Tue Feb 10 2015 l...@riseup.net - 1.4.1-27.git76baa35
+- daily rebuild - Tue Feb 10 01:19:10 CET 2015
+
+* Mon Feb 09 2015 Lokesh Mandvekar <l...@fedoraproject.org> -
1.4.1-26.gitc03d6f5
+- add config variable for insecure registry
+
* Sat Feb 07 2015 Lokesh Mandvekar <l...@fedoraproject.org> -
1.4.1-25.gitc03d6f5
- daily rebuild - Sat Feb 7 02:53:34 UTC 2015
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
diff --git a/sources b/sources
index 25dd397..78487d3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-336b729b0be53cbe8bf838b11f71a6e7 docker-c03d6f5.tar.gz
+bdd56c6ce5dff1da34b9b26c9f3ecdf3 docker-76baa35.tar.gz
_______________________________________________
golang mailing list
golang@lists.fedoraproject.org
https://lists.fedoraproject.org/mailman/listinfo/golang
