Go version update to 1.12.9

[ta/caas-etcd.git] / docker-build / etcd / Dockerfile

diff --git a/docker-build/etcd/Dockerfile b/docker-build/etcd/Dockerfile
index e6d6dec..e178418 100644 (file)
--- 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,11 +36,16 @@ 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 $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/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 \
@@ -48,6 +56,7 @@ RUN apk add py-pip \
 \
 &&  apk del .build-deps \
 &&  rm -rf ${GOPATH} \
+&&  rm -rf $go_install_dir \
 &&  rm -rf /build