X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ta%2Fcaas-metrics.git;a=blobdiff_plain;f=docker-build%2Fmetrics_server%2FDockerfile;h=7c012b57a046bfeaebc0707c530691824212b37d;hp=de7661ea8a1c8f379986cce11b0d2f88b4a0fa17;hb=78833edbb349f73dca1d0d9749c410d6a4711cdf;hpb=a65d286d5ee14c4c5bf47112cb341d849fd40644

diff --git a/docker-build/metrics_server/Dockerfile b/docker-build/metrics_server/Dockerfile
index de7661e..7c012b5 100644
--- a/docker-build/metrics_server/Dockerfile
+++ b/docker-build/metrics_server/Dockerfile
@@ -15,17 +15,21 @@
 FROM alpine:3.9
 MAINTAINER Szekeres Balazs <balazs.szekeres@nokia.com>
 
-ARG DEPENDENCY_MANAGER
-ENV DEPENDENCY_VERSION=$DEPENDENCY_MANAGER
-ARG METRICS_SERVER
-ENV METRICS_SERVER_VERSION=$METRICS_SERVER
+ARG DEP_MAN_VERSION
+ARG METRICS_SERVER_VERSION
+ARG go_install_dir="/usr/local/go"
+ARG go_version
 ENV GOPATH /build
-ENV PATH /usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+ENV PATH $go_install_dir/bin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
 ENV VERSION_LDFLAGS='-extldflags "-static"'
 
-RUN apk add --no-cache --virtual .build-deps build-base go godep curl tar git bash mercurial \
-&&  curl -fsSL -o /usr/local/bin/dep https://github.com/golang/dep/releases/download/v${DEPENDENCY_VERSION}/dep-linux-amd64 \
+RUN apk add --no-cache --virtual .build-deps build-base go godep curl tar git bash mercurial bash \
+&&  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 \
+&&  curl -fsSL -o /usr/local/bin/dep https://github.com/golang/dep/releases/download/v${DEP_MAN_VERSION}/dep-linux-amd64 \
 &&  chmod +x /usr/local/bin/dep \
 &&  mkdir -p ${GOPATH}/src/github.com/kubernetes-incubator/metrics-server/ \
 &&  curl -fsSL -k https://github.com/kubernetes-incubator/metrics-server/archive/v${METRICS_SERVER_VERSION}.tar.gz | tar zx --strip-components=1 -C ${GOPATH}/src/github.com/kubernetes-incubator/metrics-server/ \
@@ -37,5 +41,6 @@ RUN apk add --no-cache --virtual .build-deps build-base go godep curl tar git ba
 &&  mv ./_output/amd64/metrics-server /metrics-server \
 &&  apk del .build-deps \
 &&  rm -rf ${GOPATH} \
+&&  rm -rf $go_install_dir \
 &&  rm -rf /build