Merge pull request #12 from alena1108/buildscriptchanges

build script changes + k8s to 1.5

Author: Alena Prokharchyk

Dockerfile.dapper

@@ -5,7 +5,7 @@ RUN apt-get update && \
     apt-get install -y ca-certificates wget git && \
     rm -f /bin/sh && ln -s /bin/bash /bin/sh
 
-ENV K8S_DOWNLOAD https://github.com/rancher/kubernetes/releases/download/v1.4.6-rancher2/kubernetes-server-linux-amd64.tar.gz
+ENV K8S_DOWNLOAD https://github.com/rancher/kubernetes/releases/download/v1.5.0-rancher1/kubernetes-server-linux-amd64.tar.gz
 ENV DOWNLOAD /usr/src
 
 ARG DAPPER_HOST_ARCH

scripts/package

@@ -19,7 +19,7 @@ fi
 tar xvzf $DOWNLOAD/k8s.tar.gz --strip-components=3 kubernetes/server/bin/{kubelet,kube-proxy,kube-apiserver,kube-controller-manager,kube-scheduler,kubectl}
 tar xvzf $DOWNLOAD/k8s.tar.gz kubernetes/kubernetes-src.tar.gz
 tar xvzf kubernetes/kubernetes-src.tar.gz -C kubernetes
-tar xvzf kubernetes/kube-source.tar.gz -C kubernetes --wildcards \
+tar xvzf kubernetes/kubernetes-src.tar.gz -C kubernetes --wildcards \
                                 ./cluster/addons/dns/*.yaml.sed 
 
 for t in kubernetes/cluster/addons/dns/*.yaml.sed; do