Merge pull request #3 from klausenbusk/v0.6.0

Bump to v0.6.0

Dockerfile

@@ -12,6 +12,7 @@ ADD dist/portmap /opt/cni/bin/portmap
 ADD dist/ptp /opt/cni/bin/ptp
 ADD dist/tuning /opt/cni/bin/tuning
 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

scripts/build-image.sh

@@ -4,14 +4,11 @@ CURL="curl -sSf"
 FLANNEL_CNI_ROOT=$(git rev-parse --show-toplevel)
 IMAGE_NAME=quay.io/coreos/flannel-cni
 VERSION=$($FLANNEL_CNI_ROOT/scripts/git-version)
-CNI_VERSION="v0.5.2"
+CNI_VERSION="v0.6.0"
 
 mkdir -p dist
 $CURL -L --retry 5 https://github.com/containernetworking/cni/releases/download/$CNI_VERSION/cni-amd64-$CNI_VERSION.tgz | tar -xz -C dist/
-# For now we've get a checked in version of the plugin from calico.  Eventually
-# this should pull from upstream releases.
-$CURL -L https://github.com/projectcalico/cni-plugin/releases/download/v1.9.0/portmap -o dist/portmap
-chmod +x dist/portmap
+$CURL -L --retry 5 https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION/cni-plugins-amd64-$CNI_VERSION.tgz | tar -xz -C dist/
 
 docker build --no-cache -t $IMAGE_NAME:$VERSION .
-docker push $IMAGE_NAME:$VERSION
+docker push $IMAGE_NAME:$VERSION