X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=docker-build%2Fetcd%2FDockerfile;h=f0c9816e99f6e35429a2ec38991d3c8f922637fe;hb=HEAD;hp=e6d6dece1e908806147142750a6d028126f252e2;hpb=e85043aa3e0f004b8129971f4cb5cb2c4810d281;p=ta%2Fcaas-etcd.git

diff --git a/docker-build/etcd/Dockerfile b/docker-build/etcd/Dockerfile
index e6d6dec..f0c9816 100644
--- a/docker-build/etcd/Dockerfile
+++ b/docker-build/etcd/Dockerfile
@@ -16,7 +16,10 @@ FROM alpine:3.9
 MAINTAINER Krisztian Lengyel <krisztian.lengyel@nokia.com>
 
 ARG ETCD_VERSION
+ARG go_install_dir="/usr/local/go"
+ARG go_version
 ENV GOPATH /build
+ENV PATH="$go_install_dir/bin:$PATH"
 
 COPY get-package build-pip /usr/bin/
 COPY source-list.txt ${GOPATH}/
@@ -33,14 +36,19 @@ RUN apk add py-pip \
 &&  chmod +x /etcdctl3 \
 &&  chmod 644 ${GOPATH}/source-list.txt \
 \
-&&  apk add --no-cache --virtual .build-deps go godep curl tar build-base py-setuptools python2-dev \
+&&  apk add --no-cache --virtual .build-deps go godep curl tar build-base py-setuptools python2-dev bash \
 &&  apk add --no-cache python2 py2-ipaddress py2-dnspython \
 \
 &&  build-pip python-urllib3 python-etcd \
 \
-&&  mkdir -p ${GOPATH}/src/github.com/coreos/etcd \
-&&  curl -fsSL -k https://github.com/coreos/etcd/archive/v${ETCD_VERSION}.tar.gz | tar zx --strip-components=1 -C ${GOPATH}/src/github.com/coreos/etcd \
-&&  cd ${GOPATH}/src/github.com/coreos/etcd \
+&&  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/go.etcd.io/etcd \
+&&  curl -fsSL -k https://github.com/coreos/etcd/archive/v${ETCD_VERSION}.tar.gz | tar zx --strip-components=1 -C ${GOPATH}/src/go.etcd.io/etcd \
+&&  cd ${GOPATH}/src/go.etcd.io/etcd \
 &&  GOOS=linux ./build \
 &&  mv bin/etcd /usr/bin/ \
 &&  mv bin/etcdctl /usr/bin/ \
@@ -48,6 +56,7 @@ RUN apk add py-pip \
 \
 &&  apk del .build-deps \
 &&  rm -rf ${GOPATH} \
+&&  rm -rf $go_install_dir \
 &&  rm -rf /build