summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorJames Mills <prologic@shortcircuit.net.au>2014-02-28 00:57:29 +1000
committerJames Mills <prologic@shortcircuit.net.au>2014-02-28 00:57:29 +1000
commit2cdc789a54f5df2967f16e8568d7999902edd8ad (patch)
treeb0e1109edfdb0b37530fdb0d0abc950e92c288b0 /docker
parentcf7b726b4988c6b7456c4ecf334f9e1b6e053109 (diff)
downloadcontrib-2cdc789a54f5df2967f16e8568d7999902edd8ad.tar.gz
contrib-2cdc789a54f5df2967f16e8568d7999902edd8ad.tar.xz
docker: Added some missing kernel modules to test script
--HG-- extra : rebase_source : 9b694e4d7b8d0a91a102ab070e5dc1c15ac69823
Diffstat (limited to 'docker')
-rw-r--r--docker/.md5sum2
-rw-r--r--docker/Pkgfile2
-rwxr-xr-xdocker/test_kernel_config.sh2
3 files changed, 4 insertions, 2 deletions
diff --git a/docker/.md5sum b/docker/.md5sum
index c426eeb69..5070e45e4 100644
--- a/docker/.md5sum
+++ b/docker/.md5sum
@@ -1,3 +1,3 @@
966e1916d611427c44686ad09145996f docker.conf
-dcaae2f852c97ba73436c77cda3eb4e3 docker.rc
+3af74d547ad9de52745eb29003b540e3 docker.rc
3e74f5af4a74f3448a1db5763e455eb9 v0.8.1.tar.gz
diff --git a/docker/Pkgfile b/docker/Pkgfile
index d3f952090..02759bdec 100644
--- a/docker/Pkgfile
+++ b/docker/Pkgfile
@@ -8,7 +8,7 @@
name=docker
version=0.8.1
revision=a1598d1e1c
-release=1
+release=2
source=(
https://github.com/dotcloud/$name/archive/v$version.tar.gz
$name.rc
diff --git a/docker/test_kernel_config.sh b/docker/test_kernel_config.sh
index 62eaef148..92d0e68aa 100755
--- a/docker/test_kernel_config.sh
+++ b/docker/test_kernel_config.sh
@@ -9,6 +9,8 @@
NETWORKING_MODULES=(
^CONFIG_BRIDGE\=[ym]$
^CONFIG_NETFILTER_XT_MATCH_ADDRTYPE\=[ym]$
+ ^CONFIG_NETFILTER_XT_MATCH_CONNTRACK\=[ym]$
+ ^CONFIG_IP_NF_TARGET_MASQUERADE\=[ym]$
^CONFIG_NF_NAT\=[ym]$
^CONFIG_NF_NAT_IPV4\=[ym]$
^CONFIG_NF_NAT_NEEDED\=[ym]$

Generated by cgit