[docker-io/f20] upstream version bump to v1.0.0

Lokesh Mandvekar lsm5 at fedoraproject.org
Mon Jun 9 14:57:59 UTC 2014


commit 479303446a916e536bf28b6e9095b9b781d5c8b3
Author: Lokesh Mandvekar <lsm5 at redhat.com>
Date:   Mon Jun 9 10:33:07 2014 -0400

    upstream version bump to v1.0.0

 docker-io.spec |    9 +++++++--
 docker.service |    4 +++-
 sources        |    2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 48271c2..6003525 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -5,11 +5,11 @@
 %global debug_package %{nil}
 %global gopath  %{_datadir}/gocode
 
-%global commit      14680bf724161785d164fd99de36e3eb03a823ef
+%global commit      63fe64c471e7d76be96a625350468dfc65c06c31
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name:           docker-io
-Version:        0.12.0
+Version:        1.0.0
 Release:        1%{?dist}
 Summary:        Automates deployment of containerized applications
 License:        ASL 2.0
@@ -112,6 +112,7 @@ install -d -m 700 %{buildroot}%{_sharedstatedir}/docker
 install -d %{buildroot}%{_unitdir}
 #install -p -m 644 contrib/init/systemd/docker.service %{buildroot}%{_unitdir}
 install -p -m 644 %{SOURCE1} %{buildroot}%{_unitdir}
+install -p -m 644 contrib/init/systemd/socket-activation/docker.socket %{buildroot}%{_unitdir}
 # for additional args
 install -d %{buildroot}%{_sysconfdir}/sysconfig/
 install -p -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/docker
@@ -138,6 +139,7 @@ exit 0
 %dir %{_libexecdir}/docker
 %{_libexecdir}/docker/dockerinit
 %{_unitdir}/docker.service
+%{_unitdir}/docker.socket
 %{_sysconfdir}/sysconfig/docker
 %dir %{_sysconfdir}/bash_completion.d
 %{_sysconfdir}/bash_completion.d/docker.bash
@@ -153,6 +155,9 @@ exit 0
 %{_datadir}/vim/vimfiles/syntax/dockerfile.vim
 
 %changelog
+* Mon Jun 09 2014 Lokesh Mandvekar <lsm5 at fedoraproject.org> - 1.0.0-1
+- upstream version bump to v1.0.0
+
 * Mon Jun 09 2014 Lokesh Mandvekar <lsm5 at fedoraproject.org> - 0.12.0-1
 - RHBZ#1105789 Upstream bump to 0.12.0
 
diff --git a/docker.service b/docker.service
index 3c7c89f..e2aace1 100644
--- a/docker.service
+++ b/docker.service
@@ -2,10 +2,12 @@
 Description=Docker Application Container Engine
 Documentation=http://docs.docker.io
 After=network.target
+Requires=docker.socket
 
 [Service]
+Type=notify
 EnvironmentFile=-/etc/sysconfig/docker
-ExecStart=/usr/bin/docker -d --selinux-enabled
+ExecStart=/usr/bin/docker -d --selinux-enabled -H fd://
 Restart=on-failure
 LimitNOFILE=1048576
 LimitNPROC=1048576
diff --git a/sources b/sources
index 54f1744..3ab3623 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-800973801b4a833a94485cdc2f28ee30  v0.12.0.tar.gz
+c835295e1e0609affe9a3c7ec75d7240  v1.0.0.tar.gz


More information about the scm-commits mailing list