[docker-io/f21] Resolves: rhbz#1153936 - update to v1.3.0
Lokesh Mandvekar
lsm5 at fedoraproject.org
Tue Oct 21 07:23:12 UTC 2014
commit ac578f9d99a0e3a879cf21fbab716cb88a695d43
Author: Lokesh Mandvekar <lsm5 at fedoraproject.org>
Date: Tue Oct 21 01:55:34 2014 -0500
Resolves: rhbz#1153936 - update to v1.3.0
NVR: docker-io-1.3.0-1
iptables=false => ip-masq=false
zsh files not installed (present in zsh package)
Signed-off-by: Lokesh Mandvekar <lsm5 at fedoraproject.org>
docker-io.spec | 229 +++++++-------------------------------
docker.socket | 12 --
ignore-selinux-if-disabled.patch | 54 ---------
ipmasq.patch | 42 +++++++
sources | 2 +-
5 files changed, 83 insertions(+), 256 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index c2677c8..c8dad6b 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -10,12 +10,12 @@
%global repo %{project}
%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
-%global commit fa7b24f2c3948d1eb52453c609417a6bc7eba5dd
+%global commit c78088fe3d1b90640c637d8c3457de3caa0c7a24
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: %{repo}-io
-Version: 1.2.0
-Release: 5%{?dist}
+Version: 1.3.0
+Release: 1%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
URL: http://www.docker.com
@@ -25,8 +25,7 @@ Source0: https://%{import_path}/archive/v%{version}.tar.gz
Source1: %{repo}.service
Source2: %{repo}.sysconfig
Source3: %{repo}-storage.sysconfig
-Source4: %{repo}.socket
-Patch0: ignore-selinux-if-disabled.patch
+Patch0: ipmasq.patch
# though final name for sysconf/sysvinit files is simply 'docker',
# having .sysvinit and .sysconfig makes things clear
BuildRequires: glibc-static
@@ -43,8 +42,10 @@ BuildRequires: golang(code.google.com/p/go.net/websocket)
BuildRequires: golang(code.google.com/p/gosqlite/sqlite3)
# RHBZ#1109039 use syndtr/gocapability >= 0-0.7
BuildRequires: golang(github.com/syndtr/gocapability/capability) >= 0-0.7
-BuildRequires: golang(github.com/docker/libcontainer) >= 1.1.0-10
+BuildRequires: golang(github.com/docker/libcontainer) >= 1.2.0-2
BuildRequires: golang(github.com/tchap/go-patricia/patricia)
+BuildRequires: golang(github.com/docker/libtrust)
+BuildRequires: golang(github.com/docker/libtrust/trustgraph)
BuildRequires: device-mapper-devel
BuildRequires: btrfs-progs-devel
BuildRequires: pkgconfig(systemd)
@@ -89,7 +90,7 @@ Provides: golang(%{import_path}) = %{version}-%{release}
Provides: golang(%{import_path}/api) = %{version}-%{release}
Provides: golang(%{import_path}/api/client) = %{version}-%{release}
Provides: golang(%{import_path}/api/server) = %{version}-%{release}
-Provides: golang(%{import_path}/archive) = %{version}-%{release}
+#Provides: golang(%{import_path}/archive) = %{version}-%{release}
Provides: golang(%{import_path}/builtins) = %{version}-%{release}
Provides: golang(%{import_path}/contrib) = %{version}-%{release}
Provides: golang(%{import_path}/contrib/docker-device-tool) = %{version}-%{release}
@@ -99,7 +100,7 @@ Provides: golang(%{import_path}/daemon/execdriver) = %{version}-%{release}
Provides: golang(%{import_path}/daemon/execdriver/execdrivers) = %{version}-%{release}
Provides: golang(%{import_path}/daemon/execdriver/lxc) = %{version}-%{release}
Provides: golang(%{import_path}/daemon/execdriver/native) = %{version}-%{release}
-Provides: golang(%{import_path}/daemon/execdriver/native/configuration) = %{version}-%{release}
+#Provides: golang(%{import_path}/daemon/execdriver/native/configuration) = %{version}-%{release}
Provides: golang(%{import_path}/daemon/execdriver/native/template) = %{version}-%{release}
Provides: golang(%{import_path}/daemon/graphdriver) = %{version}-%{release}
Provides: golang(%{import_path}/daemon/graphdriver/aufs) = %{version}-%{release}
@@ -174,7 +175,6 @@ find . -name "*.go" \
sed -i 's/go-md2man -in "$FILE" -out/pandoc -s -t man "$FILE" -o/g' docs/man/md2man-all.sh
sed -i 's/\!bash//g' contrib/completion/bash/docker
%patch0 -p1
-rm daemon/daemon.go.orig
%build
# set up temporary build gopath, and put our directory there
@@ -209,12 +209,6 @@ install -p -m 644 docs/man/man5/Dockerfile.5 %{buildroot}%{_mandir}/man5
install -dp %{buildroot}%{_datadir}/bash-completion/completions
install -p -m 644 contrib/completion/bash/docker %{buildroot}%{_datadir}/bash-completion/completions
-# install zsh completion
-# this has been included in upstream zsh, will be removed once it's included
-# in the zsh rpm as well
-install -d %{buildroot}%{_datadir}/zsh/site-functions
-install -p -m 644 contrib/completion/zsh/_docker %{buildroot}%{_datadir}/zsh/site-functions
-
# install vim syntax highlighting
# (in process of being included in default vim)
install -d %{buildroot}%{_datadir}/vim/vimfiles/{doc,ftdetect,syntax}
@@ -232,7 +226,7 @@ install -d %{buildroot}%{_sharedstatedir}/%{repo}
# install systemd/init scripts
install -d %{buildroot}%{_unitdir}
install -p -m 644 %{SOURCE1} %{buildroot}%{_unitdir}
-install -p -m 644 %{SOURCE4} %{buildroot}%{_unitdir}
+install -p -m 644 contrib/init/systemd/%{repo}.socket %{buildroot}%{_unitdir}
# for additional args
install -d %{buildroot}%{_sysconfdir}/sysconfig/
@@ -243,7 +237,7 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/docker-storage
install -d -p %{buildroot}/%{gopath}/src/%{import_path}
rm -rf pkg/symlink/testdata
-for dir in api archive builtins daemon dockerversion engine graph \
+for dir in api builtins daemon dockerversion engine graph \
image links nat opts pkg registry runconfig utils
do
cp -rpav $dir %{buildroot}/%{gopath}/src/%{import_path}/
@@ -275,8 +269,6 @@ exit 0
%{_unitdir}/docker.service
%{_unitdir}/docker.socket
%{_datadir}/bash-completion/completions/docker
-%dir %{_datadir}/zsh/site-functions
-%{_datadir}/zsh/site-functions/_docker
%dir %{_sharedstatedir}/docker
%{_sysconfdir}/udev/rules.d/80-docker.rules
%{_datadir}/vim/vimfiles/doc/dockerfile.txt
@@ -287,185 +279,44 @@ exit 0
%doc AUTHORS CHANGELOG.md CONTRIBUTING.md LICENSE MAINTAINERS NOTICE README.md
%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
%dir %{gopath}/src/%{import_path}
-%dir %{gopath}/src/%{import_path}/api
-%{gopath}/src/%{import_path}/api/MAINTAINERS
-%{gopath}/src/%{import_path}/api/README.md
-%{gopath}/src/%{import_path}/api/*.go
-%dir %{gopath}/src/%{import_path}/api/client
-%{gopath}/src/%{import_path}/api/client/*.go
-%dir %{gopath}/src/%{import_path}/api/server
-%{gopath}/src/%{import_path}/api/server/MAINTAINERS
-%{gopath}/src/%{import_path}/api/server/*.go
-%dir %{gopath}/src/%{import_path}/archive
-%{gopath}/src/%{import_path}/archive/MAINTAINERS
-%{gopath}/src/%{import_path}/archive/README.md
-%{gopath}/src/%{import_path}/archive/*.go
-%dir %{gopath}/src/%{import_path}/archive/testdata
-%{gopath}/src/%{import_path}/archive/testdata/broken.tar
-%dir %{gopath}/src/%{import_path}/builtins
-%{gopath}/src/%{import_path}/builtins/*.go
-%dir %{gopath}/src/%{import_path}/daemon
-%{gopath}/src/%{import_path}/daemon/*.go
-%{gopath}/src/%{import_path}/daemon/MAINTAINERS
-%{gopath}/src/%{import_path}/daemon/README.md
-%dir %{gopath}/src/%{import_path}/daemon/execdriver
-%{gopath}/src/%{import_path}/daemon/execdriver/*.go
-%{gopath}/src/%{import_path}/daemon/execdriver/MAINTAINERS
-%dir %{gopath}/src/%{import_path}/daemon/execdriver/execdrivers
-%{gopath}/src/%{import_path}/daemon/execdriver/execdrivers/*.go
-%dir %{gopath}/src/%{import_path}/daemon/execdriver/lxc
-%{gopath}/src/%{import_path}/daemon/execdriver/lxc/MAINTAINERS
-%{gopath}/src/%{import_path}/daemon/execdriver/lxc/*.go
-%dir %{gopath}/src/%{import_path}/daemon/execdriver/native
-%{gopath}/src/%{import_path}/daemon/execdriver/native/*.go
-%dir %{gopath}/src/%{import_path}/daemon/execdriver/native/configuration
-%{gopath}/src/%{import_path}/daemon/execdriver/native/configuration/*.go
-%dir %{gopath}/src/%{import_path}/daemon/execdriver/native/template
-%{gopath}/src/%{import_path}/daemon/execdriver/native/template/*.go
-%dir %{gopath}/src/%{import_path}/daemon/graphdriver
-%{gopath}/src/%{import_path}/daemon/graphdriver/*.go
-%dir %{gopath}/src/%{import_path}/daemon/graphdriver/aufs
-%{gopath}/src/%{import_path}/daemon/graphdriver/aufs/*.go
-%dir %{gopath}/src/%{import_path}/daemon/graphdriver/btrfs
-%{gopath}/src/%{import_path}/daemon/graphdriver/btrfs/*.go
-%{gopath}/src/%{import_path}/daemon/graphdriver/btrfs/MAINTAINERS
-%dir %{gopath}/src/%{import_path}/daemon/graphdriver/devmapper
-%{gopath}/src/%{import_path}/daemon/graphdriver/devmapper/*.go
-%{gopath}/src/%{import_path}/daemon/graphdriver/devmapper/MAINTAINERS
-%{gopath}/src/%{import_path}/daemon/graphdriver/devmapper/README.md
-%dir %{gopath}/src/%{import_path}/daemon/graphdriver/graphtest
-%{gopath}/src/%{import_path}/daemon/graphdriver/graphtest/*.go
-%dir %{gopath}/src/%{import_path}/daemon/graphdriver/vfs
-%{gopath}/src/%{import_path}/daemon/graphdriver/vfs/*.go
-%dir %{gopath}/src/%{import_path}/daemon/networkdriver
-%dir %{gopath}/src/%{import_path}/daemon/networkdriver/bridge
-%{gopath}/src/%{import_path}/daemon/networkdriver/bridge/*.go
-%dir %{gopath}/src/%{import_path}/daemon/networkdriver/ipallocator
-%{gopath}/src/%{import_path}/daemon/networkdriver/ipallocator/*.go
-%{gopath}/src/%{import_path}/daemon/networkdriver/*.go
-%dir %{gopath}/src/%{import_path}/daemon/networkdriver/portallocator
-%{gopath}/src/%{import_path}/daemon/networkdriver/portallocator/*.go
-%dir %{gopath}/src/%{import_path}/daemon/networkdriver/portmapper
-%{gopath}/src/%{import_path}/daemon/networkdriver/portmapper/*.go
-%dir %{gopath}/src/%{import_path}/dockerversion
-%{gopath}/src/%{import_path}/dockerversion/*.go
-%dir %{gopath}/src/%{import_path}/engine
-%{gopath}/src/%{import_path}/engine/MAINTAINERS
-%{gopath}/src/%{import_path}/engine/*.go
-%dir %{gopath}/src/%{import_path}/graph
-%{gopath}/src/%{import_path}/graph/MAINTAINERS
-%{gopath}/src/%{import_path}/graph/*.go
-%dir %{gopath}/src/%{import_path}/image
-%{gopath}/src/%{import_path}/image/*.go
-%dir %{gopath}/src/%{import_path}/links
-%{gopath}/src/%{import_path}/links/*.go
-%dir %{gopath}/src/%{import_path}/nat
-%{gopath}/src/%{import_path}/nat/*.go
-%dir %{gopath}/src/%{import_path}/opts
-%{gopath}/src/%{import_path}/opts/*.go
-%dir %{gopath}/src/%{import_path}/registry
-%{gopath}/src/%{import_path}/registry/MAINTAINERS
-%{gopath}/src/%{import_path}/registry/*.go
-%dir %{gopath}/src/%{import_path}/runconfig
-%{gopath}/src/%{import_path}/runconfig/*.go
-%dir %{gopath}/src/%{import_path}/utils
-%{gopath}/src/%{import_path}/utils/*.go
+%dir %{gopath}/src/%{import_path}/*
+%dir %{gopath}/src/%{import_path}/*/*
+%dir %{gopath}/src/%{import_path}/*/*/*
+%dir %{gopath}/src/%{import_path}/*/*/*/*
+%{gopath}/src/%{import_path}/*/MAINTAINERS
+%{gopath}/src/%{import_path}/*/README.md
+%{gopath}/src/%{import_path}/*/*.go
+%{gopath}/src/%{import_path}/*/*/*.go
+%{gopath}/src/%{import_path}/*/*/MAINTAINERS
+%{gopath}/src/%{import_path}/*/*/*/*.go
+%{gopath}/src/%{import_path}/*/*/*/MAINTAINERS
+%{gopath}/src/%{import_path}/*/*/*/README.md
+%{gopath}/src/%{import_path}/*/*/*/*/*.go
%files pkg-devel
%doc AUTHORS CHANGELOG.md CONTRIBUTING.md LICENSE MAINTAINERS NOTICE README.md
%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
%dir %{gopath}/src/%{import_path}
%dir %{gopath}/src/%{import_path}/pkg
+%dir %{gopath}/src/%{import_path}/pkg/*
+%dir %{gopath}/src/%{import_path}/pkg/*/*
+%dir %{gopath}/src/%{import_path}/pkg/*/*/*
%{gopath}/src/%{import_path}/pkg/README.md
-%dir %{gopath}/src/%{import_path}/pkg/broadcastwriter
-%{gopath}/src/%{import_path}/pkg/broadcastwriter/*.go
-%dir %{gopath}/src/%{import_path}/pkg/graphdb
-%{gopath}/src/%{import_path}/pkg/graphdb/MAINTAINERS
-%{gopath}/src/%{import_path}/pkg/graphdb/*.go
-%dir %{gopath}/src/%{import_path}/pkg/httputils
-%{gopath}/src/%{import_path}/pkg/httputils/MAINTAINERS
-%{gopath}/src/%{import_path}/pkg/httputils/*.go
-%dir %{gopath}/src/%{import_path}/pkg/iptables
-%{gopath}/src/%{import_path}/pkg/iptables/MAINTAINERS
-%{gopath}/src/%{import_path}/pkg/iptables/*.go
-%dir %{gopath}/src/%{import_path}/pkg/jsonlog
-%{gopath}/src/%{import_path}/pkg/jsonlog/*.go
-%dir %{gopath}/src/%{import_path}/pkg/listenbuffer
-%{gopath}/src/%{import_path}/pkg/listenbuffer/*.go
-%dir %{gopath}/src/%{import_path}/pkg/log
-%{gopath}/src/%{import_path}/pkg/log/*.go
-%dir %{gopath}/src/%{import_path}/pkg/mflag
-%{gopath}/src/%{import_path}/pkg/mflag/LICENSE
-%{gopath}/src/%{import_path}/pkg/mflag/MAINTAINERS
-%{gopath}/src/%{import_path}/pkg/mflag/README.md
-%dir %{gopath}/src/%{import_path}/pkg/mflag/example
-%{gopath}/src/%{import_path}/pkg/mflag/example/example.go
-%{gopath}/src/%{import_path}/pkg/mflag/*.go
-%dir %{gopath}/src/%{import_path}/pkg/mount
-%{gopath}/src/%{import_path}/pkg/mount/MAINTAINERS
-%{gopath}/src/%{import_path}/pkg/mount/*.go
-%dir %{gopath}/src/%{import_path}/pkg/namesgenerator
-%{gopath}/src/%{import_path}/pkg/namesgenerator/*.go
-%dir %{gopath}/src/%{import_path}/pkg/networkfs
-%{gopath}/src/%{import_path}/pkg/networkfs/MAINTAINERS
-%dir %{gopath}/src/%{import_path}/pkg/networkfs/etchosts
-%{gopath}/src/%{import_path}/pkg/networkfs/etchosts/*.go
-%dir %{gopath}/src/%{import_path}/pkg/networkfs/resolvconf
-%{gopath}/src/%{import_path}/pkg/networkfs/resolvconf/*.go
-%dir %{gopath}/src/%{import_path}/pkg/parsers
-%{gopath}/src/%{import_path}/pkg/parsers/MAINTAINERS
-%{gopath}/src/%{import_path}/pkg/parsers/*.go
-%dir %{gopath}/src/%{import_path}/pkg/parsers/filters
-%{gopath}/src/%{import_path}/pkg/parsers/filters/*.go
-%dir %{gopath}/src/%{import_path}/pkg/parsers/kernel
-%{gopath}/src/%{import_path}/pkg/parsers/kernel/*.go
-%dir %{gopath}/src/%{import_path}/pkg/parsers/operatingsystem
-%{gopath}/src/%{import_path}/pkg/parsers/operatingsystem/*.go
-%dir %{gopath}/src/%{import_path}/pkg/proxy
-%{gopath}/src/%{import_path}/pkg/proxy/MAINTAINERS
-%{gopath}/src/%{import_path}/pkg/proxy/*.go
-%dir %{gopath}/src/%{import_path}/pkg/signal
-%{gopath}/src/%{import_path}/pkg/signal/*.go
-%dir %{gopath}/src/%{import_path}/pkg/symlink
-%{gopath}/src/%{import_path}/pkg/symlink/MAINTAINERS
-%{gopath}/src/%{import_path}/pkg/symlink/*.go
-%dir %{gopath}/src/%{import_path}/pkg/sysinfo
-%{gopath}/src/%{import_path}/pkg/sysinfo/MAINTAINERS
-%{gopath}/src/%{import_path}/pkg/sysinfo/*.go
-%dir %{gopath}/src/%{import_path}/pkg/system
-%{gopath}/src/%{import_path}/pkg/system/MAINTAINERS
-%{gopath}/src/%{import_path}/pkg/system/*.go
-%dir %{gopath}/src/%{import_path}/pkg/systemd
-%{gopath}/src/%{import_path}/pkg/systemd/MAINTAINERS
-%{gopath}/src/%{import_path}/pkg/systemd/*.go
-%dir %{gopath}/src/%{import_path}/pkg/tailfile
-%{gopath}/src/%{import_path}/pkg/tailfile/*.go
-%dir %{gopath}/src/%{import_path}/pkg/tarsum
-%{gopath}/src/%{import_path}/pkg/tarsum/*.go
-%dir %{gopath}/src/%{import_path}/pkg/tarsum/testdata
-%dir %{gopath}/src/%{import_path}/pkg/tarsum/testdata/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457
-%{gopath}/src/%{import_path}/pkg/tarsum/testdata/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457/json
-%{gopath}/src/%{import_path}/pkg/tarsum/testdata/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457/layer.tar
-%dir %{gopath}/src/%{import_path}/pkg/tarsum/testdata/511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158
-%{gopath}/src/%{import_path}/pkg/tarsum/testdata/511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158/json
-%{gopath}/src/%{import_path}/pkg/tarsum/testdata/511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158/layer.tar
-%dir %{gopath}/src/%{import_path}/pkg/truncindex
-%{gopath}/src/%{import_path}/pkg/truncindex/MAINTAINERS
-%{gopath}/src/%{import_path}/pkg/truncindex/*.go
-%dir %{gopath}/src/%{import_path}/pkg/term
-%{gopath}/src/%{import_path}/pkg/term/MAINTAINERS
-%{gopath}/src/%{import_path}/pkg/term/*.go
-%dir %{gopath}/src/%{import_path}/pkg/testutils
-%{gopath}/src/%{import_path}/pkg/testutils/MAINTAINERS
-%{gopath}/src/%{import_path}/pkg/testutils/README.md
-%{gopath}/src/%{import_path}/pkg/testutils/utils.go
-%dir %{gopath}/src/%{import_path}/pkg/units
-%{gopath}/src/%{import_path}/pkg/units/MAINTAINERS
-%{gopath}/src/%{import_path}/pkg/units/*.go
-%dir %{gopath}/src/%{import_path}/pkg/version
-%{gopath}/src/%{import_path}/pkg/version/*.go
+%{gopath}/src/%{import_path}/pkg/*/MAINTAINER*
+%{gopath}/src/%{import_path}/pkg/*/LICENSE
+%{gopath}/src/%{import_path}/pkg/*/README.md
+%{gopath}/src/%{import_path}/pkg/*/*.go
+%{gopath}/src/%{import_path}/pkg/*/*/*.tar
+%{gopath}/src/%{import_path}/pkg/*/*/*.go
+%{gopath}/src/%{import_path}/pkg/*/*/*/json
+%{gopath}/src/%{import_path}/pkg/*/*/*/*.tar
%changelog
+* Mon Oct 20 2014 Lokesh Mandvekar <lsm5 at fedoraproject.org> - 1.3.0-1
+- Resolves: rhbz#1153936 - update to v1.3.0
+- don't install zsh files
+- iptables=false => ip-masq=false
+
* Wed Oct 08 2014 Lokesh Mandvekar <lsm5 at fedoraproject.org> - 1.2.0-5
- Resolves: rhbz#1149882 - systemd unit and socket file updates
diff --git a/ipmasq.patch b/ipmasq.patch
new file mode 100644
index 0000000..f3e713b
--- /dev/null
+++ b/ipmasq.patch
@@ -0,0 +1,42 @@
+From 3893e220e840054dfdadba637372bc30f683fe58 Mon Sep 17 00:00:00 2001
+From: Jessica Frazelle <jess at docker.com>
+Date: Thu, 16 Oct 2014 11:39:22 -0700
+Subject: [PATCH] Setting iptables=false should propagate to ip-masq=false
+
+Signed-off-by: Jessica Frazelle <jess at docker.com>
+---
+ daemon/daemon.go | 2 +-
+ integration-cli/docker_cli_daemon_test.go | 10 ++++++++++
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/daemon/daemon.go b/daemon/daemon.go
+index 235788c..caf0c87 100644
+--- a/daemon/daemon.go
++++ b/daemon/daemon.go
+@@ -731,7 +731,7 @@ func NewDaemonFromDirectory(config *Config, eng *engine.Engine) (*Daemon, error)
+ return nil, fmt.Errorf("You specified --iptables=false with --icc=false. ICC uses iptables to function. Please set --icc or --iptables to true.")
+ }
+ if !config.EnableIptables && config.EnableIpMasq {
+- return nil, fmt.Errorf("You specified --iptables=false with --ipmasq=true. IP masquerading uses iptables to function. Please set --ipmasq to false or --iptables to true.")
++ config.EnableIpMasq = false
+ }
+ config.DisableNetwork = config.BridgeIface == disableNetworkBridge
+
+diff --git a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_cli_daemon_test.go
+index 906680d..6160e57 100644
+--- a/integration-cli/docker_cli_daemon_test.go
++++ b/integration-cli/docker_cli_daemon_test.go
+@@ -82,3 +82,13 @@ func TestDaemonRestartWithVolumesRefs(t *testing.T) {
+
+ logDone("daemon - volume refs are restored")
+ }
++
++func TestDaemonStartIptablesFalse(t *testing.T) {
++ d := NewDaemon(t)
++ if err := d.Start("--iptables=false"); err != nil {
++ t.Fatalf("we should have been able to start the daemon with passing iptables=false: %v", err)
++ }
++ d.Stop()
++
++ logDone("daemon - started daemon with iptables=false")
++}
diff --git a/sources b/sources
index 57b3f3d..31a8c6c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cea0b533c0fae5d2aaef6b3abd92af5d v1.2.0.tar.gz
+9fb2716980f5602d0fbb7da8cf71f8f6 v1.3.0.tar.gz
More information about the scm-commits
mailing list