From 161b27327d47af2a3d7456e472b712a54944ce0e Mon Sep 17 00:00:00 2001
From: Balazs Szekeres <balazs.szekeres@nokia.com>
Date: Fri, 30 Aug 2019 15:06:43 +0200
Subject: [PATCH] Go version update to 1.12.9

Change-Id: I425539eee8a60f99cc5e94c4d440ed56205d48e6
Signed-off-by: Balazs Szekeres <balazs.szekeres@nokia.com>
---
 caas-etcd.spec               |  4 +++-
 docker-build/etcd/Dockerfile | 11 ++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/caas-etcd.spec b/caas-etcd.spec
index 34cbdad..9c3253f 100644
--- a/caas-etcd.spec
+++ b/caas-etcd.spec
@@ -15,7 +15,8 @@
 %define COMPONENT etcd
 %define RPM_NAME caas-%{COMPONENT}
 %define RPM_MAJOR_VERSION 3.3.13
-%define RPM_MINOR_VERSION 5
+%define RPM_MINOR_VERSION 6
+%define go_version 1.12.9
 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
 %define docker_build_dir %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-build
 %define docker_save_dir %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-save
@@ -52,6 +53,7 @@ docker build \
   --build-arg https_proxy="${https_proxy}" \
   --build-arg no_proxy="${no_proxy}" \
   --build-arg ETCD_VERSION="%{version}" \
+  --build-arg go_version="%{go_version}" \
   --tag %{COMPONENT}:%{IMAGE_TAG} \
   %{docker_build_dir}/%{COMPONENT}/
 mkdir -p %{docker_save_dir}/
diff --git a/docker-build/etcd/Dockerfile b/docker-build/etcd/Dockerfile
index e6d6dec..e178418 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,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
 
 
-- 
2.16.6