commit ef21741639b136eb769351623342b4381b8127bf Author: Lokesh Mandvekar lsm5@redhat.com Date: Thu Nov 21 17:26:34 2013 -0600
0.7-0.17.rc6
Signed-off-by: Lokesh Mandvekar lsm5@redhat.com
modified: docker-io.spec modified: docker.service modified: sources
dockerinit listed explicitly in %files ExecStartPost lines in docker.service gotten rid of (BZ #1026045)
docker-io.spec | 9 +++++++-- docker.service | 2 -- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) --- diff --git a/docker-io.spec b/docker-io.spec index 5d77d1e..d04df3e 100644 --- a/docker-io.spec +++ b/docker-io.spec @@ -11,7 +11,7 @@
Name: docker-io Version: 0.7 -Release: 0.16.rc6%{?dist} +Release: 0.17.rc6%{?dist} Summary: Automates deployment of containerized applications License: ASL 2.0
@@ -133,7 +133,8 @@ fi %doc AUTHORS CHANGELOG.md CONTRIBUTING.md FIXME LICENSE MAINTAINERS NOTICE README.md %{_mandir}/man1/docker.1.gz %{_bindir}/docker -%{_libexecdir}/docker +%dir %{_libexecdir}/docker +%{_libexecdir}/docker/dockerinit %if %{with systemd} %{_unitdir}/docker.service %else @@ -145,6 +146,10 @@ fi %dir %{_sharedstatedir}/docker
%changelog +* Wed Nov 20 2013 Lokesh Mandvekar lsm5@redhat.com - 0.7-0.17.rc6 +- removed ExecStartPost lines from docker.service (BZ #1026045) +- dockerinit listed in files + * Wed Nov 20 2013 Vincent Batts vbatts@redhat.com - 0.7-0.16.rc6 - adding back the none bridge patch
diff --git a/docker.service b/docker.service index b26d48d..9882939 100644 --- a/docker.service +++ b/docker.service @@ -5,8 +5,6 @@ Description=Docker container management daemon Type=simple ExecStartPre=/usr/sbin/sysctl -w net.ipv4.ip_forward=1 net.ipv6.conf.all.forwarding=1 ExecStart=/usr/bin/docker -d -ExecStartPost=/usr/sbin/iptables -I FORWARD -o docker0 -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT -ExecStartPost=/usr/sbin/iptables -I FORWARD -i docker0 ! -o docker0 -j ACCEPT Restart=on-failure
[Install] diff --git a/sources b/sources index 38ad2e9..673ead0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -85d0c9ff7006d12b1f0a8019749e727e docker-9af7730.tar.gz +8cbafc6b3bc89d2d86819a75cb1869ae docker-9af7730.tar.gz
golang@lists.fedoraproject.org