From ab4bd149e3c23dec70ca5de2d0b68a3d33480ab1 Mon Sep 17 00:00:00 2001
From: aojeagarcia <aojeagarcia@suse.com>
Date: Mon, 25 Feb 2019 11:34:36 +0100
Subject: [PATCH] Bump CNI version to support IPv6

Fixes Kubernetes IPv6 problem on Docker

https://github.com/containernetworking/cni/issues/531
---
 images/base/Dockerfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/images/base/Dockerfile b/images/base/Dockerfile
index 2ae8c89df9..d8dc22c1bf 100644
--- a/images/base/Dockerfile
+++ b/images/base/Dockerfile
@@ -81,10 +81,10 @@ RUN curl -fsSL "https://download.docker.com/linux/$(. /etc/os-release; echo "$ID
 
 # Install CNI binaries to /opt/cni/bin
 # TODO(bentheelder): doc why / what here
-ARG CNI_VERSION="0.6.0"
-ARG CNI_TARBALL="cni-plugins-${ARCH}-v${CNI_VERSION}.tgz"
-ARG CNI_BASE_URL="https://storage.googleapis.com/kubernetes-release/network-plugins/"
-ARG CNI_URL="${CNI_BASE_URL}${CNI_TARBALL}"
+ARG CNI_VERSION="v0.7.4"
+ARG CNI_TARBALL="cni-plugins-${ARCH}-${CNI_VERSION}.tgz"
+ARG CNI_BASE_URL="https://github.com/containernetworking/plugins/releases/download/"
+ARG CNI_URL="${CNI_BASE_URL}${CNI_VERSION}/${CNI_TARBALL}"
 RUN curl -sSL --retry 5 --output /tmp/cni.tgz "${CNI_URL}" \
     && sha256sum /tmp/cni.tgz \
     && mkdir -p /opt/cni/bin \