Merge pull request #5 from klausenbusk/portmap

Enable "portmap" plugin by default

Dockerfile

@@ -15,4 +15,4 @@ ADD dist/host-local /opt/cni/bin/host-local
 ADD dist/vlan /opt/cni/bin/vlan
 
 ADD install-cni.sh /install-cni.sh
-ADD flannel.conf.default /flannel.conf.default
+ADD flannel.conflist.default /flannel.conflist.default

flannel.conflist.default

@@ -0,0 +1,18 @@
+{
+  "name": "cbr0",
+  "cniVersion": "0.3.1",
+  "plugins": [
+    {
+      "type": "flannel",
+      "delegate": {
+        "isDefaultGateway": true
+      }
+    },
+    {
+      "type": "portmap",
+      "capabilities": {
+        "portMappings": true
+      }
+    }
+  ]
+}

install-cni.sh

@@ -7,16 +7,20 @@ if [ -w "/host/opt/cni/bin/" ]; then
     echo "Wrote CNI binaries to /host/opt/cni/bin/";
 fi;
 
-TMP_CONF='/flannel.conf.default'
+TMP_CONF='/flannel.conflist.default'
 # If specified, overwrite the network configuration file.
 if [ "${CNI_NETWORK_CONFIG:-}" != "" ]; then
 cat >$TMP_CONF <<EOF
 ${CNI_NETWORK_CONFIG:-}
 EOF
 fi
 
-FILENAME=${CNI_CONF_NAME:-10-flannel.conf}
-mv $TMP_CONF /host/etc/cni/net.d/${FILENAME}
-echo "Wrote CNI config: $(cat /host/etc/cni/net.d/${FILENAME})"
+CNI_CONF_NAME="${CNI_CONF_NAME:-10-flannel.conflist}"
+CNI_OLD_NAME="${CNI_OLD_NAME:-10-flannel.conf}"
+if [ "${CNI_CONF_NAME}" != "${CNI_OLD_NAME}" ]; then
+    rm -f "/host/etc/cni/net.d/${CNI_OLD_NAME}"
+fi
+mv $TMP_CONF /host/etc/cni/net.d/${CNI_CONF_NAME}
+echo "Wrote CNI config: $(cat /host/etc/cni/net.d/${CNI_CONF_NAME})"
 
-while :; do sleep 3600; done;
+while :; do sleep 3600; done;