[docker-io] do not add masq

Lokesh Mandvekar lsm5 at fedoraproject.org
Mon Dec 2 13:48:27 UTC 2013


commit 8e81a15196a2abe238770e62fcfbf2a3bb88ae88
Author: Lokesh Mandvekar <lsm5 at redhat.com>
Date:   Mon Dec 2 07:48:15 2013 -0600

    do not add masq
    
    Signed-off-by: Lokesh Mandvekar <lsm5 at redhat.com>

 docker-io.spec |    5 ++++-
 docker.service |    1 -
 2 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index e9a5085..209170a 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -14,7 +14,7 @@
 
 Name:           docker-io
 Version:        0.7.0
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Automates deployment of containerized applications
 License:        ASL 2.0
 
@@ -169,6 +169,9 @@ fi
 %{_sysconfdir}/udev/rules.d/80-docker.rules
 
 %changelog
+* Mon Dec 02 2013 Lokesh Mandvekar <lsm5 at redhat.com> - 0.7.0-13
+- removed firewall-cmd --add-masquerade
+
 * Sat Nov 30 2013 Lokesh Mandvekar <lsm5 at redhat.com> - 0.7.0-12
 - systemd for fedora >= 18
 - firewalld in unit file changed from Requires to Wants
diff --git a/docker.service b/docker.service
index 0803497..220fc98 100644
--- a/docker.service
+++ b/docker.service
@@ -7,7 +7,6 @@ After=firewalld.service
 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/bin/firewall-cmd --add-masquerade
 Restart=on-failure
 
 [Install]


More information about the scm-commits mailing list