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

diff --git a/docker-build/kubedns/Dockerfile b/docker-build/kubedns/Dockerfile
index 5fedec1..bbe5029 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,15 +31,21 @@ 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 \
-&&  PKG=k8s.io/dns ARCH=amd64 VERSION=${KUBEDNS_VERSION} ./build/build.sh \
-&&  mv $GOPATH/bin/linux_amd64/kube-dns /usr/bin/kube-dns \
-&&  mv $GOPATH/bin/linux_amd64/dnsmasq-nanny /usr/bin/dnsmasq-nanny \
+&&  if [ $(uname -m) == 'aarch64' ]; then HOST_ARCH=arm64; else HOST_ARCH=amd64; ARCH_SUBDIR=linux_amd64; fi \
+&&  PKG=k8s.io/dns ARCH=${HOST_ARCH} VERSION=${KUBEDNS_VERSION} ./build/build.sh \
+&&  mv $GOPATH/bin/${ARCH_SUBDIR:-}/kube-dns /usr/bin/kube-dns \
+&&  mv $GOPATH/bin/${ARCH_SUBDIR:-}/dnsmasq-nanny /usr/bin/dnsmasq-nanny \
 &&  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