X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ta%2Fcaas-kubedns.git;a=blobdiff_plain;f=docker-build%2Fkubedns%2FDockerfile;fp=docker-build%2Fkubedns%2FDockerfile;h=6182bd7dc0f63a6fdab65cb09cbf50ba664d1ab1;hp=5fedec1468e9e68f0ca907e1572fdd074daa56bc;hb=ef04fc9dee80155f731211854a64fd281fcc07eb;hpb=b829734396262b0158289449d812894cb3624707

diff --git a/docker-build/kubedns/Dockerfile b/docker-build/kubedns/Dockerfile
index 5fedec1..6182bd7 100644
--- a/docker-build/kubedns/Dockerfile
+++ b/docker-build/kubedns/Dockerfile
@@ -15,10 +15,11 @@
 FROM alpine:3.9
 MAINTAINER Balazs Szekeres <balazs.szekeres@nokia.com>
 
-ARG KUBEDNS
-ENV KUBEDNS_VERSION=$KUBEDNS
+ARG KUBEDNS_VERSION
 ENV GOPATH /build
-ENV PATH /usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+ARG go_install_dir="/usr/local/go"
+ARG go_version
+ENV PATH="$go_install_dir/bin:$PATH"
 
 RUN apk update \
 &&  apk upgrade \
@@ -30,6 +31,10 @@ RUN apk update \
 &&  chown -R kubedns:kubedns /etc \
 &&  apk add --no-cache --virtual .build-deps build-base git mercurial go glide bash tar curl \
 &&  apk add --no-cache dnsmasq \
+&&  mkdir -p $go_install_dir \
+&&  curl -fsSL -k https://dl.google.com/go/go${go_version}.src.tar.gz | tar zx --strip-components=1 -C ${go_install_dir} \
+&&  cd ${go_install_dir}/src/ \
+&&  ./make.bash \
 &&  mkdir -p $GOPATH/src/k8s.io/dns \
 &&  curl -fsSL -k https://github.com/kubernetes/dns/archive/${KUBEDNS_VERSION}.tar.gz | tar zx --strip-components=1 -C $GOPATH/src/k8s.io/dns \
 &&  cd $GOPATH/src/k8s.io/dns \
@@ -39,6 +44,7 @@ RUN apk update \
 &&  setcap 'cap_net_bind_service=+ep' /usr/sbin/dnsmasq \
 &&  apk del .build-deps \
 &&  rm -rf $GOPATH \
+&&  rm -rf $go_install_dir \
 &&  rm -rf /build \
 &&  rm -rf /root/.glide