github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-20 09:33:52 +00:00
Code Issues Projects Releases Wiki Activity

bump cni to 9d5e6e6

Browse Source
This commit is contained in:
Minhan Xia
2016-08-25 16:59:33 -07:00
parent 610a978e48
commit 69e540e634
9 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/images/hyperkube/Dockerfile
View File

@@ -59,7 +59,7 @@ COPY setup-files.sh make-ca-cert.sh copy-addons.sh /
ADD https://storage.googleapis.com/kubernetes-release/easy-rsa/easy-rsa.tar.gz /root/kube/
# Copy the the cni-bin folder into /opt/cni/bin
COPY cni-bin /opt/cni/bin
COPY cni-bin/bin /opt/cni/bin
# Copy overlay configuration to default directory
COPY cni-conf /etc/cni/net.d

11
cluster/images/hyperkube/Makefile
View File

@@ -98,15 +98,8 @@ else
docker run --rm --privileged multiarch/qemu-user-static:register --reset
curl -sSL --retry 5 https://github.com/multiarch/qemu-user-static/releases/download/v2.5.0/x86_64_qemu-${QEMUARCH}-static.tar.xz | tar -xJ -C ${TEMP_DIR}
endif
# This cross-compiles cni for all architectures
# TODO(freehan): Push the latest cni for all arches to storage.googleapis.com so we may just download the binaries
docker run -it -v ${TEMP_DIR}/cni-bin:/cnibin golang:1.6 /bin/bash -c "\
git clone https://github.com/containernetworking/cni \
&& cd cni \
&& git checkout $(CNI_RELEASE) \
&& GOARCH=$(ARCH) ./build \
&& cp bin/* /cnibin"
# Download CNI
curl -sSL --retry 5 https://storage.googleapis.com/kubernetes-release/network-plugins/cni-${ARCH}-${CNI_RELEASE}.tar.gz | tar -xz -C ${TEMP_DIR}/cni-bin
docker build -t ${REGISTRY}/hyperkube-${ARCH}:${VERSION} ${TEMP_DIR}
rm -rf "${TEMP_DIR}"